diff options
| author | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-02-29 20:38:49 +0000 |
|---|---|---|
| committer | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-02-29 20:38:49 +0000 |
| commit | c6235a52ccb73dcf0eb33165ba2092ae0bb2d248 (patch) | |
| tree | 2664dabc91fa06b3a8d0cac99e1aeff0f3b46347 /TAO/docs | |
| parent | 2e1ef06f6bcf744ac2e357f7ded9b24672ea930d (diff) | |
| download | ATCD-c6235a52ccb73dcf0eb33165ba2092ae0bb2d248.tar.gz | |
ChangeLogTag:Sun Feb 29 14:58:50 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
Diffstat (limited to 'TAO/docs')
| -rw-r--r-- | TAO/docs/tutorials/Quoter/Event_Service/Makefile | 14 | ||||
| -rw-r--r-- | TAO/docs/tutorials/Quoter/Naming_Service/Makefile | 12 | ||||
| -rw-r--r-- | TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile | 13 |
3 files changed, 19 insertions, 20 deletions
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Makefile b/TAO/docs/tutorials/Quoter/Event_Service/Makefile index 947cfea3838..f01266006c0 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Makefile +++ b/TAO/docs/tutorials/Quoter/Event_Service/Makefile @@ -18,13 +18,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs IDL_FILES = Quoter BIN2 = client server -#### 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 (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # CosEvent - SRC = $(IDL_SRC) $(addsuffix .cpp, $(BIN) Stock_Consumer Stock_i Stock_Factory_i) CLIENT_OBJS = $(addsuffix .o, client Stock_Consumer) $(IDL_SRC:.cpp=.o) @@ -39,6 +32,13 @@ TAO_IDLFLAGS=-in 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 (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # CosEvent + 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/docs/tutorials/Quoter/Naming_Service/Makefile b/TAO/docs/tutorials/Quoter/Naming_Service/Makefile index 3f8666b1be8..3e259935c94 100644 --- a/TAO/docs/tutorials/Quoter/Naming_Service/Makefile +++ b/TAO/docs/tutorials/Quoter/Naming_Service/Makefile @@ -17,12 +17,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs CPPFLAGS += -I../idl BIN2 = client server -#### 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 # Time SRC = $(addsuffix .cpp, $(BIN) Stock_i Stock_Factory_i) @@ -38,6 +32,12 @@ TAO_IDLFLAGS=-in 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 # Time 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/docs/tutorials/Quoter/RT_Event_Service/Makefile b/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile index 60053e75a7d..24eadb91b35 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile @@ -19,13 +19,6 @@ IDL_FILES = Quoter IDL_SRC = QuoterC.cpp QuoterS.cpp BIN2 = client server -#### 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 (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # RTEvent - SRC = $(addsuffix .cpp, $(BIN) Stock_Consumer Stock_i Stock_Factory_i) \ $(IDL_SRC) @@ -43,6 +36,12 @@ TAO_IDLFLAGS=-in 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 (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # RTEvent include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU |