diff options
author | bala <balanatarajan@users.noreply.github.com> | 2004-02-29 16:13:56 +0000 |
---|---|---|
committer | bala <balanatarajan@users.noreply.github.com> | 2004-02-29 16:13:56 +0000 |
commit | 524dd8759e3cdbf021f7a6ebd9664c67eae84ce6 (patch) | |
tree | 14d9348d664cfc7b6f7c9efc79b966c34916a520 | |
parent | e58a7f8e4c408ae7c7bf5f7c0f8a680329779721 (diff) | |
download | ATCD-524dd8759e3cdbf021f7a6ebd9664c67eae84ce6.tar.gz |
ChangeLogTag:Sun Feb 29 10:34:26 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
-rw-r--r-- | TAO/ChangeLog | 23 | ||||
-rw-r--r-- | TAO/examples/Advanced/ch_18/Makefile | 12 | ||||
-rw-r--r-- | TAO/examples/Callback_Quoter/Makefile | 12 | ||||
-rw-r--r-- | TAO/examples/Event_Comm/Makefile | 12 | ||||
-rw-r--r-- | TAO/examples/Logging/Makefile | 16 | ||||
-rw-r--r-- | TAO/examples/Persistent_Grid/Makefile | 12 | ||||
-rw-r--r-- | TAO/examples/Simple/bank/Makefile | 12 | ||||
-rw-r--r-- | TAO/examples/Simple/echo/Makefile | 12 | ||||
-rw-r--r-- | TAO/examples/Simple/grid/Makefile | 12 | ||||
-rw-r--r-- | TAO/examples/Simple/time-date/Makefile | 12 | ||||
-rw-r--r-- | TAO/examples/Simple/time/Makefile | 12 | ||||
-rw-r--r-- | TAO/examples/Simulator/Event_Supplier/Makefile | 12 | ||||
-rw-r--r-- | TAO/examples/ior_corbaloc/Makefile | 8 | ||||
-rw-r--r-- | TAO/orbsvcs/Dump_Schedule/Makefile | 13 | ||||
-rw-r--r-- | TAO/orbsvcs/Time_Service/Makefile | 16 |
15 files changed, 109 insertions, 87 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6c16721b59c..70076162562 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,26 @@ +Sun Feb 29 10:34:26 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * examples/Advanced/ch_18/Makefile: + * examples/Callback_Quoter/Makefile: + * examples/Event_Comm/Makefile: + * examples/Logging/Makefile: + * examples/Persistent_Grid/Makefile: + * examples/Simple/bank/Makefile: + * examples/Simple/echo/Makefile: + * examples/Simple/grid/Makefile: + * examples/Simple/time/Makefile: + * examples/Simple/time-date/Makefile: + * examples/Simulator/Event_Supplier/Makefile: + * examples/ior_corbaloc/Makefile: + * orbsvcs/Dump_Schedule/Makefile: + * orbsvcs/Time_Service/Makefile: + + All these Makefiles were busted. They don't build in our daily + builds. The check for ORBSVCS_COMPONENTS was done in the wrong + place. I remember Thomas Lockhart mentioning about some of these + things. I think he had caught all of this already. + + Sun Feb 29 08:40:15 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> * orbsvcs/Makefile*: diff --git a/TAO/examples/Advanced/ch_18/Makefile b/TAO/examples/Advanced/ch_18/Makefile index 15e25a4fadf..f08e1562d2f 100644 --- a/TAO/examples/Advanced/ch_18/Makefile +++ b/TAO/examples/Advanced/ch_18/Makefile @@ -39,12 +39,6 @@ SIMPLE_SVR_OBJS = \ BIN2 = server \ client -#### 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 (Naming,$(findstring Naming,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # Naming BUILD = $(BIN) VLDLIBS = $(LDLIBS:%=%$(VAR)) @@ -57,6 +51,12 @@ VBIN = $(BIN:%=%$(VAR)) 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 (Naming,$(findstring Naming,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # Naming 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/examples/Callback_Quoter/Makefile b/TAO/examples/Callback_Quoter/Makefile index ede6edbd489..a23e247b070 100644 --- a/TAO/examples/Callback_Quoter/Makefile +++ b/TAO/examples/Callback_Quoter/Makefile @@ -66,12 +66,6 @@ BIN2 = notifier \ consumer\ supplier -#### 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 (Naming,$(findstring Naming,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # Naming TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- @@ -82,6 +76,12 @@ 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 (Naming,$(findstring Naming,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # Naming 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/examples/Event_Comm/Makefile b/TAO/examples/Event_Comm/Makefile index 58b4fe7b72e..383a93d15a0 100644 --- a/TAO/examples/Event_Comm/Makefile +++ b/TAO/examples/Event_Comm/Makefile @@ -53,12 +53,6 @@ BIN2 = supplier \ consumer TAO_IDLFLAGS += -Ge 1 -#### 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 (Naming,$(findstring Naming,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # Naming #---------------------------------------------------------------------------- # Include macros and targets @@ -67,6 +61,12 @@ endif # Naming 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 (Naming,$(findstring Naming,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # Naming 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/examples/Logging/Makefile b/TAO/examples/Logging/Makefile index 8805b98f3bc..6db6eb7ed95 100644 --- a/TAO/examples/Logging/Makefile +++ b/TAO/examples/Logging/Makefile @@ -31,14 +31,6 @@ TEST_OBJS = $(COMMON_OBJS) Logging_Test.o Logging_Test_i.o BIN2 = Logging_Service Logging_Test -#### 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 (Naming,$(findstring Naming,$(TAO_ORBSVCS))) - ifeq (LifeCycle,$(findstring LifeCycle,$(TAO_ORBSVCS))) - BIN = $(BIN2) - endif # LifeCycle -endif # Naming #---------------------------------------------------------------------------- # Include macros and targets @@ -47,6 +39,14 @@ endif # Naming 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 (Naming,$(findstring Naming,$(TAO_ORBSVCS))) + ifeq (LifeCycle,$(findstring LifeCycle,$(TAO_ORBSVCS))) + BIN = $(BIN2) + endif # LifeCycle +endif # Naming 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/examples/Persistent_Grid/Makefile b/TAO/examples/Persistent_Grid/Makefile index 71698fe93a4..f775f254553 100644 --- a/TAO/examples/Persistent_Grid/Makefile +++ b/TAO/examples/Persistent_Grid/Makefile @@ -50,12 +50,6 @@ BIN2 = server \ client \ persistent_client -#### If the TAO orbsvcs library wasn't built with sufficient components, -#### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) -ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # Naming TAO_IDLFLAGS += -Ge 1 @@ -66,6 +60,12 @@ TAO_IDLFLAGS += -Ge 1 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 $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # Naming 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/examples/Simple/bank/Makefile b/TAO/examples/Simple/bank/Makefile index 8ef39505954..5ce8207a9ff 100644 --- a/TAO/examples/Simple/bank/Makefile +++ b/TAO/examples/Simple/bank/Makefile @@ -43,12 +43,6 @@ SIMPLE_SVR_OBJS = \ BIN2 = server \ client -#### 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 (Naming,$(findstring Naming,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # Naming TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- @@ -58,6 +52,12 @@ TAO_IDLFLAGS += -Ge 1 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 (Naming,$(findstring Naming,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # Naming 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/examples/Simple/echo/Makefile b/TAO/examples/Simple/echo/Makefile index d43a5da31c4..c538c0d9647 100644 --- a/TAO/examples/Simple/echo/Makefile +++ b/TAO/examples/Simple/echo/Makefile @@ -42,12 +42,6 @@ SIMPLE_SVR_OBJS = \ BIN2 = server \ client -#### 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 (Naming,$(findstring Naming,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # Naming TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- @@ -57,6 +51,12 @@ TAO_IDLFLAGS += -Ge 1 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 (Naming,$(findstring Naming,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # Naming 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/examples/Simple/grid/Makefile b/TAO/examples/Simple/grid/Makefile index 67b8202a4f4..2f5acf984aa 100644 --- a/TAO/examples/Simple/grid/Makefile +++ b/TAO/examples/Simple/grid/Makefile @@ -42,12 +42,6 @@ SIMPLE_SVR_OBJS = \ BIN2 = server \ client -#### 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 (Naming,$(findstring Naming,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # Naming TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- @@ -57,6 +51,12 @@ TAO_IDLFLAGS += -Ge 1 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 (Naming,$(findstring Naming,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # Naming 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/examples/Simple/time-date/Makefile b/TAO/examples/Simple/time-date/Makefile index de8ed3a5f0d..30e778d1237 100644 --- a/TAO/examples/Simple/time-date/Makefile +++ b/TAO/examples/Simple/time-date/Makefile @@ -43,12 +43,6 @@ SIMPLE_SVR_OBJS = server.o BIN2 = server \ client -#### 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 (Naming,$(findstring Naming,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # Naming TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- @@ -58,6 +52,12 @@ TAO_IDLFLAGS += -Ge 1 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 (Naming,$(findstring Naming,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # Naming 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/examples/Simple/time/Makefile b/TAO/examples/Simple/time/Makefile index 466f1a5018f..d55092688dc 100644 --- a/TAO/examples/Simple/time/Makefile +++ b/TAO/examples/Simple/time/Makefile @@ -42,12 +42,6 @@ SIMPLE_SVR_OBJS = \ BIN2 = server \ client -#### 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 (Naming,$(findstring Naming,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # Naming TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- @@ -57,6 +51,12 @@ TAO_IDLFLAGS += -Ge 1 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 (Naming,$(findstring Naming,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # Naming 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/examples/Simulator/Event_Supplier/Makefile b/TAO/examples/Simulator/Event_Supplier/Makefile index 5f2277da4c8..080440ccddc 100644 --- a/TAO/examples/Simulator/Event_Supplier/Makefile +++ b/TAO/examples/Simulator/Event_Supplier/Makefile @@ -20,12 +20,6 @@ LDLIBS = -lTAO_Messaging -lTAO_RTOLDEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosN BIN2 = Event_Sup Logging_Sup DualEC_Sup Event_Con -#### 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 (RTOLDEvent,$(findstring RTOLDEvent,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # RTOLDEvent #---------------------------------------------------------------------------- # Include macros and targets @@ -34,6 +28,12 @@ endif # RTOLDEvent 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 (RTOLDEvent,$(findstring RTOLDEvent,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # RTOLDEvent 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/examples/ior_corbaloc/Makefile b/TAO/examples/ior_corbaloc/Makefile index b58b4dbc0be..f88596ee821 100644 --- a/TAO/examples/ior_corbaloc/Makefile +++ b/TAO/examples/ior_corbaloc/Makefile @@ -26,10 +26,6 @@ CORBANAME_CLIENT_OBJS = $(addsuffix .o, corbaname_client status_i) $(IDL_SRC:.cp TAO_IDLFLAGS += -Ge 1 -TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) -ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # Naming #---------------------------------------------------------------------------- # Include macros and targets @@ -38,6 +34,10 @@ endif # Naming include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # Naming 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/Dump_Schedule/Makefile b/TAO/orbsvcs/Dump_Schedule/Makefile index f102d771fab..1f66a1a598e 100644 --- a/TAO/orbsvcs/Dump_Schedule/Makefile +++ b/TAO/orbsvcs/Dump_Schedule/Makefile @@ -12,13 +12,6 @@ DUMP_OBJS = $(DUMP_SRCS:.cpp=.o) BIN2 = Dump_Schedule -#### 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 +19,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 diff --git a/TAO/orbsvcs/Time_Service/Makefile b/TAO/orbsvcs/Time_Service/Makefile index b8b471ea832..f00c9736c76 100644 --- a/TAO/orbsvcs/Time_Service/Makefile +++ b/TAO/orbsvcs/Time_Service/Makefile @@ -30,14 +30,6 @@ SIMPLE_CRK_OBJS = Clerk_i.o \ BIN2 = Time_Service_Server \ Time_Service_Clerk -#### 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 (Time,$(findstring Time,$(TAO_ORBSVCS))) - BIN = $(BIN2) - endif # Time -endif # corba_messaging #---------------------------------------------------------------------------- # Include macros and targets @@ -46,6 +38,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 (Time,$(findstring Time,$(TAO_ORBSVCS))) + BIN = $(BIN2) + endif # Time +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.local.GNU |