Tue Feb 4 13:13:08 2003 Krishnakumar B <kitty@cs.wustl.edu>

5 files changed, 22 insertions, 62 deletions

diff --git a/include/makeinclude/rules.bin.GNU b/include/makeinclude/rules.bin.GNU
index f93b406efec..8548c05fb56 100644
--- a/include/makeinclude/rules.bin.GNU
+++ b/include/makeinclude/rules.bin.GNU
@@ -6,8 +6,7 @@
 #       Requires GNU make
 #----------------------------------------------------------------------------
 
-VOBJS = \
-  $(subst .cpp,.$(OBJEXT),$(foreach file,$(SRC),$(VDIR)$(notdir $(file))))
+VOBJS = $(addsuffix .$(OBJEXT),$(addprefix $(VDIR),$(basename $(notdir $(SRC)))))
 
 ifeq ($(CHORUSLINK),true)
 $(BIN): %: $(VDIR)%.$(OBJEXT) $(VOBJS)
diff --git a/include/makeinclude/rules.lib.GNU b/include/makeinclude/rules.lib.GNU
index 6310f18edc9..d7fe373170a 100644
--- a/include/makeinclude/rules.lib.GNU
+++ b/include/makeinclude/rules.lib.GNU
@@ -15,34 +15,15 @@ ifdef SHLIBA
 VSHLIBA = $(SHLIBA:%.$(LIBEXT)=%$(VAR).$(LIBEXT))
 endif
 
-VLOBJS   += $(subst .c,.$(OBJEXT), \
-                $(subst .cpp,.$(OBJEXT), \
-                    $(foreach file,$(LSRC),$(VDIR)$(notdir $(file)))))
-
+VLOBJS   += $(addsuffix .$(OBJEXT),$(addprefix $(VDIR),$(basename $(notdir $(LSRC)))))
 LSRC    += $(LSRC2)
+
+
 ifdef PRELIB
-ifdef PRELIB_USES_OBJ_ONLY
-  VSHOBJS = $(subst .c,.$(OBJEXT), \
-                $(subst .cpp,.$(OBJEXT), \
-                    $(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file)))))
-else  # ! PRELIB_USES_OBJ_ONLY
-  VSHOBJS = $(subst .c,.$(OBJEXT), \
-                $(subst .cpp,.$(OBJEXT), \
-                     $(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file)))))
-endif # ! PRELIB_USES_OBJ_ONLY
-  VSHOBJS1 = $(VSHOBJS)
-else  # ! PRELIB
-  VSHOBJS = $(subst .c,.$(OBJEXT), \
-                $(subst .cpp,.$(OBJEXT), \
-                     $(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file)))))
-  VSHOBJS1 = $(subst .c,.$(OBJEXT), \
-                 $(subst .cpp,.$(OBJEXT), \
-                     $(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file)))))
+VSHOBJS = $(addsuffix .$(OBJEXT),$(addprefix $(VSHDIR),$(basename $(notdir $(LSRC)))))
+VSHOBJS1 = $(addsuffix .$(OBJEXT),$(addprefix $(VSHDIR),$(basename $(notdir $(LSRC)))))
 endif # ! PRELIB
 
-# Comment out for now...
-# $(DEFS:%=$(INSINC)/%) \
-
 ifdef static_libs
   INSTALL += $(VLIB:%.$(LIBEXT)=$(INSLIB)/%.$(LIBEXT))
 endif # static_libs
@@ -55,27 +36,8 @@ ifdef SHLIBA
 endif
 endif # shared_libs
 
-ifdef PRELIB
-# Unfortunately, gcc has to do a link of all of the objects (during which
-# it may decide to recompile some of the objects), before we can safely build
-# any libraries or shared objects.  Comment this line if no shared
-# libraries or objects are used.
-#
-# I have no idea why this dependency has any effect similar to what is
-# described above, so I will comment it out.  This eliminates the VERY
-# annoying messages from make such as:
-# make: Circular .shobj/interp.so <- libcorba.so dependency dropped.
-#$(VSHOBJS): $(VSHLIB)
-endif
-
-# Comment these lines out if you want to build both *.a and *.so libraries...
-#$(VSHLIB): $(VSHOBJS)
-#ifdef PRELIB
-#	$(PRELIB)
-#endif
-#	$(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $(LDFLAGS) $(VSHDIR)*.$(OBJEXT)
-
-# Uncomment the remaining lines if you want to build both *.a and *.so libraries...
+# Uncomment the remaining lines if you want to build both *.a and *.so
+# libraries...
 VLIB    = $(LIB:%.$(LIBEXT)=%$(VAR).$(LIBEXT))
 
 $(VLIB): $(VLOBJS)
@@ -118,7 +80,8 @@ ifneq (,$(RANLIB))
 	-$(RANLIB) $@
 endif # RANLIB
 
-# Note that if you don't want to build shared libraries, just remove the $(VSHOBJS)
+# Note that if you don't want to build shared libraries, just remove the
+# $(VSHOBJS)
 ifdef SHLIBBUILD
 $(VSHLIB): $(VSHOBJS)
 else
diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU
index 86a4faa1267..7d78844043a 100644
--- a/include/makeinclude/rules.local.GNU
+++ b/include/makeinclude/rules.local.GNU
@@ -207,7 +207,12 @@ clean.local:
 	-$(RM) -r Templates.DB gcctemp.c gcctemp so_locations *.ics
 	-$(RM) -r templateregistry SunWS_cache ir.out core.*
 
-realclean.local: clean.local deinstall.local
+clean_idl_stubs.local:
+	-$(RM) $(addsuffix $(IDL_CLIENT_HDR_EXT), $(IDL_FILES)) $(addsuffix $(IDL_CLIENT_INL_EXT), $(IDL_FILES)) $(addsuffix $(IDL_CLIENT_SRC_EXT),$(IDL_FILES))
+	-$(RM) $(addsuffix $(IDL_SERVER_HDR_EXT), $(IDL_FILES)) $(addsuffix $(IDL_SERVER_INL_EXT), $(IDL_FILES)) $(addsuffix $(IDL_SERVER_SRC_EXT),$(IDL_FILES))
+	-$(RM) $(addsuffix $(IDL_SERVER_THDR_EXT), $(IDL_FILES)) $(addsuffix $(IDL_SERVER_TINL_EXT), $(IDL_FILES)) $(addsuffix $(IDL_SERVER_TSRC_EXT),$(IDL_FILES))
+
+realclean.local: clean.local deinstall.local clean_idl_stubs.local
 	-$(RM) $(BIN:%=%$(EXEEXT)) $(BIN:%=%_debug$(EXEEXT)) $(BIN:%=%_profile$(EXEEXT)) $(BIN:%=%_optimize$(EXEEXT)) $(LIB:%=%) $(LIB:%=%_debug) $(LIB:%=%_profile) $(LIB:%=%_optimize) $(SHLIB:%=%) $(SHLIB:%=%.*) $(SHLIB:%.so=%.a) $(SHLIB:%=%_debug) $(SHLIB:%=%_profile) $(SHLIB:%=%_optimize) $(SHLIBA:%=%) $(BIN2:%=%$(EXEEXT)) $(BIN2:%=%_debug$(EXEEXT)) $(BIN2:%=%_profile$(EXEEXT)) $(BIN2:%=%_optimize$(EXEEXT)) $(LIB2:%=%) $(LIB2:%=%_debug) $(LIB2:%=%_profile) $(LIB2:%=%_optimize) $(SHLIB2:%=%) $(SHLIB2:%=%_debug) $(SHLIB2:%=%_profile) $(SHLIB2:%=%_optimize) $(SHLIBA2:%=%)
 
 #----------------------------------------------------------------------------
diff --git a/include/makeinclude/rules.nested.GNU b/include/makeinclude/rules.nested.GNU
index b051e9ba034..e5263b82b59 100644
--- a/include/makeinclude/rules.nested.GNU
+++ b/include/makeinclude/rules.nested.GNU
@@ -12,6 +12,10 @@ ifeq ($(MAKEFILE),)
   MAKEFILE = Makefile
 endif # ! MAKEFILE
 
+ifeq ($(SUBDIR_MAKEFILE),)
+  SUBDIR_MAKEFILE=$(MAKEFILE)
+endif
+
 # Make sure that we build directories with DIRS= in sequence instead of in
 # parallel, unless DIRS_PARALLEL is set, in which case they may be built
 # in parallel if enabled by the proper flags and not disabled elsewhere.
@@ -27,7 +31,7 @@ endif
 # Triggered by the $(TARGETS_NESTED) target, below.
 
 %.subdir: %
-	@$(MAKE) -f Makefile -C $< $(SUBDIR_TARGET)
+	$(MAKE) -f $(SUBDIR_MAKEFILE) -C $< $(SUBDIR_TARGET)
 
 # Build FOO.nested by calling MAKE again, this time with DIRS (with
 # ".subdir" appended to each) as the targets, and passing FOO as the
@@ -35,7 +39,5 @@ endif
 
 $(TARGETS_NESTED):
 ifneq ($(DIRS),)
-	@$(MAKE) -f $(MAKEFILE) SUBDIR_TARGET=$(@:.nested=) $(addsuffix .subdir, $(DIRS))
-
+	$(MAKE) -f $(MAKEFILE) SUBDIR_TARGET=$(@:.nested=) $(addsuffix .subdir, $(DIRS))
 endif # DIRS
-
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
index aa6d9d06788..8392100bbd1 100644
--- a/include/makeinclude/wrapper_macros.GNU
+++ b/include/makeinclude/wrapper_macros.GNU
@@ -309,9 +309,6 @@ ifeq ($(findstring g++,$(CXX)),g++)
   endif # ! ACE_HAS_GNUG_PRE_2_8
 endif # g++
 
-# We dont want to hard code. Looks like the contents of VDIR should
-# have the right contents in any type of builds. If not, folks please
-# feel to revert it to the way things were in rev 4.114.
 ifndef OBJDIRS
   OBJDIRS = $(VDIR)
 endif # OBJDIRS
@@ -565,13 +562,8 @@ ifdef shared_libs
       #### Don't build static libs.
       BUILD         = $(VSHLIB) $(SHLIBA) $(VBIN)
       LIB           =
-#      OBJEXT        = so
       ifndef VXWORKS
         VDIR        = $(VSHDIR)
-        ifeq ($(BIN),)
-          #### No executables are being built, so don't create .obj/.
-          OBJDIRS     = $(VSHDIR)
-        endif # BIN
       endif # ! VXWORKS
     endif # ! SHLIB
   endif # ! static_libs
@@ -584,7 +576,6 @@ else # ! shared_libs
   ifdef static_libs
     #### Don't build shared libs.
     BUILD           = $(VLIB) $(VBIN)
-    OBJDIRS         = $(VDIR)
     PIC             =
     SHLIB           =
     SOEXT           = o