diff options
| author | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-25 18:27:48 +0000 |
|---|---|---|
| committer | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-25 18:27:48 +0000 |
| commit | 25eea5838efb335117c52c8076be8ac48c7bbf24 (patch) | |
| tree | f5ffc6d4c535e6849a7daffc0ad7f46b4ce07c31 | |
| parent | 0f540a7b632f5d6899c2f12bbd803ace37361ee1 (diff) | |
| download | ATCD-25eea5838efb335117c52c8076be8ac48c7bbf24.tar.gz | |
ChangeLogTag: Fri Aug 25 11:20:13 2000 Priyanka Gontla <pgontla@ece.uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Interoperable_Naming/Makefile | 18 |
2 files changed, 18 insertions, 6 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index b14f7f3b0a6..4e364ff3c9e 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,8 @@ +Fri Aug 25 11:20:13 2000 Priyanka Gontla <pgontla@ece.uci.edu> + + * orbsvcs/tests/Interoperable_Naming/Makefile: + Modified the order in which the files are compiled. + Thu Aug 24 21:03:11 2000 Jeff Parsons <parsons@cs.wustl.edu> * TAO_IDL/Makefile: @@ -442,6 +447,7 @@ Wed Aug 23 00:28:09 2000 Irfan Pyarali <irfan@cs.wustl.edu> TAO_POA_Policies, improved the memory management of the policies obtained from the ORB Core. +>>>>>>> 1.1301 Tue Aug 22 16:41:02 2000 Pradeep Gore <pradeep@cs.wustl.edu> * orbsvcs/tests/Notify/Basic/IdAssignment.cpp: diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/Makefile b/TAO/orbsvcs/tests/Interoperable_Naming/Makefile index e1430f5c79b..37e1ed15fba 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/Makefile +++ b/TAO/orbsvcs/tests/Interoperable_Naming/Makefile @@ -18,8 +18,20 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs IDL_FILES = Web_Server IDL_SRC = Web_ServerC.cpp Web_ServerS.cpp +CLIENT_SRC = client.cpp ncontextext_client_i.cpp + +LSRC = $(IDL_SRC) $(CLIENT_SRC) + +CLIENT_OBJS= $(IDL_SRC:.cpp=.o) $(CLIENT_SRC:.cpp=.o) + +WEB_SERVER_OBJS = Web_ServerC.o \ + Web_ServerS.o \ + client.o + BIN2 = client +TAO_IDLFLAGS = -Ge 1 + #### 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) @@ -27,12 +39,6 @@ ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Naming -SRC = $(addsuffix .cpp, $(BIN2) ncontextext_client_i) $(IDL_SRC) - -CLIENT_OBJS=$(addsuffix .o, client ncontextext_client_i) Web_ServerC.o Web_ServerS.o - -TAO_IDLFLAGS = -Ge 1 - #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- |