ChangeLogTag:Thu May 4 14:45:40 2000 Nanbor Wang <nanbor@cs.wustl.edu>

4 files changed, 38 insertions, 22 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index fd557720159..fa22c981a5d 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,8 +1,18 @@
+Thu May  4 14:45:40 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* rules.tao.GNU: Parameterized /bin/true.  Not all OSes put true
+	  in /bin directory.
+
+	* orbsvcs/Trading_Service/Makefile:
+	* orbsvcs/tests/Trading/Makefile: Moved the settings of actually
+	  targets down after rules.tao.GNU.  Otherwise, these tests
+	  wouldn't get compiled even if minimum_corba is not used.
+
 Thu May  4 10:40:17 2000  Darrell Brunsch <brunsch@uci.edu>
 
         * orbsvcs/orbsvcs/AV/AVStreams_i.h:
 
-          Added in the warning(push)/(pop) stuff for MSVC. 
+          Added in the warning(push)/(pop) stuff for MSVC.
 
         * orbsvcs/orbsvcs/AV/AVStreams_i.h:
         * orbsvcs/orbsvcs/AV/AV_Core.h:
@@ -13,7 +23,7 @@ Thu May  4 10:40:17 2000  Darrell Brunsch <brunsch@uci.edu>
           definition of the TAO_AV_CORE template which was busted on
           NT.  The problem was that two singletons existed, one in the
           DLL and one in the program itself.  I changed the template
-          delcaration to use the special macros we have for this 
+          delcaration to use the special macros we have for this
           situation.  This means that the benchmarking test should now
           work.
 
diff --git a/TAO/orbsvcs/Trading_Service/Makefile b/TAO/orbsvcs/Trading_Service/Makefile
index d930633ce63..1e73f7b9ada 100644
--- a/TAO/orbsvcs/Trading_Service/Makefile
+++ b/TAO/orbsvcs/Trading_Service/Makefile
@@ -16,6 +16,14 @@ SRC = Trading_Server.cpp Trading_Service.cpp
 
 BIN2 = Trading_Service
 
+#--------------------------------------------------------------------------
+#       Include macros and targets
+#--------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
 TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
@@ -25,13 +33,6 @@ ifeq (Trader,$(findstring Trader,$(TAO_ORBSVCS)))
   endif # minimum_corba
 endif # Trader
 
-#--------------------------------------------------------------------------
-#       Include macros and targets
-#--------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
diff --git a/TAO/orbsvcs/tests/Trading/Makefile b/TAO/orbsvcs/tests/Trading/Makefile
index 1bc53de51e2..603ee34670e 100644
--- a/TAO/orbsvcs/tests/Trading/Makefile
+++ b/TAO/orbsvcs/tests/Trading/Makefile
@@ -41,17 +41,6 @@ PSRC    = $(addsuffix .cpp,$(BIN))
 ACE_SHLIBS = -lTAO_CosTrading -lTAO_CosNaming -lTAO -lACE
 LDLIBS  = -lTAO_CosTrading -lTAO_CosNaming -lTAO
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Trader,$(findstring Trader,$(TAO_ORBSVCS)))
-  ifeq ($(minimum_corba),0)
-    BIN = $(BIN2)
-    LIB = $(LIB2)
-    SHLIB = $(SHLIB2)
-  endif # minimum_corba
-endif # Trader
-
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #       Include macros and targets
@@ -70,6 +59,18 @@ else # ! ACE_HAS_GNUG_PRE_2_8
 
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
+
+#### If the TAO orbsvcs library wasn't built with sufficient components,
+#### don't try to build here.
+TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+ifeq (Trader,$(findstring Trader,$(TAO_ORBSVCS)))
+  ifeq ($(minimum_corba),0)
+    BIN = $(BIN2)
+    LIB = $(LIB2)
+    SHLIB = $(SHLIB2)
+  endif # minimum_corba
+endif # Trader
+
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU
index dc5d7e4bf56..62f60ad87e3 100644
--- a/TAO/rules.tao.GNU
+++ b/TAO/rules.tao.GNU
@@ -17,6 +17,10 @@ ifndef TAO_IDL
   TAO_IDL = $(TAO_ROOT)/TAO_IDL/tao_idl
 endif
 
+ifndef BIN_TRUE
+  BIN_TRUE = /bin/true
+endif
+
 ifndef COMSPEC
   ifdef ComSpec
     #### ACE+TAO use COMSPEC, but ComSpec is defined.
@@ -160,13 +164,13 @@ IDL_EXT2=Cli.h $(IDL_EXT2_MINUS)
 
 ifneq ($(use_flick),1)
 $(foreach ext, $(IDL_EXT_MINUS), %$(ext)): %C.h
-	@/bin/true $@
+	@$(BIN_TRUE) $@
 
 %C.h: %.idl $(TAO_IDL)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $<
 
 $(foreach ext, $(IDL_EXT2_MINUS), %$(ext)): %Cli.h
-	@/bin/true $@
+	@$(BIN_TRUE) $@
 
 %Cli.h: %.idl $(TAO_IDL)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $<