diff options
Diffstat (limited to 'TAO/orbsvcs/examples/Log')
-rw-r--r-- | TAO/orbsvcs/examples/Log/Basic/Makefile | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/examples/Log/Event/Makefile | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/examples/Log/Notify/Makefile | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/examples/Log/RTEvent/Makefile | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/TAO/orbsvcs/examples/Log/Basic/Makefile b/TAO/orbsvcs/examples/Log/Basic/Makefile index dfcd0e4f810..efa3a93cf56 100644 --- a/TAO/orbsvcs/examples/Log/Basic/Makefile +++ b/TAO/orbsvcs/examples/Log/Basic/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -LDLIBS = -lTAO -lTAO_PortableServer -lTAO_DsLogAdmin -lTAO_CosNaming +LDLIBS = -lTAO_DsLogAdmin -lTAO_CosNaming -lTAO_PortableServer -lTAO PROG_SRCS = \ TLS_Client.cpp \ diff --git a/TAO/orbsvcs/examples/Log/Event/Makefile b/TAO/orbsvcs/examples/Log/Event/Makefile index 630b512cf7d..364a556d139 100644 --- a/TAO/orbsvcs/examples/Log/Event/Makefile +++ b/TAO/orbsvcs/examples/Log/Event/Makefile @@ -18,7 +18,7 @@ BIN2 = Event_Consumer \ Event_Supplier PSRC=$(addsuffix .cpp,$(BIN2)) -LDLIBS = -lTAO -lTAO_PortableServer -lTAO_DsLogAdmin -lTAO_CosNaming -lTAO_DsEventLogAdmin -lTAO_CosEvent +LDLIBS = -lTAO_DsEventLogAdmin -lTAO_DsLogAdmin -lTAO_CosEvent -lTAO_CosNaming -lTAO_PortableServer -lTAO CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \ $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc)) @@ -34,7 +34,7 @@ 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 (Log,$(findstring Log,$(TAO_ORBSVCS))) +ifeq (EventLog,$(findstring EventLog,$(TAO_ORBSVCS))) ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Naming diff --git a/TAO/orbsvcs/examples/Log/Notify/Makefile b/TAO/orbsvcs/examples/Log/Notify/Makefile index dc45afed8c7..248434677e0 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Makefile +++ b/TAO/orbsvcs/examples/Log/Notify/Makefile @@ -18,7 +18,7 @@ BIN2 = Notify_Consumer \ Notify_Supplier PSRC=$(addsuffix .cpp,$(BIN2)) -LDLIBS = -lTAO_CosNotification -lTAO_DsNotifyLogAdmin -lACE -lTAO -lTAO_DsLogAdmin -lTAO_PortableServer -lTAO_CosNaming +LDLIBS = -lTAO_DsNotifyLogAdmin -lTAO_DsLogAdmin -lTAO_CosNotification -lTAO_CosNaming -lTAO_PortableServer -lTAO -lACE CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \ $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc)) @@ -34,7 +34,7 @@ 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 (Log,$(findstring Log,$(TAO_ORBSVCS))) +ifeq (NotifyLog,$(findstring NotifyLog,$(TAO_ORBSVCS))) ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Naming diff --git a/TAO/orbsvcs/examples/Log/RTEvent/Makefile b/TAO/orbsvcs/examples/Log/RTEvent/Makefile index 289f246786a..b018c6f4825 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/Makefile +++ b/TAO/orbsvcs/examples/Log/RTEvent/Makefile @@ -18,7 +18,7 @@ BIN2 = RTEvent_Consumer \ RTEvent_Supplier PSRC=$(addsuffix .cpp,$(BIN2)) -LDLIBS = -lTAO -lTAO_PortableServer -lTAO_DsLogAdmin -lTAO_CosNaming -lTAO_RTEventLogAdmin -lTAO_RTEvent -lTAO_RTSched +LDLIBS = -lTAO_RTEventLogAdmin -lTAO_DsLogAdmin -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_PortableServer -lTAO CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \ $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc)) @@ -34,7 +34,7 @@ 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 (Log,$(findstring Log,$(TAO_ORBSVCS))) +ifeq (RTEventLog,$(findstring RTEventLog,$(TAO_ORBSVCS))) ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Naming |