summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2001-09-10 17:19:16 +0000
committerbala <balanatarajan@users.noreply.github.com>2001-09-10 17:19:16 +0000
commit7020b51d9d103e20f8ae0af2a5ac34b38a73ae75 (patch)
treebaeac244a4b4d8f64b999cbc6b48be6b4a5b630b
parente7ea9324a08a3b07889aae0876505f0f7b8f9ca2 (diff)
downloadATCD-7020b51d9d103e20f8ae0af2a5ac34b38a73ae75.tar.gz
ChangeLogTag: Mon Sep 10 12:17:12 2001 Balachandran Natarajan <bala@cs.wustl.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a7
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile8
2 files changed, 11 insertions, 4 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 32edb9c97ce..2b75d68b5e5 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Mon Sep 10 12:17:12 2001 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile:
+ Moved the libraries around to get proper link line. It was
+ busted. Further added a realclean so that we remove strange
+ generated files out of the directory.
+
Mon Sep 10 07:41:05 2001 Balachandran Natarajan <bala@cs.wustl.edu>
* tests/Xt_Stopwatch/Makefile: Updated dependencies.
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile
index f1e89749f9a..feed75a9b99 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile
@@ -12,8 +12,6 @@ ifndef TAO_ROOT
TAO_ROOT = $(ACE_ROOT)/TAO
endif # ! TAO_ROOT
-LDLIBS = -lRTCORBA_Common
-
BIN_UNCHECKED = server client
CLIENT_OBJS = client.o
@@ -24,6 +22,7 @@ VBIN = $(BIN:%=%$(VAR))
SRC=$(CLIENT_OBJS:.o=.cpp) $(SERVER_OBJS:.o=.cpp)
CPPFLAGS += -I../Common
+TAO_IDL_FLAGS += -Ge 1
#----------------------------------------------------------------------------
# Include macros and targets
#----------------------------------------------------------------------------
@@ -47,8 +46,8 @@ include $(TAO_ROOT)/taoconfig.mk
# Local targets
#----------------------------------------------------------------------------
-RT_TAO_SRVR_LIBS := -lTAO_Strategies $(RT_TAO_SRVR_LIBS)
-RT_TAO_CLNT_LIBS := -lTAO_Strategies $(RT_TAO_CLNT_LIBS)
+RT_TAO_SRVR_LIBS := -lRTCORBA_Common -lTAO_Strategies $(RT_TAO_SRVR_LIBS)
+RT_TAO_CLNT_LIBS := -lRTCORBA_Common -lTAO_Strategies $(RT_TAO_CLNT_LIBS)
server: $(addprefix $(VDIR),$(SERVER_OBJS))
$(LINK.cc) $(LDFLAGS) -o $@ $^ $(RT_TAO_SRVR_LIBS) $(LDLIBS) $(POSTLINK)
@@ -57,6 +56,7 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(LINK.cc) $(LDFLAGS) -o $@ $^ $(RT_TAO_CLNT_LIBS) $(LDLIBS) $(POSTLINK)
realclean: clean
+ -$(RM) $(foreach ext, $(IDL_EXT), test$(ext))
# DO NOT DELETE THIS LINE -- g++dep uses it.
# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.