diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-03-08 17:50:08 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-03-08 17:50:08 +0000 |
| commit | 6dde22f08f8dd6c0597f0ce45f72f86c700a15af (patch) | |
| tree | 642a22d2ec0349ff4c6ff112872327533b04888d | |
| parent | 3af787d1e8ae562ed1330d42cec5370793c53682 (diff) | |
| download | ATCD-6dde22f08f8dd6c0597f0ce45f72f86c700a15af.tar.gz | |
ChangeLogTag:Fri Mar 8 09:44:56 2002 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 15 | ||||
| -rw-r--r-- | TAO/examples/Advanced/ch_3/Makefile | 15 |
2 files changed, 25 insertions, 5 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index f6a8c962750..5748eb2aa57 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,18 @@ +Fri Mar 8 09:44:56 2002 Ossama Othman <ossama@uci.edu> + + * examples/Advanced/ch_3/Makefile (LDLIBS): + + Corrected order of libraries to fix link-time errors. Thanks to + James Mansion <james.mansion@uk.nomura.com> suggesting the fix. + + (BIN): + + Do not build the example if CORBA Messaging support is + disabled. The client attempts use + CORBA::Object::_validate_connection(). Thanks to James Mansion + for reporting that the example didn't compile when minimum CORBA + support was enabled. + Fri Mar 8 09:30:32 2002 Ossama Othman <ossama@uci.edu> * orbsvcs/IFR_Service/Repository_i.cpp: diff --git a/TAO/examples/Advanced/ch_3/Makefile b/TAO/examples/Advanced/ch_3/Makefile index 3e974829b23..74016040d81 100644 --- a/TAO/examples/Advanced/ch_3/Makefile +++ b/TAO/examples/Advanced/ch_3/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO -lTAO_PortableServer +LDLIBS = -lTAO_PortableServer -lTAO IDL_FILES = time IDL_SRC = timeC.cpp timeS.cpp IDL_HDR = timeC.h timeS.h @@ -33,10 +33,8 @@ SIMPLE_SVR_OBJS = \ timeS.o \ server.o - -BIN = server \ - client -BUILD = $(BIN) +BIN2 = server \ + client #---------------------------------------------------------------------------- # Include macros and targets @@ -45,6 +43,13 @@ BUILD = $(BIN) include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU + +ifeq ($(corba_messaging),1) + BIN = $(BIN2) +endif # corba_messaging + +BUILD = $(BIN) + include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU |