diff options
Diffstat (limited to 'TAO/orbsvcs/IFR_Service')
-rw-r--r-- | TAO/orbsvcs/IFR_Service/IFR_Service.cpp | 10 | ||||
-rw-r--r-- | TAO/orbsvcs/IFR_Service/IFR_Service.h | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/IFR_Service/Makefile.am | 66 |
3 files changed, 36 insertions, 42 deletions
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp index f598d35bb93..4ce922eda83 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp @@ -2,11 +2,11 @@ // $Id$ #include "IFR_Service.h" -#include "orbsvcs/IFRService/ComponentRepository_i.h" -#include "orbsvcs/IFRService/Options.h" -#include "orbsvcs/IFRService/IFR_ComponentsS.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" -#include "orbsvcs/IOR_Multicast.h" +#include "orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h" +#include "orbsvcs/orbsvcs/IFRService/Options.h" +#include "orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h" +#include "orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h" +#include "orbsvcs/orbsvcs/IOR_Multicast.h" #include "tao/IORTable/IORTable.h" #include "tao/ORB_Core.h" #include "ace/Auto_Ptr.h" diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.h b/TAO/orbsvcs/IFR_Service/IFR_Service.h index 566eec1207a..a66487d1896 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.h +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.h @@ -17,7 +17,7 @@ #define IFR_SERVICE_H #include "tao/PortableServer/PortableServerC.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h" #include "tao/ORB.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/IFR_Service/Makefile.am b/TAO/orbsvcs/IFR_Service/Makefile.am index 4e6b40c3a68..ef0f466d495 100644 --- a/TAO/orbsvcs/IFR_Service/Makefile.am +++ b/TAO/orbsvcs/IFR_Service/Makefile.am @@ -7,39 +7,36 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.IFR_Service.am -if !BUILD_MINIMUM_CORBA - -bin_PROGRAMS = IFR_Service +noinst_PROGRAMS = IFR_Service IFR_Service_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs + -I$(TAO_BUILDDIR) IFR_Service_SOURCES = \ IFR_Server.cpp \ - IFR_Service.cpp \ - IFR_Service.h + IFR_Service.cpp IFR_Service_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_IFRService.la \ - $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_IFRService.la \ + $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +noinst_HEADERS = \ + IFR_Service.h ## Makefile.TAO_IFR_BE.am -if !BUILD_MINIMUM_CORBA - lib_LTLIBRARIES = libTAO_IFR_BE.la libTAO_IFR_BE_la_CPPFLAGS = \ @@ -67,29 +64,26 @@ libTAO_IFR_BE_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_IFR_BE_la_LIBADD = \ - $(TAO_BUILDDIR)/TAO_IDL/libTAO_IDL_FE.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la + $(TAO_BUILDDIR)/TAO_IDL/libTAO_IDL_FE.la \ + $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la -noinst_HEADERS = \ +noinst_HEADERS += \ be_extern.h \ be_global.h \ - ifr_adding_visitor.h \ + ifr_adding_visitor_union.h \ ifr_adding_visitor_exception.h \ - ifr_adding_visitor_operation.h \ ifr_adding_visitor_structure.h \ - ifr_adding_visitor_union.h \ - ifr_removing_visitor.h \ - ifr_visitor.h + ifr_adding_visitor_operation.h \ + ifr_adding_visitor.h \ + ifr_visitor.h \ + ifr_removing_visitor.h -endif !BUILD_MINIMUM_CORBA ## Makefile.TAO_IFR_EXE.am -if !BUILD_MINIMUM_CORBA - -bin_PROGRAMS += tao_ifr +bin_PROGRAMS = tao_ifr tao_ifr_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -103,8 +97,7 @@ tao_ifr_CPPFLAGS = \ tao_ifr_SOURCES = \ $(TAO_ROOT)/TAO_IDL/driver/drv_args.cpp \ $(TAO_ROOT)/TAO_IDL/driver/drv_preproc.cpp \ - $(TAO_ROOT)/TAO_IDL/tao_idl.cpp \ - $(TAO_ROOT)/TAO_IDL/include/drv_extern.h + $(TAO_ROOT)/TAO_IDL/tao_idl.cpp tao_ifr_LDADD = \ libTAO_IFR_BE.la \ @@ -113,7 +106,8 @@ tao_ifr_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -endif !BUILD_MINIMUM_CORBA +noinst_HEADERS += \ + $(TAO_ROOT)/TAO_IDL/include/drv_extern.h ## Clean up template repositories, etc. clean-local: |