diff options
| -rw-r--r-- | TAO/orbsvcs/Time_Service/Makefile | 16 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Time/Makefile | 13 |
2 files changed, 15 insertions, 14 deletions
diff --git a/TAO/orbsvcs/Time_Service/Makefile b/TAO/orbsvcs/Time_Service/Makefile index def92d49eb7..452016c573e 100644 --- a/TAO/orbsvcs/Time_Service/Makefile +++ b/TAO/orbsvcs/Time_Service/Makefile @@ -32,24 +32,24 @@ SIMPLE_CRK_OBJS = Clerk_i.o \ VLDLIBS = $(LDLIBS:%=%$(VAR)) -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +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 $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Time,$(findstring Time,$(TAO_ORBSVCS))) - BIN += Time_Service_Server \ - Time_Service_Clerk + BIN = $(BIN2) endif # Time +#---------------------------------------------------------------------------- +# 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.local.GNU include $(TAO_ROOT)/taoconfig.mk diff --git a/TAO/orbsvcs/tests/Time/Makefile b/TAO/orbsvcs/tests/Time/Makefile index b1b6ac5edf2..82666fda853 100644 --- a/TAO/orbsvcs/tests/Time/Makefile +++ b/TAO/orbsvcs/tests/Time/Makefile @@ -25,19 +25,20 @@ SIMPLE_CLT_OBJS = Client_i.o \ VLDLIBS = $(LDLIBS:%=%$(VAR)) -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +BIN2 = 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 (Time,$(findstring Time,$(TAO_ORBSVCS))) - BIN += client + BIN = $(BIN2) endif # Time +#---------------------------------------------------------------------------- +# 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 |