OSSP CVS Repository

ossp - Difference in ossp-pkg/as/as-gui/Makefile.in versions 1.40 and 1.41
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [History

ossp-pkg/as/as-gui/Makefile.in 1.40 -> 1.41

--- Makefile.in  2003/02/03 21:14:58     1.40
+++ Makefile.in  2003/02/07 16:37:55     1.41
@@ -72,9 +72,9 @@
 TARGET_PROGS    = as-gui
 TARGET_MANS     = as-gui.1 as-gui.conf.5
 
-SRCS            = as_main.cpp as_gui.cpp as_assist.cpp as_slot.cpp as_dataop.cpp as_except.cpp as_generic.cpp as_amount.cpp as_table.cpp as_pref.cpp as_user.cpp as_rand.cpp as_crc.cpp as_uuid.cpp as_version.cpp
+SRCS            = as_main.cpp as_gui.cpp as_assist.cpp as_slot.cpp as_dataop.cpp as_except.cpp as_generic.cpp as_amount.cpp as_table.cpp as_panel.cpp as_pref.cpp as_user.cpp as_rand.cpp as_crc.cpp as_uuid.cpp as_version.cpp
 
-OBJS            = as_main.o as_gui.o as_assist.o as_slot.o as_dataop.o as_except.o as_generic.o as_amount.o as_table.o as_pref.o as_user.o as_rand.o as_crc.o as_uuid.o as_version.o
+OBJS            = as_main.o as_gui.o as_assist.o as_slot.o as_dataop.o as_except.o as_generic.o as_amount.o as_table.o as_panel.o as_pref.o as_user.o as_rand.o as_crc.o as_uuid.o as_version.o
 
 GRAFX           = gfx/ossplogo.xpm
 
@@ -84,8 +84,8 @@
 IDL_OBJ         = as_stub.o
 
 # Qt meta object compiler (MOC) generated
-MOC_OUT         = moc_as_gui.cpp moc_as_table.cpp
-MOC_OBJ         = moc_as_gui.o moc_as_table.o
+MOC_OUT         = moc_as_gui.cpp moc_as_table.cpp moc_as_panel.cpp
+MOC_OBJ         = moc_as_gui.o moc_as_table.o moc_as_panel.o
 
 .SUFFIXES:
 .SUFFIXES: .c .cc .cpp .cxx .o
@@ -103,6 +103,8 @@
 
 all: Makefile $(TARGET_PROGS)
 
+# Build the program conditionally including
+# RPC stubs and skeleton objects
 ifdef CORBABASE
 $(PROG_NAME): $(OBJS) $(IDL_OBJ) $(MOC_OBJ)
         $(CXX) $(LDFLAGS) -o $@ $+ $(LIBS)
@@ -114,6 +116,13 @@
 moc_%.cpp: %.h
         $(MOC) $< -o $@
 
+# Use the Trolltech uic to compile headers
+# and implementation from ui XML
+#%.h: %.ui
+#       uic $< -o $@
+#%.cpp: %.ui
+#       uic -impl $*.h $< -o $@
+
 # Run the IDL compiler over IDL source
 # but avoid a make deps spaghetti nest
 ifdef CORBABASE

CVSTrac 2.0.1