From 1d7ba9b9573041bb5b859b08908f6673f68f8566 Mon Sep 17 00:00:00 2001 From: levine Date: Mon, 12 Apr 1999 19:20:33 +0000 Subject: only build if the orbsvcs library was built with the necessary component --- TAO/orbsvcs/LifeCycle_Service/Makefile | 43 +++++++++++++++++----------------- TAO/orbsvcs/Trading_Service/Makefile | 23 ++++++++++++------ TAO/orbsvcs/tests/Property/Makefile | 24 ++++++++++++------- TAO/orbsvcs/tests/Trading/Makefile | 27 +++++++++++++++------ 4 files changed, 73 insertions(+), 44 deletions(-) diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile b/TAO/orbsvcs/LifeCycle_Service/Makefile index 20b9f4b48ec..88a6f53a4f1 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Makefile +++ b/TAO/orbsvcs/LifeCycle_Service/Makefile @@ -10,53 +10,54 @@ endif # TAO_ROOT TAO_IDLFLAGS=-I$(TAO_ROOT)/orbsvcs/orbsvcs - -BIN = LifeCycle_Service - - # The following lines tell the souce code that the trading # service is available. LIFECYCLE_SERVICE_SRCS = \ - LifeCycle_Service.cpp LifeCycle_Service_i.cpp \ - Factory_Trader.cpp Criteria_Evaluator.cpp - + LifeCycle_Service.cpp LifeCycle_Service_i.cpp \ + Factory_Trader.cpp Criteria_Evaluator.cpp LSRC= \ - LifeCycle_Service.cpp LifeCycle_Service_i.cpp \ - Factory_Trader.cpp Criteria_Evaluator.cpp + LifeCycle_Service.cpp LifeCycle_Service_i.cpp \ + Factory_Trader.cpp Criteria_Evaluator.cpp LIFECYCLE_SERVICE_OBJS = LifeCycle_Service.o LifeCycle_Service_i.o \ - Factory_Trader.o Criteria_Evaluator.o + Factory_Trader.o Criteria_Evaluator.o LDLIBS = -lorbsvcs -lTAO +BIN2 = LifeCycle_Service + +#### 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 (LifeCycle,$(findstring LifeCycle,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # LifeCycle + #---------------------------------------------------------------------------- -# Include macros and targets +# Include macros and targets #---------------------------------------------------------------------------- -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU +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 $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU #### Local rules and variables... TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs \ - -I$(TAO_ROOT) $(TSS_ORB_FLAG) - -realclean: clean + -I$(TAO_ROOT) $(TSS_ORB_FLAG) LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) - #---------------------------------------------------------------------------- -# Dependencies +# Dependencies #---------------------------------------------------------------------------- # DO NOT DELETE THIS LINE -- g++dep uses it. diff --git a/TAO/orbsvcs/Trading_Service/Makefile b/TAO/orbsvcs/Trading_Service/Makefile index cd6b7f35f11..437e16909c3 100644 --- a/TAO/orbsvcs/Trading_Service/Makefile +++ b/TAO/orbsvcs/Trading_Service/Makefile @@ -3,21 +3,26 @@ # Build the TAO Trading Service #-------------------------------------------------------------------------- #-------------------------------------------------------------------------- -# Local macros +# Local macros #-------------------------------------------------------------------------- -BIN = Trading_Service - -LDLIBS = -lorbsvcs -lTAO +LDLIBS = -lorbsvcs -lTAO VLDLIBS = $(LDLIBS:%=%$(VAR)) -BUILD = $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN) +SRC = $(addsuffix .cpp, $(BIN)) + +BIN2 = Trading_Service -SRC=$(addsuffix .cpp, $(BIN)) +#### 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 (Trader,$(findstring Trader,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # Trader #-------------------------------------------------------------------------- -# Include macros and targets +# Include macros and targets #-------------------------------------------------------------------------- include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU @@ -37,6 +42,10 @@ endif LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG) +#---------------------------------------------------------------------------- +# Dependencies +#---------------------------------------------------------------------------- + # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. diff --git a/TAO/orbsvcs/tests/Property/Makefile b/TAO/orbsvcs/tests/Property/Makefile index 4f07b113dab..15c81746161 100644 --- a/TAO/orbsvcs/tests/Property/Makefile +++ b/TAO/orbsvcs/tests/Property/Makefile @@ -1,12 +1,12 @@ #---------------------------------------------------------------------------- -# $Id$ +# $Id$ # -# Top-level Makefile for the CosPropertyService Demo. +# Top-level Makefile for the CosPropertyService Demo. # #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- -# Local macros +# Local macros #---------------------------------------------------------------------------- LDLIBS = -lorbsvcs -lTAO @@ -15,13 +15,19 @@ CosProperty_SERVER_OBJS = server.o CosProperty_CLIENT_OBJS = client.o SRC=server.cpp client.cpp -BIN = server client -BUILD = $(BIN) VLDLIBS = $(LDLIBS:%=%$(VAR)) +BIN2 = server 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 (Property,$(findstring Property,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # Property #---------------------------------------------------------------------------- -# Include macros and targets +# Include macros and targets #---------------------------------------------------------------------------- include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU @@ -43,9 +49,9 @@ server:$(addprefix $(VDIR),$(CosProperty_SERVER_OBJS)) client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) -realclean: clean - -/bin/rm -rf - +#---------------------------------------------------------------------------- +# Dependencies +#---------------------------------------------------------------------------- # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. diff --git a/TAO/orbsvcs/tests/Trading/Makefile b/TAO/orbsvcs/tests/Trading/Makefile index 5eeac9d2417..d796244c8fe 100644 --- a/TAO/orbsvcs/tests/Trading/Makefile +++ b/TAO/orbsvcs/tests/Trading/Makefile @@ -8,15 +8,16 @@ # Local macros #---------------------------------------------------------------------------- -BIN = export_test import_test colocated_test - MAKEFILE = Makefile + +BIN2 = export_test import_test colocated_test + LIBNAME = libTTest -LIB = $(LIBNAME).a -SHLIB = $(LIBNAME).$(SOEXT) +LIB2 = $(LIBNAME).a +SHLIB2 = $(LIBNAME).$(SOEXT) ifndef TAO_ROOT -TAO_ROOT = $(ACE_ROOT)/TAO + TAO_ROOT = $(ACE_ROOT)/TAO endif IDL_FILES = TTestC \ @@ -37,6 +38,15 @@ LIBS = -lorbsvcs -lTAO LDLIBS = -lTTest -lorbsvcs -lTAO VLDLIBS = $(LDLIBS:%=%$(VAR)) +#### 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 (Trader,$(findstring Trader,$(TAO_ORBSVCS))) + BIN = $(BIN2) + LIB = $(LIB2) + SHLIB = $(SHLIB2) +endif # Trader + #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- @@ -53,11 +63,14 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .PRECIOUS: TTestS.cpp TTestS.h TTestC.cpp TTestC.h clean: - -/bin/rm -rf *.o $(BIN) obj.* core Templates.DB .make.state + -$(RM) *.o $(BIN) obj.* core Templates.DB .make.state realclean: clean - -/bin/rm -rf $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES)) TTestS_T.* + -$(RM) $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES)) TTestS_T.* +#---------------------------------------------------------------------------- +# Dependencies +#---------------------------------------------------------------------------- # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -- cgit v1.2.1