diff options
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/Makefile.BE | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/Makefile.EX | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/Makefile.tao_ifr | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/TAO/orbsvcs/IFR_Service/Makefile.BE b/TAO/orbsvcs/IFR_Service/Makefile.BE index 14ec91078fb..d5a26fedaab 100644 --- a/TAO/orbsvcs/IFR_Service/Makefile.BE +++ b/TAO/orbsvcs/IFR_Service/Makefile.BE @@ -12,8 +12,8 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO_IDL_FE_DLL -ACE_SHLIBS = -lTAO_IDL_FE_DLL -lACE +LDLIBS += -lTAO_IDL_FE_DLL -lTAO +ACE_SHLIBS += -lTAO_IDL_FE_DLL -lACE VPATH = . @@ -41,16 +41,18 @@ LSRC = $(addsuffix .cpp,$(FILES)) include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(TAO_ROOT)/rules.tao.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU +include $(TAO_ROOT)/taoconfig.mk #---------------------------------------------------------------------------- # Local targets #---------------------------------------------------------------------------- -CPPFLAGS += -I../TAO_IDL/include -I../TAO_IDL/fe +CPPFLAGS += -I../../TAO_IDL/include -I../../TAO_IDL/fe realclean: clean diff --git a/TAO/orbsvcs/IFR_Service/Makefile.EX b/TAO/orbsvcs/IFR_Service/Makefile.EX index bcf7de94e48..473b57a4286 100644 --- a/TAO/orbsvcs/IFR_Service/Makefile.EX +++ b/TAO/orbsvcs/IFR_Service/Makefile.EX @@ -44,7 +44,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU # Local targets #---------------------------------------------------------------------------- -CPPFLAGS += -I../TAO_IDL/include -I../TAO_IDL/fe +CPPFLAGS += -I../../TAO_IDL/include -I../../TAO_IDL/fe ifeq ($(TAO_IDL_PREPROCESSOR),) CPPFLAGS += -DTAO_IDL_PREPROCESSOR=\"$(strip $(CXX))\" diff --git a/TAO/orbsvcs/IFR_Service/Makefile.tao_ifr b/TAO/orbsvcs/IFR_Service/Makefile.tao_ifr index 847c1570bae..a23ad84d41b 100644 --- a/TAO/orbsvcs/IFR_Service/Makefile.tao_ifr +++ b/TAO/orbsvcs/IFR_Service/Makefile.tao_ifr @@ -23,7 +23,7 @@ include $(TAO_ROOT)/rules.tao.GNU #--------------------------------------------------------------------------- MKLIST = \ - ../TAO_IDL/Makefile.FE \ + ../../TAO_IDL/Makefile.FE \ Makefile.BE \ Makefile.EX \ Makefile.dependencies |