summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog30
-rw-r--r--ChangeLogs/ChangeLog-03a30
-rw-r--r--ace/Makefile4
-rw-r--r--include/makeinclude/rules.bin.GNU3
-rw-r--r--include/makeinclude/rules.lib.GNU55
-rw-r--r--include/makeinclude/rules.local.GNU7
-rw-r--r--include/makeinclude/rules.nested.GNU10
-rw-r--r--include/makeinclude/wrapper_macros.GNU9
8 files changed, 82 insertions, 66 deletions
diff --git a/ChangeLog b/ChangeLog
index 2052a327c8f..e480923d354 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+Tue Feb 4 13:13:08 2003 Krishnakumar B <kitty@cs.wustl.edu>
+
+ * include/makeinclude/rules.lib.GNU:
+ * include/makeinclude/rules.bin.GNU:
+
+ Generalized the creation of objects from source files by
+ removing the dependency that the source files be named *.cpp.
+ Also removed a lot of junk.
+
+ * include/makeinclude/wrapper_macros.GNU: Removed some more
+ accumulated cruft.
+
+ * include/makeinclude/rules.nested.GNU: Fix recursive make so
+ that users can name the makefiles in sub-directories as
+ something other than Makefile by introducing a new variable
+ SUBDIR_MAKEFILE.
+
+ * ace/Makefile: Fix the Makefile to use the above extension when
+ recursing into directories.
+
+ * include/makeinclude/rules.local.GNU: Add a new local target
+ clean_idl_stubs.local which cleans all the IDL generated files.
+ This target is linked to realclean so the IDL generated files
+ will only be cleaned with realclean.
+
+ Thanks to James Mansion <james.mansion@uk.nomura.com> for
+ reporting the bugs and suggesting some fixes.
+
Tue Feb 4 11:21:13 MST 2003 Rob Andzik <andzik@rtlogic.com>
* ACE_wrappers/include/makeinclude/platform_vxworks5.x_g++.GNU
@@ -19,7 +47,7 @@ Tue Feb 4 11:21:13 MST 2003 Rob Andzik <andzik@rtlogic.com>
Mon Feb 3 16:33:02 2003 Heather Drury <drury_h@ociweb.com>
* ace/config-freebsd.h: msgsnd() with const parameter was recently
- added to FreeBSD-CURRENT. Thanks to Craig Rodrigues' for this change.
+ added to FreeBSD-CURRENT. Thanks to Craig Rodrigues' for this change.
Sat Feb 1 09:34:45 2003 Ossama Othman <ossama@uci.edu>
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 2052a327c8f..e480923d354 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,31 @@
+Tue Feb 4 13:13:08 2003 Krishnakumar B <kitty@cs.wustl.edu>
+
+ * include/makeinclude/rules.lib.GNU:
+ * include/makeinclude/rules.bin.GNU:
+
+ Generalized the creation of objects from source files by
+ removing the dependency that the source files be named *.cpp.
+ Also removed a lot of junk.
+
+ * include/makeinclude/wrapper_macros.GNU: Removed some more
+ accumulated cruft.
+
+ * include/makeinclude/rules.nested.GNU: Fix recursive make so
+ that users can name the makefiles in sub-directories as
+ something other than Makefile by introducing a new variable
+ SUBDIR_MAKEFILE.
+
+ * ace/Makefile: Fix the Makefile to use the above extension when
+ recursing into directories.
+
+ * include/makeinclude/rules.local.GNU: Add a new local target
+ clean_idl_stubs.local which cleans all the IDL generated files.
+ This target is linked to realclean so the IDL generated files
+ will only be cleaned with realclean.
+
+ Thanks to James Mansion <james.mansion@uk.nomura.com> for
+ reporting the bugs and suggesting some fixes.
+
Tue Feb 4 11:21:13 MST 2003 Rob Andzik <andzik@rtlogic.com>
* ACE_wrappers/include/makeinclude/platform_vxworks5.x_g++.GNU
@@ -19,7 +47,7 @@ Tue Feb 4 11:21:13 MST 2003 Rob Andzik <andzik@rtlogic.com>
Mon Feb 3 16:33:02 2003 Heather Drury <drury_h@ociweb.com>
* ace/config-freebsd.h: msgsnd() with const parameter was recently
- added to FreeBSD-CURRENT. Thanks to Craig Rodrigues' for this change.
+ added to FreeBSD-CURRENT. Thanks to Craig Rodrigues' for this change.
Sat Feb 1 09:34:45 2003 Ossama Othman <ossama@uci.edu>
diff --git a/ace/Makefile b/ace/Makefile
index f0b592d52ec..2a28860237a 100644
--- a/ace/Makefile
+++ b/ace/Makefile
@@ -8,10 +8,10 @@
# work when recursing through subdirectories
.DEFAULT:
@$(MAKE) -f Makefile.ace $@
- @$(MAKE) -f Makefile.dirs $@
+ @$(MAKE) -f Makefile.dirs SUBDIR_MAKEFILE=Makefile $@
# Invoke Makefile.ace first to build libACE, and then
# invoke Makefile.dirs to recurse through subdirectories
all:
@$(MAKE) -f Makefile.ace
- @$(MAKE) -f Makefile.dirs
+ @$(MAKE) -f Makefile.dirs SUBDIR_MAKEFILE=Makefile
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