Checkpoint event/linktest move.

clientside/configure

@@ -4830,6 +4830,12 @@ outfiles="Makeconf GNUmakefile \
 	  event/proxy/GNUmakefile \
 	  event/tevc/GNUmakefile \
 	  event/trafgen/GNUmakefile \
+	  event/linktest/GNUmakefile \
+	  event/linktest/iperf/GNUmakefile \
+	  event/linktest/rude/GNUmakefile \
+	  event/linktest/weblinktest event/linktest/linktest.proxy \
+	  event/linktest/linktest_control \
+	  event/linktest/run_linktest.pl \
 	  tools/GNUmakefile \
 	  tools/pcapper/GNUmakefile \
 	  sensors/GNUmakefile \

clientside/configure.in

@@ -158,6 +158,12 @@ outfiles="Makeconf GNUmakefile \
 	  event/proxy/GNUmakefile \
 	  event/tevc/GNUmakefile \
 	  event/trafgen/GNUmakefile \
+	  event/linktest/GNUmakefile \
+	  event/linktest/iperf/GNUmakefile \
+	  event/linktest/rude/GNUmakefile \
+	  event/linktest/weblinktest event/linktest/linktest.proxy \
+	  event/linktest/linktest_control \
+	  event/linktest/run_linktest.pl \
 	  tools/GNUmakefile \
 	  tools/pcapper/GNUmakefile \
 	  sensors/GNUmakefile \

clientside/event/GNUmakefile.in

@@ -10,7 +10,7 @@ SUBDIR		= $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
 
 include $(OBJDIR)/Makeconf
 
-SUBDIRS		= program-agent link-agent tevc proxy
+SUBDIRS		= program-agent link-agent tevc proxy linktest
 ifneq ($(SYSTEM),CYGWIN_NT-5.1)
 SUBDIRS	       += trafgen
 endif

clientside/event/linktest/GNUmakefile.in

@@ -3,14 +3,13 @@
 # Copyright (c) 2000-2011 University of Utah and the Flux Group.
 # All rights reserved.
 #
-
 SRCDIR		= @srcdir@
 TESTBED_SRCDIR	= @top_srcdir@
-OBJDIR		= ../..
-SUBDIR		= event/linktest
+OBJDIR		= @top_builddir@
+SUBDIR		= $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
+
 LIBTBDIR        = $(OBJDIR)/lib/libtb
 LIBEVENTDIR     = ${OBJDIR}/lib/event
-NSTOIRDIR	= $(TESTBED_SRCDIR)/tbsetup/ns2ir
 DAEMON	        = linktest
 LTEVENT		= ltevent
 SCRIPT		= linktest.pl
@@ -18,8 +17,6 @@ SCRIPT_ELAB	= elab_linktest.pl
 SCRIPT_RUN	= run_linktest.pl
 SCRIPT_PROXY	= linktest.proxy
 SCRIPT_CONTROL  = linktest_control
-SCRIPT_TBCOMPAT = tb_compat.tcl
-SCRIPT_NSTB_COMPAT = nstb_compat.tcl
 
 # These scripts installed setuid, with sudo. 
 SETUID_BIN_SCRIPTS   = 
@@ -95,7 +92,7 @@ $(DAEMON_OBJS): ${OBJDIR}/lib/event/libevent.a ${OBJDIR}/lib/event/event.h
 $(LTEVENT_OBJS): ${OBJDIR}/lib/event/libevent.a ${OBJDIR}/lib/event/event.h
 
 # We install just enough to fire off the test from boss and wait. 
-install: weblinktest $(SCRIPT_RUN) $(SCRIPT_PROXY) $(LTEVENT) \
+boss-install: weblinktest $(SCRIPT_RUN) $(SCRIPT_PROXY) $(LTEVENT) \
 		$(INSTALL_SBINDIR)/$(SCRIPT_CONTROL) 
 	$(INSTALL_PROGRAM) weblinktest $(INSTALL_LIBEXECDIR)
 	-mkdir -p $(INSTALL_DIR)/opsdir/bin
@@ -107,11 +104,6 @@ install: weblinktest $(SCRIPT_RUN) $(SCRIPT_PROXY) $(LTEVENT) \
 			$(INSTALL_DIR)/opsdir/sbin/$(SCRIPT_PROXY)
 	$(INSTALL_PROGRAM) $(LTEVENT) \
 			$(INSTALL_DIR)/opsdir/libexec/$(LTEVENT)
-	@echo "Don't forget to do a post-install as root"
-
-post-install: 
-	chown root $(INSTALL_SBINDIR)/$(SCRIPT_CONTROL)
-	chmod u+s $(INSTALL_SBINDIR)/$(SCRIPT_CONTROL)
 
 control-install:	binaries $(SCRIPT_RUN) $(SCRIPT_PROXY)
 	$(INSTALL_PROGRAM) $(LTEVENT) $(INSTALL_LIBEXECDIR)

clientside/event/linktest/iperf/GNUmakefile.in

 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2010 University of Utah and the Flux Group.
+# Copyright (c) 2000-2011 University of Utah and the Flux Group.
 # All rights reserved.
 #
-
 SRCDIR		= @srcdir@
 TESTBED_SRCDIR	= @top_srcdir@
-OBJDIR		= ../../..
-SUBDIR		= event/linktest/iperf
+OBJDIR		= @top_builddir@
+SUBDIR		= $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
 
 TARBALL		= iperf-2.0.2.tar.gz
 

clientside/event/linktest/rude/GNUmakefile.in

 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2010 University of Utah and the Flux Group.
+# Copyright (c) 2000-2011 University of Utah and the Flux Group.
 # All rights reserved.
 #
-
 SRCDIR		= @srcdir@
 TESTBED_SRCDIR	= @top_srcdir@
-OBJDIR		= ../../..
-SUBDIR		= event/linktest/rude
+OBJDIR		= @top_builddir@
+SUBDIR		= $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
 
 # be sure to change version in rude-fetch.sh too
 VERSION		= 0.70

configure

@@ -5623,13 +5623,7 @@ else
 		    event/nsetrafgen/nse-makepatch \
                     event/delay-agent/GNUmakefile \
 		    event/stated/waitForState \
-		    event/stated/GNUmakefile event/stated/stated \
-		    event/linktest/GNUmakefile \
-		    event/linktest/iperf/GNUmakefile \
-		    event/linktest/rude/GNUmakefile \
-		    event/linktest/weblinktest event/linktest/linktest.proxy \
-		    event/linktest/linktest_control \
-		    event/linktest/run_linktest.pl";
+		    event/stated/GNUmakefile event/stated/stated"
 
 	optional_subdirs="$optional_subdirs event";
         EVENTSYS=1;
@@ -7231,6 +7225,13 @@ outfiles="$outfiles clientside/GNUmakefile \
  clientside/event/proxy/GNUmakefile \
  clientside/event/tevc/GNUmakefile \
  clientside/event/trafgen/GNUmakefile \
+ clientside/event/linktest/GNUmakefile \
+ clientside/event/linktest/iperf/GNUmakefile \
+ clientside/event/linktest/rude/GNUmakefile \
+ clientside/event/linktest/weblinktest \
+ clientside/event/linktest/linktest.proxy \
+ clientside/event/linktest/linktest_control \
+ clientside/event/linktest/run_linktest.pl \
  clientside/os/dijkstra/GNUmakefile clientside/os/genhostsfile/GNUmakefile"
 
 #

configure.in

@@ -712,13 +712,7 @@ else
 		    event/nsetrafgen/nse-makepatch \
                     event/delay-agent/GNUmakefile \
 		    event/stated/waitForState \
-		    event/stated/GNUmakefile event/stated/stated \
-		    event/linktest/GNUmakefile \
-		    event/linktest/iperf/GNUmakefile \
-		    event/linktest/rude/GNUmakefile \
-		    event/linktest/weblinktest event/linktest/linktest.proxy \
-		    event/linktest/linktest_control \
-		    event/linktest/run_linktest.pl";
+		    event/stated/GNUmakefile event/stated/stated"
 
 	optional_subdirs="$optional_subdirs event";
         EVENTSYS=1;
@@ -1096,6 +1090,13 @@ outfiles="$outfiles clientside/GNUmakefile \
  clientside/event/proxy/GNUmakefile \
  clientside/event/tevc/GNUmakefile \
  clientside/event/trafgen/GNUmakefile \
+ clientside/event/linktest/GNUmakefile \
+ clientside/event/linktest/iperf/GNUmakefile \
+ clientside/event/linktest/rude/GNUmakefile \
+ clientside/event/linktest/weblinktest \
+ clientside/event/linktest/linktest.proxy \
+ clientside/event/linktest/linktest_control \
+ clientside/event/linktest/run_linktest.pl \
  clientside/os/dijkstra/GNUmakefile clientside/os/genhostsfile/GNUmakefile"
 
 #

event/GNUmakefile.in

@@ -14,7 +14,7 @@ include $(OBJDIR)/Makeconf
 
 SYSTEM	       := $(shell uname -s)
 
-SUBDIRS		= proxy example linktest
+SUBDIRS		= proxy example
 ifeq ($(SYSTEM),FreeBSD)
 FBSDREL	:= $(shell uname -r | sed -e 's/\([^-][^-]*\)-.*/\1/')
 FBSDMAJ := $(basename $(FBSDREL))
@@ -42,7 +42,6 @@ ifeq ($(ISMAINSITE),1)
 	@$(MAKE) -C new_sched install
 endif
 	@$(MAKE) -C stated install
-	@$(MAKE) -C linktest install
 	@$(MAKE) -C proxy install
 
 client:		client-subdirs
@@ -53,7 +52,6 @@ control-install:
 ifeq ($(ISMAINSITE),1)
 	@$(MAKE) -C new_sched control-install
 endif
-	@$(MAKE) -C linktest control-install
 	@$(MAKE) -C proxy control-install
 
 post-install: