ChangeLogTag:Fri Sep 24 11:57:21 1999 Nanbor Wang <nanbor@cs.wustl.edu>

15 files changed, 23 insertions, 24 deletions

diff --git a/TAO/orbsvcs/tests/AVStreams/Makefile b/TAO/orbsvcs/tests/AVStreams/Makefile
index fdf8b6efa8c..4745058da05 100644
--- a/TAO/orbsvcs/tests/AVStreams/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Makefile
@@ -23,8 +23,8 @@ endif
 #----------------------------------------------------------------------------
 
 include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(TAO_ROOT)/rules.tao.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.nested.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/Makefile
index cefb4f2c06f..061db66688f 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/Makefile
@@ -22,8 +22,8 @@ endif
 #----------------------------------------------------------------------------
 
 include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(TAO_ROOT)/rules.tao.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.nested.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/Makefile
index 073f7ff7828..9c2153232bd 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/Makefile
@@ -27,8 +27,8 @@ endif
 #----------------------------------------------------------------------------
 
 include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(TAO_ROOT)/rules.tao.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.nested.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
diff --git a/TAO/orbsvcs/tests/CosEC_Basic/Makefile b/TAO/orbsvcs/tests/CosEC_Basic/Makefile
index 9da6d0efc88..546c509a89a 100644
--- a/TAO/orbsvcs/tests/CosEC_Basic/Makefile
+++ b/TAO/orbsvcs/tests/CosEC_Basic/Makefile
@@ -27,8 +27,8 @@ endif # CosEvent
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(TAO_ROOT)/rules.tao.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.local.GNU
diff --git a/TAO/orbsvcs/tests/EC_Basic/Makefile b/TAO/orbsvcs/tests/EC_Basic/Makefile
index c7b1efcfe89..921dbb9c36e 100644
--- a/TAO/orbsvcs/tests/EC_Basic/Makefile
+++ b/TAO/orbsvcs/tests/EC_Basic/Makefile
@@ -24,8 +24,8 @@ endif # Event
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(TAO_ROOT)/rules.tao.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.local.GNU
diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile b/TAO/orbsvcs/tests/EC_Mcast/Makefile
index f859560d8b9..f694ac94c1c 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/Makefile
+++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile
@@ -24,8 +24,8 @@ endif # Event2
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(TAO_ROOT)/rules.tao.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.local.GNU
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile b/TAO/orbsvcs/tests/EC_Multiple/Makefile
index 9afd2735d94..0f76a0d54a9 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Makefile
+++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile
@@ -24,7 +24,6 @@ endif # Event
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
 
 ifeq ($(ACE_HAS_GNUG_PRE_2_8),1)
   # This test causes g++ 2.7.2.3 (the compiler) to core dump.
@@ -32,6 +31,7 @@ ifeq ($(ACE_HAS_GNUG_PRE_2_8),1)
 	@echo orbsvcs/tests/EC_Multiple is not built with older versions of g++
 else # ! ACE_HAS_GNUG_PRE_2_8
   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.local.GNU
diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile b/TAO/orbsvcs/tests/Event/Basic/Makefile
index d89735b71c6..4bfa98dcc3f 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Makefile
+++ b/TAO/orbsvcs/tests/Event/Basic/Makefile
@@ -38,8 +38,8 @@ CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(TAO_ROOT)/rules.tao.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/Event/Makefile b/TAO/orbsvcs/tests/Event/Makefile
index 054196ea233..852e339c598 100644
--- a/TAO/orbsvcs/tests/Event/Makefile
+++ b/TAO/orbsvcs/tests/Event/Makefile
@@ -21,9 +21,8 @@ endif
 #----------------------------------------------------------------------------
 
 include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(TAO_ROOT)/rules.tao.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.nested.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile b/TAO/orbsvcs/tests/Event/Performance/Makefile
index 6ef77b028ad..c4067d79393 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Makefile
+++ b/TAO/orbsvcs/tests/Event/Performance/Makefile
@@ -33,8 +33,8 @@ CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(TAO_ROOT)/rules.tao.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/Event_Latency/Makefile b/TAO/orbsvcs/tests/Event_Latency/Makefile
index 452ba98ef3a..91ea3646a81 100644
--- a/TAO/orbsvcs/tests/Event_Latency/Makefile
+++ b/TAO/orbsvcs/tests/Event_Latency/Makefile
@@ -24,8 +24,8 @@ endif
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(TAO_ROOT)/rules.tao.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.local.GNU
diff --git a/TAO/orbsvcs/tests/Makefile b/TAO/orbsvcs/tests/Makefile
index 43ccc217a53..013d3e6f7ad 100644
--- a/TAO/orbsvcs/tests/Makefile
+++ b/TAO/orbsvcs/tests/Makefile
@@ -34,7 +34,6 @@ endif
 #----------------------------------------------------------------------------
 
 include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
 
 ifndef minimum_corba
 
@@ -52,6 +51,7 @@ endif # minimum_corba
 
 
 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.nested.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
diff --git a/TAO/orbsvcs/tests/Property/Makefile b/TAO/orbsvcs/tests/Property/Makefile
index c572fed4533..06e16b7739b 100644
--- a/TAO/orbsvcs/tests/Property/Makefile
+++ b/TAO/orbsvcs/tests/Property/Makefile
@@ -9,6 +9,10 @@
 #       Local macros
 #----------------------------------------------------------------------------
 
+ifndef TAO_ROOT
+TAO_ROOT = $(ACE_ROOT)/TAO
+endif
+
 LDLIBS     = -lorbsvcs -lTAO
 
 CosProperty_SERVER_OBJS = server.o
@@ -24,17 +28,13 @@ ifeq (Property,$(findstring Property,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Property
 
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(TAO_ROOT)/rules.tao.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.local.GNU
diff --git a/TAO/orbsvcs/tests/Sched/Makefile b/TAO/orbsvcs/tests/Sched/Makefile
index fdbeb1d04b0..8da08d0bc4c 100644
--- a/TAO/orbsvcs/tests/Sched/Makefile
+++ b/TAO/orbsvcs/tests/Sched/Makefile
@@ -25,8 +25,8 @@ endif # Sched
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(TAO_ROOT)/rules.tao.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.local.GNU
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Makefile b/TAO/orbsvcs/tests/Sched_Conf/Makefile
index ca7f270a686..a3bce9f14ca 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Makefile
+++ b/TAO/orbsvcs/tests/Sched_Conf/Makefile
@@ -1,5 +1,9 @@
 # $Id$
 
+ifndef TAO_ROOT
+  TAO_ROOT = $(ACE_ROOT)/TAO
+endif
+
 DUMP_SRCS = Sched_Conf.cpp
 LSRC = $(DUMP_SRCS)
 
@@ -17,17 +21,13 @@ ifeq (Sched,$(findstring Sched,$(TAO_ORBSVCS)))
   BIN = $(BIN2)
 endif # Sched
 
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(TAO_ROOT)/rules.tao.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