removed old Quantify LINK_COMMANDs

3 files changed, 46 insertions, 55 deletions

diff --git a/performance-tests/TTCP/ACE-C++/Makefile b/performance-tests/TTCP/ACE-C++/Makefile
index 3820539493c..fe79334e82b 100644
--- a/performance-tests/TTCP/ACE-C++/Makefile
+++ b/performance-tests/TTCP/ACE-C++/Makefile
@@ -1,52 +1,47 @@
 #----------------------------------------------------------------------------
-#	$Id: Makefile	1.1	10/18/96
+#       $Id$
 #
-#	Makefile for the wrapper-new-ttcp
+#       Makefile for the wrapper-new-ttcp
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#	Local macros
+#       Local macros
 #----------------------------------------------------------------------------
 
-BIN   	= wrapper-new-ttcp
+BIN     = wrapper-new-ttcp
 
-LSRC	= $(addsuffix .cpp,$(FILES))
-LOBJ	= $(addsuffix .o,$(FILES))
+LSRC    = $(addsuffix .cpp,$(FILES))
+LOBJ    = $(addsuffix .o,$(FILES))
+
+LDLIBS  = $(addprefix .obj/,$(LOBJ)) -Bstatic -Bdynamic
 
-LDLIBS	= $(addprefix .obj/,$(LOBJ)) -Bstatic -Bdynamic
- 
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-BUILD 	= $(VOBJS) $(VBIN)
+BUILD   = $(VOBJS) $(VBIN)
 
 #----------------------------------------------------------------------------
-#	Include macros and targets
+#       Include macros and targets
 #----------------------------------------------------------------------------
 
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.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.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.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.bin.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 #----------------------------------------------------------------------------
-#	Local targets
+#       Local targets
 #----------------------------------------------------------------------------
 
-LINK_COMMAND = quantify -cache-dir=/$(IR)/quantify
-
 CCFLAGS = -O2 -DLM_RESULTS
 #CCFLAGS = -g -DLM_RESULTS
 #DCCFLAGS = -g
 
 #----------------------------------------------------------------------------
-#	Dependencies
+#       Dependencies
 #----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
diff --git a/performance-tests/TTCP/C/Makefile b/performance-tests/TTCP/C/Makefile
index cb1105e80b0..fbd68860c43 100644
--- a/performance-tests/TTCP/C/Makefile
+++ b/performance-tests/TTCP/C/Makefile
@@ -1,52 +1,47 @@
 #----------------------------------------------------------------------------
-#	$Id: Makefile	1.1	10/18/96
+#       $Id$
 #
-#	Makefile for the wrapper-new-ttcp
+#       Makefile for the wrapper-new-ttcp
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#	Local macros
+#       Local macros
 #----------------------------------------------------------------------------
 
-BIN   	= new-ttcp
+BIN     = new-ttcp
 
-LSRC	= $(addsuffix .cpp,$(FILES))
-LOBJ	= $(addsuffix .o,$(FILES))
+LSRC    = $(addsuffix .cpp,$(FILES))
+LOBJ    = $(addsuffix .o,$(FILES))
+
+LDLIBS  = $(addprefix .obj/,$(LOBJ)) -Bstatic -Bdynamic
 
-LDLIBS	= $(addprefix .obj/,$(LOBJ)) -Bstatic -Bdynamic
- 
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-BUILD 	= $(VOBJS) $(VBIN)
+BUILD   = $(VOBJS) $(VBIN)
 
 #----------------------------------------------------------------------------
-#	Include macros and targets
+#       Include macros and targets
 #----------------------------------------------------------------------------
 
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.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.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.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.bin.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 #----------------------------------------------------------------------------
-#	Local targets
+#       Local targets
 #----------------------------------------------------------------------------
 
-LINK_COMMAND = quantify -cache-dir=/$(IR)/quantify
-
 CCFLAGS = -O2 -DLM_RESULTS
 #CCFLAGS = -g -DLM_RESULTS
 #DCCFLAGS = -g
 
 #----------------------------------------------------------------------------
-#	Dependencies
+#       Dependencies
 #----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
diff --git a/performance-tests/TTCP/Orbix/Makefile b/performance-tests/TTCP/Orbix/Makefile
index 3a8c4a9ffd4..c5a9eb901fa 100644
--- a/performance-tests/TTCP/Orbix/Makefile
+++ b/performance-tests/TTCP/Orbix/Makefile
@@ -1,6 +1,10 @@
+#----------------------------------------------------------------------------
+#       $Id$
+#----------------------------------------------------------------------------
+
 include ./orbix_defaults.mk
 
-all:	client server
+all: client server
 	@echo
 
 	@echo "\"client\" and \"server\" have been compiled."
@@ -9,12 +13,9 @@ all:	client server
 	@echo
 
 C++FLAGS += -DWANT_ORBIX_FDS -DLM_RESULTS
-IDLFLAGS	+= -c C.cpp -s S.cpp -B
-SERVER_OBJS	= ttcpS.o ttcp_i.o
-CLIENT_OBJS	= ttcpC.o ttcp_i.o
-
-#QUANTIFY	=
-QUANTIFY	= quantify -cache-dir=$(IR)/quantify
+IDLFLAGS        += -c C.cpp -s S.cpp -B
+SERVER_OBJS     = ttcpS.o ttcp_i.o
+CLIENT_OBJS     = ttcpC.o ttcp_i.o
 
 client: $(CLIENT_OBJS)
 	$(QUANTIFY) $(C++) $(C++FLAGS) -o client $(CLIENT_OBJS) -lITclt $(LDFLAGS)