ChangeLogTag:Tue Mar 27 19:43:39 2001 Carlos O'Ryan <coryan@uci.edu>

6 files changed, 116 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 78cbf632b23..009f1da96c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Tue Mar 27 19:43:39 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * include/makeinclude/platform_linux.GNU:
+          Add support for Insure++
+
+        * include/makeinclude/rules.local.GNU:
+          Add new macro to let developers change the default destination
+          for the dependencies.
+
+        * include/makeinclude/wrapper_macros.GNU:
+          Let the user override the default VDIR directory, and define the
+          default values for the IDL generated code extensions.
+
+          Thanks to Jody Hagins <jody@atdesk.com> for all these
+          improvements.
+
 Tue Mar 27 19:15:36 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * ace/Unbounded_Queue.h:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 78cbf632b23..009f1da96c1 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,19 @@
+Tue Mar 27 19:43:39 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * include/makeinclude/platform_linux.GNU:
+          Add support for Insure++
+
+        * include/makeinclude/rules.local.GNU:
+          Add new macro to let developers change the default destination
+          for the dependencies.
+
+        * include/makeinclude/wrapper_macros.GNU:
+          Let the user override the default VDIR directory, and define the
+          default values for the IDL generated code extensions.
+
+          Thanks to Jody Hagins <jody@atdesk.com> for all these
+          improvements.
+
 Tue Mar 27 19:15:36 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * ace/Unbounded_Queue.h:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 78cbf632b23..009f1da96c1 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,19 @@
+Tue Mar 27 19:43:39 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * include/makeinclude/platform_linux.GNU:
+          Add support for Insure++
+
+        * include/makeinclude/rules.local.GNU:
+          Add new macro to let developers change the default destination
+          for the dependencies.
+
+        * include/makeinclude/wrapper_macros.GNU:
+          Let the user override the default VDIR directory, and define the
+          default values for the IDL generated code extensions.
+
+          Thanks to Jody Hagins <jody@atdesk.com> for all these
+          improvements.
+
 Tue Mar 27 19:15:36 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * ace/Unbounded_Queue.h:
diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU
index 96f41a3358f..403ca00fb09 100644
--- a/include/makeinclude/platform_linux.GNU
+++ b/include/makeinclude/platform_linux.GNU
@@ -49,8 +49,14 @@ PLATFORM_WX_LDFLAGS =
 PLATFORM_AIO_SUPPORT := \
        $(shell test -e /usr/lib/librt.so && echo -DACE_HAS_AIO_CALLS)
 
-CC      = gcc
-CXX     = g++
+ifeq ($(insure),1)
+CC  = insure
+CXX = insure
+else
+CC  = gcc
+CXX = g++
+endif
+
 CFLAGS  += -W -Wall -Wpointer-arith -pipe
 ifeq ($(threads),1)
     CFLAGS  += -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT \
diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU
index e05ed654dbb..ed0854313b6 100644
--- a/include/makeinclude/rules.local.GNU
+++ b/include/makeinclude/rules.local.GNU
@@ -231,6 +231,10 @@ ifeq ($(MAKEFILE),)
   MAKEFILE = Makefile
 endif # ! MAKEFILE
 
+ifeq ($(DEPENDENCY_FILE),)
+  DEPENDENCY_FILE = $(MAKEFILE)
+endif
+
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # TAO_ROOT
@@ -262,22 +266,29 @@ ORIGdepend.local: $(MAKEFILE)
 	fi ;\
 	$(RM) $(MAKEFILE).old ;
 
+ifneq ($(MAKEFILE),$(DEPENDENCY_FILE))
+$(DEPENDENCY_FILE):
+	touch $(DEPENDENCY_FILE)
+depend.local: $(DEPENDENCY_FILE)
+include $(DEPENDENCY_FILE)
+endif
+
 depend.local: $(MAKEFILE)
-	@$(RM) $(MAKEFILE).old
-	@cp $(MAKEFILE) $(MAKEFILE).old
-	SOEXT=$(SOEXT) VSHDIR=$(VSHDIR) ACE_DEPEND_SED_CMD="$(ACE_DEPEND_SED_CMD)" $(ACE_ROOT)/bin/g++dep -A -f $(MAKEFILE) $(CPPFLAGS) -DMAKEDEPEND $(LSRC) $(SRC) $(PSRC)
-	@if cmp -s $(MAKEFILE) $(MAKEFILE).old ;\
+	@$(RM) $(DEPENDENCY_FILE).old
+	@cp $(DEPENDENCY_FILE) $(DEPENDENCY_FILE).old
+	SOEXT=$(SOEXT) VSHDIR=$(VSHDIR) ACE_DEPEND_SED_CMD="$(ACE_DEPEND_SED_CMD)" $(ACE_ROOT)/bin/g++dep -A -f $(DEPENDENCY_FILE) $(CPPFLAGS) -DMAKEDEPEND $(LSRC) $(SRC) $(PSRC)
+	@if cmp -s $(DEPENDENCY_FILE) $(DEPENDENCY_FILE).old ;\
 	then echo "Makefile dependencies unchanged." ;\
 	else \
 		echo "Makefile dependencies updated." ;\
 	fi ;\
-	$(RM) $(MAKEFILE).old ;
+	$(RM) $(DEPENDENCY_FILE).old ;
 
 #----------------------------------------------------------------------------
 #       RCS info target
 #----------------------------------------------------------------------------
 
-idl_stubs.local: $(foreach file, $(IDL_FILES), $(file)C.h)
+idl_stubs.local: $(foreach file, $(IDL_FILES), $(file)$(IDL_CLIENT_HDR_EXT))
 
 #----------------------------------------------------------------------------
 #       RCS info target
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
index 891187c3831..9d5e88d1548 100644
--- a/include/makeinclude/wrapper_macros.GNU
+++ b/include/makeinclude/wrapper_macros.GNU
@@ -182,8 +182,41 @@ include $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
 #----------------------------------------------------------------------------
 
 CPPFLAGS        += $(DEFFLAGS) $(INCLDIRS)
+
+# Define default extentions for IDL-generated files
+ifeq ($(IDL_CLIENT_HDR_EXT),)
+IDL_CLIENT_HDR_EXT = C.h
+endif
+ifeq ($(IDL_CLIENT_INL_EXT),)
+IDL_CLIENT_INL_EXT = C.i
+endif
+ifeq ($(IDL_CLIENT_SRC_EXT),)
+IDL_CLIENT_SRC_EXT = C.cpp
+endif
+ifeq ($(IDL_SERVER_HDR_EXT),)
+IDL_SERVER_HDR_EXT = S.h
+endif
+ifeq ($(IDL_SERVER_INL_EXT),)
+IDL_SERVER_INL_EXT = S.i
+endif
+ifeq ($(IDL_SERVER_SRC_EXT),)
+IDL_SERVER_SRC_EXT = S.cpp
+endif
+ifeq ($(IDL_SERVER_THDR_EXT),)
+IDL_SERVER_THDR_EXT = S_T.h
+endif
+ifeq ($(IDL_SERVER_TINL_EXT),)
+IDL_SERVER_TINL_EXT = S_T.i
+endif
+ifeq ($(IDL_SERVER_TSRC_EXT),)
+IDL_SERVER_TSRC_EXT = S_T.cpp
+endif
+
+# This is for Orbix support, not related to TAO's IDL compiler.
+# It is probably obsolete by now, if it works at all.
 IDL             = idl
-IDLFLAGS        = -A -B -s S.cpp -c C.cpp
+IDLFLAGS        = -A -B -s $(IDL_SERVER_SRC_EXT) -c $(IDL_CLIENT_SRC_EXT)
+
 ifeq (,$(findstring -I$(ACE_ROOT),$(INCLDIRS)))
   INCLDIRS        += -I$(ACE_ROOT)
 endif
@@ -215,13 +248,19 @@ ACE_NUL_STDERR = 2>$(ACE_NUL) || true
 PCFLAGS         += #### set in platform_macros.GNU file, e.g., -p
 PCCFLAGS        += #### set in platform_macros.GNU file, e.g., -p
 VAR             =
+
+# Let users override the default VDIR directories
+ifndef VDIR
 VDIR            = .obj/
-ifndef ACELIB
-  ACELIB = -lACE
-endif
+endif # VDIR
 ifndef VSHDIR
   VSHDIR        = .shobj/
 endif # VSHDIR
+
+ifndef ACELIB
+  ACELIB = -lACE
+endif
+
 # NOTE: VLDLIBS is defined below, in case it is overridden for static-
 #       or shared-only builds.
 YACC            = yacc