ChangeLogTag:Fri Dec 19 10:27:46 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

5 files changed, 36 insertions, 25 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 7b1c8024244..19b8a6d9d27 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Fri Dec 19 10:27:46 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* orbsvcs/Concurrency_Service/Makefile:
+	* orbsvcs/Notify_Service/Makefile:
+	* orbsvcs/Scheduling_Service/Makefile:
+	* orbsvcs/Naming_Service/Makefile:
+
+	  Moved the checks for the status of the conditional variables in 
+	  rules.tao.GNU, after the inclusion of rules.tao.GNU. Thanks to
+	  Thomas Lockhart for reporting this problem.
+
 Fri Dec 19 11:25:13 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/Abstract_Servant_Base.h:
diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile b/TAO/orbsvcs/Concurrency_Service/Makefile
index 6cb1bfb56d3..735bddd14d0 100644
--- a/TAO/orbsvcs/Concurrency_Service/Makefile
+++ b/TAO/orbsvcs/Concurrency_Service/Makefile
@@ -17,14 +17,6 @@ SRC = Concurrency_Service.cpp
 
 BIN2 = Concurrency_Service
 
-#### 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 ($(corba_messaging),1)
-  ifeq (Concurrency,$(findstring Concurrency,$(TAO_ORBSVCS)))
-    BIN = $(BIN2)
-  endif # Concurrency
-endif # corba_messaging
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
@@ -33,6 +25,14 @@ endif # corba_messaging
 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)
+ifeq ($(corba_messaging),1)
+  ifeq (Concurrency,$(findstring Concurrency,$(TAO_ORBSVCS)))
+    BIN = $(BIN2)
+  endif # Concurrency
+endif # corba_messaging
 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/Naming_Service/Makefile b/TAO/orbsvcs/Naming_Service/Makefile
index 143a0e9c367..3236bb2d528 100644
--- a/TAO/orbsvcs/Naming_Service/Makefile
+++ b/TAO/orbsvcs/Naming_Service/Makefile
@@ -17,9 +17,6 @@ SRC = Naming_Server.cpp Naming_Service.cpp
 
 BIN2 = Naming_Service
 
-#### 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)
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
@@ -28,6 +25,9 @@ TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
 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)
 ifeq ($(corba_messaging),1)
   ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
     BIN = $(BIN2)
diff --git a/TAO/orbsvcs/Notify_Service/Makefile b/TAO/orbsvcs/Notify_Service/Makefile
index 4a8621c9ff2..3ab0942d0d3 100644
--- a/TAO/orbsvcs/Notify_Service/Makefile
+++ b/TAO/orbsvcs/Notify_Service/Makefile
@@ -11,14 +11,6 @@ SRC = Notify_Server.cpp Notify_Service.cpp
 
 BIN2 = Notify_Service
 
-#### 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 (Notify,$(findstring Notify,$(TAO_ORBSVCS)))
-  ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-    BIN = $(BIN2)
-  endif # Naming
-endif # Notify
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
@@ -27,6 +19,14 @@ endif # Notify
 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)
+ifeq (Notify,$(findstring Notify,$(TAO_ORBSVCS)))
+  ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
+    BIN = $(BIN2)
+  endif # Naming
+endif # Notify
 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/Scheduling_Service/Makefile b/TAO/orbsvcs/Scheduling_Service/Makefile
index e5e91fd6095..169514492a5 100644
--- a/TAO/orbsvcs/Scheduling_Service/Makefile
+++ b/TAO/orbsvcs/Scheduling_Service/Makefile
@@ -12,12 +12,6 @@ SCHEDULE_OBJS = $(SCHEDULE_SRCS:.cpp=.o)
 
 BIN2 = Scheduling_Service
 
-#### 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 (RtSched,$(findstring RTSched,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Sched
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
@@ -26,6 +20,12 @@ endif # Sched
 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)
+ifeq (RtSched,$(findstring RTSched,$(TAO_ORBSVCS)))
+  BIN = $(BIN2)
+endif # Sched
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 #include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU