diff options
Diffstat (limited to 'TAO/orbsvcs/Naming_Service/Makefile')
| -rw-r--r-- | TAO/orbsvcs/Naming_Service/Makefile | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/TAO/orbsvcs/Naming_Service/Makefile b/TAO/orbsvcs/Naming_Service/Makefile index c0aa2f883ca..3de7195f3cb 100644 --- a/TAO/orbsvcs/Naming_Service/Makefile +++ b/TAO/orbsvcs/Naming_Service/Makefile @@ -18,7 +18,7 @@ BIN2 = Naming_Service #### 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) +TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Naming @@ -175,13 +175,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG) $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ - $(TAO_ROOT)/tao/IORManipulation.h \ - $(TAO_ROOT)/tao/IORS.h \ - $(TAO_ROOT)/tao/IORC.h \ - $(TAO_ROOT)/tao/IORC.i \ - $(TAO_ROOT)/tao/Servant_Base.h \ - $(TAO_ROOT)/tao/Servant_Base.i \ - $(TAO_ROOT)/tao/IORS.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ $(TAO_ROOT)/tao/corba.h \ @@ -234,6 +227,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG) $(TAO_ROOT)/tao/Key_Adapters.i \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/Servant_Base.i \ $(TAO_ROOT)/tao/POAS.h \ $(TAO_ROOT)/tao/POA_CORBA.h \ $(TAO_ROOT)/tao/DynAnyC.h \ |