diff --git a/GNUmakefile.in b/GNUmakefile.in
index e40a41bce5204e7426205be1c2582bf6e35de9ff..33f3daf2d63c8ad521eef32d7de721166187a7d2 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -128,16 +128,13 @@ ops-install:
 	@$(MAKE) -C tbsetup control-install
 	@$(MAKE) -C security control-install
 	@$(MAKE) -C tip control-install
-#	@$(MAKE) -C os control-install
 	@$(MAKE) -C db control-install
-	@$(MAKE) -C tbsetup control-install
 	@$(MAKE) -C utils control-install
+	@$(MAKE) -C clientside control-install
 ifeq ($(EVENTSYS),1)
 	@$(MAKE) -C event control-install
 endif
-	@$(MAKE) -C sensors control-install
 	@$(MAKE) -C xmlrpc control-install
-	@$(MAKE) -C tmcd control-install
 	@$(MAKE) -C account control-install
 ifeq ($(PELABSUPPORT),1)
 	@$(MAKE) -C pelab control-install
diff --git a/clientside/event/delay-agent/GNUmakefile.in b/clientside/event/delay-agent/GNUmakefile.in
index e0e23036add887b473eb2fd90daf658f47598913..388e8225ba2ac8fcf268470150320a36cb3ba977 100644
--- a/clientside/event/delay-agent/GNUmakefile.in
+++ b/clientside/event/delay-agent/GNUmakefile.in
@@ -34,6 +34,7 @@ $(OBJS):	main.h $(TESTBED_LIBOBJDIR)/event/libevent.a
 
 install:
 boss-install:
+control-install:
 
 client: delay-agent
 client-install: client
diff --git a/clientside/event/link-agent/GNUmakefile.in b/clientside/event/link-agent/GNUmakefile.in
index 7c7b515c52b054b8bbadb3a4fd141e4d20f13ae8..2adeae022edbabf00c0a6439b10a011013a9a64d 100644
--- a/clientside/event/link-agent/GNUmakefile.in
+++ b/clientside/event/link-agent/GNUmakefile.in
@@ -54,6 +54,7 @@ $(PROGRAMS):	${TESTBED_LIBOBJDIR}/event/libevent.a \
 		${TESTBED_LIBSRCDIR}/event/event.h
 
 boss-install:
+control-install:
 
 client: $(PROGRAMS)
 client-install: client
diff --git a/clientside/event/trafgen/GNUmakefile.in b/clientside/event/trafgen/GNUmakefile.in
index 8296e1859b61300ec15dff22930b1a439446cab1..b83f577ea0c7eb622904e4f838417f73e497d198 100644
--- a/clientside/event/trafgen/GNUmakefile.in
+++ b/clientside/event/trafgen/GNUmakefile.in
@@ -112,6 +112,7 @@ $(PROGRAMS):	${TESTBED_LIBOBJDIR}/event/libevent.a \
 
 install:
 boss-install:
+control-install:
 
 client: $(PROGRAMS)
 client-install: client
diff --git a/clientside/lib/tmcd/GNUmakefile.in b/clientside/lib/tmcd/GNUmakefile.in
index 537618628f93ac37f4091fe33f7ad82d9d0f6d6c..a71d892029b4c2e82a91d79f058278bc5d09feff 100644
--- a/clientside/lib/tmcd/GNUmakefile.in
+++ b/clientside/lib/tmcd/GNUmakefile.in
@@ -50,7 +50,7 @@ install: all
 client: all
 client-install:
 boss-install:
-control-install:
+control-install: all
 subboss-install:
 client-install:
 mfs:
diff --git a/clientside/os/dijkstra/GNUmakefile.in b/clientside/os/dijkstra/GNUmakefile.in
index 752cd6913342938180d0d0dcbb1e9c1e4806aac2..fe2f0341b4e385fa6ae26f2d6629f117b53925a7 100644
--- a/clientside/os/dijkstra/GNUmakefile.in
+++ b/clientside/os/dijkstra/GNUmakefile.in
@@ -30,6 +30,7 @@ dijkstra-debug: Compressor.o TreeCompressor.o dijkstra.o \
                 OptimalIpTree.o bitmath.o $(LIBS) -o $@
 
 boss-install:
+control-install:
 client: all
 client-install: client
 	$(INSTALL_PROGRAM) dijkstra$(EXE) $(DESTDIR)$(CLIENT_BINDIR)/dijkstra$(EXE)
diff --git a/clientside/os/genhostsfile/GNUmakefile.in b/clientside/os/genhostsfile/GNUmakefile.in
index 51ea15b0db618539143cae29ec4ff7bf38293668..fce9d83925a268ab4155c4aa986426fab227375a 100644
--- a/clientside/os/genhostsfile/GNUmakefile.in
+++ b/clientside/os/genhostsfile/GNUmakefile.in
@@ -23,7 +23,7 @@ genhostsfile-debug:	genhostsfile.o
 wgraph.o:	wgraph.cc wgraph.h
 
 boss-install:	$(INSTALL_LIBEXECDIR)/genhostsfile
-
+control-install:
 client: genhostsfile
 client-install: client
 	$(INSTALL_PROGRAM) genhostsfile$(EXE) $(DESTDIR)$(CLIENT_BINDIR)/genhostsfile$(EXE)
diff --git a/clientside/os/syncd/GNUmakefile.in b/clientside/os/syncd/GNUmakefile.in
index 4d7e3aea07d40bdbda638b1b078d1657080fbc38..c338025809cf2ef9c1991e3c0d301f142f65720d 100644
--- a/clientside/os/syncd/GNUmakefile.in
+++ b/clientside/os/syncd/GNUmakefile.in
@@ -37,6 +37,8 @@ boss-install:
 	$(INSTALL) -m 644 $(SRCDIR)/emulab-sync.1 \
 		$(INSTALL_DIR)/opsdir/man/man1/emulab-sync.1
 
+control-install:
+
 client: all
 client-install: client
 	$(INSTALL_PROGRAM) emulab-syncd$(EXE) $(DESTDIR)$(CLIENT_BINDIR)/emulab-syncd$(EXE)
diff --git a/clientside/tools/pcapper/GNUmakefile.in b/clientside/tools/pcapper/GNUmakefile.in
index 0efa59b5ae519c36464161c087c6e3f0ecc71db4..a33437fbdb22de24d15a8e239d575d05da57a4fa 100644
--- a/clientside/tools/pcapper/GNUmakefile.in
+++ b/clientside/tools/pcapper/GNUmakefile.in
@@ -115,6 +115,7 @@ pcapper-noevents.o: pcapper.c
 client:	pcapper
 
 boss-install:
+control-install:
 
 client-install: client
 	$(INSTALL_PROGRAM) -s pcapper $(DESTDIR)$(CLIENT_BINDIR)/pcapper
diff --git a/event/GNUmakefile.in b/event/GNUmakefile.in
index 04913019f94d3dea0ff8ee08c0e7210fecee4d52..f59dac1a486c52bfcf14c3c9083d494cfae8a347 100644
--- a/event/GNUmakefile.in
+++ b/event/GNUmakefile.in
@@ -50,7 +50,6 @@ endif
 	@$(MAKE) -C proxy control-install
 
 post-install: 
-	@$(MAKE) -C linktest post-install
 
 clean:		clean-subdirs
 distclean:	distclean-subdirs