OSSP CVS Repository

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

ossp-pkg/as/as-gui/Makefile.in 1.29 -> 1.30

--- Makefile.in  2002/12/19 21:02:22     1.29
+++ Makefile.in  2003/01/16 08:37:40     1.30
@@ -49,6 +49,10 @@
 LDFLAGS         = @LDFLAGS@
 LIBS            = @LIBS@
 
+# CORBA-specific variables
+CORBABASE       = @CORBABASE@
+IDL             = $(CORBABASE)/bin/idl
+
 # Qt-specific variables
 QTBASE          = @QTBASE@
 UIC             = @UIC@
@@ -72,6 +76,11 @@
 
 GRAFX           = gfx/ossplogo.xpm
 
+# IDL compiler generated
+IDL_SRC         = asdb.idl
+IDL_OUT         = asdb.cpp asdb.h
+IDL_OBJ         = asdb.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
@@ -92,12 +101,18 @@
 
 all: Makefile $(TARGET_PROGS) $(TARGET_MANS)
 
-$(PROG_NAME): $(OBJS) $(MOC_OBJ)
+$(PROG_NAME): $(OBJS) $(IDL_OBJ) $(MOC_OBJ)
         $(CXX) $(LDFLAGS) -o $@ $+ $(LIBS)
 
 moc_%.cpp: %.h
         $(MOC) $< -o $@
 
+# Run the IDL compiler over IDL source
+# but avoid a make deps spaghetti nest
+$(SRCS):$(IDL_OUT)
+$(IDL_OUT): $(IDL_SRC)
+        $(IDL) --c++-suffix=cpp $<
+
 as-gui.1: as_gui.pod
         VS=`$(SHTOOL) version -lc -dshort as_version.cpp`; \
         VL=`$(SHTOOL) version -lc -dlong as_version.cpp`; \
@@ -136,13 +151,14 @@
         $(RMDIR) $(DESTDIR)$(prefix) >/dev/null 2>&1 || $(TRUE)
 
 clean:
-        $(RM) $(TARGET_PROGS) $(OBJS) $(MOC_OBJ)
+        $(RM) $(TARGET_PROGS) $(OBJS) $(IDL_OBJ) $(MOC_OBJ)
         $(RM) as-gui.conf.5 as-gui.1
         $(RM) as_gui_pcre.tab *.core
 
 distclean: clean
         $(RM) config.log config.status config.cache # Generated by ./configure
         $(RM) Makefile ac_config.h                  # Generated by ./configure
+        $(RM) $(IDL_OUT)       # Generated by $(IDL)
         $(RM) $(MOC_OUT)       # Generated by $(MOC)
 
 realclean: distclean

CVSTrac 2.0.1