diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2001-01-06 22:51:24 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2001-01-06 22:51:24 +0000 |
| commit | c2f8083ba93ee08638a28e13ba05f1c0255dce45 (patch) | |
| tree | 9dd394efc7e703e05300c4b73815f270dd295136 | |
| parent | c6b322ed48ab7e8b05606ee4512eb8401cb5ea1f (diff) | |
| download | ATCD-c2f8083ba93ee08638a28e13ba05f1c0255dce45.tar.gz | |
ChangeLogTag: Sat Jan 6 16:43:21 2001 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/Makefile.BE | 10 | ||||
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/Makefile.EX | 6 |
3 files changed, 18 insertions, 3 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 50b2d1126f3..3c0133d1403 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,8 @@ +Sat Jan 6 16:43:21 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * orbsvcs/IFR_Service/Makefile.tao_ifr: + * orbsvcs/IFR_Service/Makefile.BE: Fixed compile errors + Fri Jan 5 14:19:03 2001 Darrell Brunsch <brunsch@uci.edu> * orbsvcs/ImplRepo_Service/Options.cpp: diff --git a/TAO/orbsvcs/IFR_Service/Makefile.BE b/TAO/orbsvcs/IFR_Service/Makefile.BE index 95e40df25c4..3c148aadb7c 100644 --- a/TAO/orbsvcs/IFR_Service/Makefile.BE +++ b/TAO/orbsvcs/IFR_Service/Makefile.BE @@ -20,8 +20,8 @@ VPATH = . MAKEFILE=Makefile.BE LIBNAME = libTAO_IFR_BE_DLL -LIB = $(LIBNAME).a -SHLIB = $(LIBNAME).$(SOEXT) +LIB_UNCHECKED = $(LIBNAME).a +SHLIB_UNCHECKED = $(LIBNAME).$(SOEXT) FILES = be_global \ be_produce \ @@ -42,6 +42,12 @@ 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 + +ifeq ($(interface_repo),1) + LIB = $(LIB_UNCHECKED) + SHLIB = $(SHLIB_UNCHECKED) +endif # interface_repo + include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU diff --git a/TAO/orbsvcs/IFR_Service/Makefile.EX b/TAO/orbsvcs/IFR_Service/Makefile.EX index 094077ea9c2..b5768982d67 100644 --- a/TAO/orbsvcs/IFR_Service/Makefile.EX +++ b/TAO/orbsvcs/IFR_Service/Makefile.EX @@ -14,7 +14,6 @@ endif # ! TAO_ROOT LDLIBS += -lTAO_IFR_BE_DLL -lTAO -lTAO_IDL_FE_DLL -BIN = tao_ifr VPATH = . @@ -35,6 +34,11 @@ SRC = $(addsuffix .cpp,$(FILES)) include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU + +ifeq ($(interface_repo),1) + BIN = tao_ifr +endif # interface_repo + include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU |