diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-04-09 17:14:24 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-04-09 17:14:24 +0000 |
| commit | b6f30a7aac5793854b319e7a824787d10d48d29d (patch) | |
| tree | f185d49769c4f16ec10d4a446672d3f2e20fedd6 /TAO/orbsvcs/tests/Notify | |
| parent | 3f2c5466c98296f743b01ad6245ec8ca1dad53cc (diff) | |
| download | ATCD-b6f30a7aac5793854b319e7a824787d10d48d29d.tar.gz | |
ChangeLogTag: Wed Apr 09 19:13:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/orbsvcs/tests/Notify')
| -rw-r--r-- | TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile index 2107bdf0c32..44b66343b54 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile @@ -12,8 +12,8 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -BIN = Structured_Supplier Structured_Consumer \ - Sequence_Supplier Sequence_Consumer +BIN2 = Structured_Supplier Structured_Consumer \ + Sequence_Supplier Sequence_Consumer IDL_FILES = go IDL_SRC = goC.cpp goS.cpp @@ -37,8 +37,17 @@ SRC = Structured_Supplier.cpp common.cpp \ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I../../lib LDLIBS = -lTAO_NotifyTests -lTAO_CosNotification -lTAO_ETCL -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO - 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 (Notify,$(findstring Notify,$(TAO_ORBSVCS))) + ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) + BIN = $(BIN2) + endif # Naming +endif # Notify + #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- |