diff -Naur ACE_wrappers.orig/apps/GNUmakefile ACE_wrappers/apps/GNUmakefile
--- ACE_wrappers.orig/apps/GNUmakefile	2012-06-29 12:39:58.000000000 -0400
+++ ACE_wrappers/apps/GNUmakefile	2012-06-29 12:41:59.000000000 -0400
@@ -41,16 +41,6 @@
 	$(KEEP_GOING)@cd drwho && $(MAKE) -f GNUmakefile.drwho__client $(@)
 	$(KEEP_GOING)@cd gperf && $(MAKE) -f GNUmakefile.gperf_docs $(@)
 	$(KEEP_GOING)@cd gperf/src && $(MAKE) -f GNUmakefile.gperf $(@)
-	$(KEEP_GOING)@cd gperf/tests && $(MAKE) -f GNUmakefile.taoinset $(@)
-	$(KEEP_GOING)@cd gperf/tests && $(MAKE) -f GNUmakefile.adainset $(@)
-	$(KEEP_GOING)@cd gperf/tests && $(MAKE) -f GNUmakefile.cinset $(@)
-	$(KEEP_GOING)@cd gperf/tests && $(MAKE) -f GNUmakefile.cppinset $(@)
-	$(KEEP_GOING)@cd gperf/tests && $(MAKE) -f GNUmakefile.iinset $(@)
-	$(KEEP_GOING)@cd gperf/tests && $(MAKE) -f GNUmakefile.iinset2 $(@)
-	$(KEEP_GOING)@cd gperf/tests && $(MAKE) -f GNUmakefile.m3inset $(@)
-	$(KEEP_GOING)@cd gperf/tests && $(MAKE) -f GNUmakefile.pinset $(@)
-	$(KEEP_GOING)@cd gperf/tests && $(MAKE) -f GNUmakefile.preinset $(@)
-	$(KEEP_GOING)@cd gperf/tests && $(MAKE) -f GNUmakefile.tinset $(@)
 	$(KEEP_GOING)@cd mkcsregdb && $(MAKE) -f GNUmakefile.mkcsregdb $(@)
 	$(KEEP_GOING)@cd soreduce && $(MAKE) -f GNUmakefile.soreduce $(@)
 
@@ -120,43 +110,33 @@
 
 .PHONY: taoinset
 taoinset: gperf-target
-	$(KEEP_GOING)@cd gperf/tests && $(MAKE) -f GNUmakefile.taoinset all
 
 .PHONY: adainset
 adainset: gperf-target taoinset
-	$(KEEP_GOING)@cd gperf/tests && $(MAKE) -f GNUmakefile.adainset all
 
 .PHONY: cinset
 cinset: gperf-target taoinset
-	$(KEEP_GOING)@cd gperf/tests && $(MAKE) -f GNUmakefile.cinset all
 
 .PHONY: cppinset
 cppinset: gperf-target taoinset
-	$(KEEP_GOING)@cd gperf/tests && $(MAKE) -f GNUmakefile.cppinset all
 
 .PHONY: iinset
 iinset: gperf-target taoinset
-	$(KEEP_GOING)@cd gperf/tests && $(MAKE) -f GNUmakefile.iinset all
 
 .PHONY: iinset2
 iinset2: gperf-target taoinset iinset
-	$(KEEP_GOING)@cd gperf/tests && $(MAKE) -f GNUmakefile.iinset2 all
 
 .PHONY: m3inset
 m3inset: gperf-target taoinset
-	$(KEEP_GOING)@cd gperf/tests && $(MAKE) -f GNUmakefile.m3inset all
 
 .PHONY: pinset
 pinset: gperf-target taoinset
-	$(KEEP_GOING)@cd gperf/tests && $(MAKE) -f GNUmakefile.pinset all
 
 .PHONY: preinset
 preinset: gperf-target taoinset
-	$(KEEP_GOING)@cd gperf/tests && $(MAKE) -f GNUmakefile.preinset all
 
 .PHONY: tinset
 tinset: gperf-target taoinset
-	$(KEEP_GOING)@cd gperf/tests && $(MAKE) -f GNUmakefile.tinset all
 
 .PHONY: mkcsregdb-target
 mkcsregdb-target:
diff -Naur ACE_wrappers.orig/GNUmakefile ACE_wrappers/GNUmakefile
--- ACE_wrappers.orig/GNUmakefile	2012-06-29 12:39:58.000000000 -0400
+++ ACE_wrappers/GNUmakefile	2012-06-29 12:42:29.000000000 -0400
@@ -83,16 +83,6 @@
 	$(KEEP_GOING)@cd apps/drwho && $(MAKE) -f GNUmakefile.drwho__client $(@)
 	$(KEEP_GOING)@cd apps/gperf && $(MAKE) -f GNUmakefile.gperf_docs $(@)
 	$(KEEP_GOING)@cd apps/gperf/src && $(MAKE) -f GNUmakefile.gperf $(@)
-	$(KEEP_GOING)@cd apps/gperf/tests && $(MAKE) -f GNUmakefile.taoinset $(@)
-	$(KEEP_GOING)@cd apps/gperf/tests && $(MAKE) -f GNUmakefile.adainset $(@)
-	$(KEEP_GOING)@cd apps/gperf/tests && $(MAKE) -f GNUmakefile.cinset $(@)
-	$(KEEP_GOING)@cd apps/gperf/tests && $(MAKE) -f GNUmakefile.cppinset $(@)
-	$(KEEP_GOING)@cd apps/gperf/tests && $(MAKE) -f GNUmakefile.iinset $(@)
-	$(KEEP_GOING)@cd apps/gperf/tests && $(MAKE) -f GNUmakefile.iinset2 $(@)
-	$(KEEP_GOING)@cd apps/gperf/tests && $(MAKE) -f GNUmakefile.m3inset $(@)
-	$(KEEP_GOING)@cd apps/gperf/tests && $(MAKE) -f GNUmakefile.pinset $(@)
-	$(KEEP_GOING)@cd apps/gperf/tests && $(MAKE) -f GNUmakefile.preinset $(@)
-	$(KEEP_GOING)@cd apps/gperf/tests && $(MAKE) -f GNUmakefile.tinset $(@)
 	$(KEEP_GOING)@cd apps/mkcsregdb && $(MAKE) -f GNUmakefile.mkcsregdb $(@)
 	$(KEEP_GOING)@cd apps/soreduce && $(MAKE) -f GNUmakefile.soreduce $(@)
 	$(KEEP_GOING)@cd bin && $(MAKE) -f GNUmakefile.bin $(@)
@@ -966,43 +956,33 @@
 
 .PHONY: taoinset
 taoinset: ACE gperf
-	$(KEEP_GOING)@cd apps/gperf/tests && $(MAKE) -f GNUmakefile.taoinset all
 
 .PHONY: adainset
 adainset: ACE gperf taoinset
-	$(KEEP_GOING)@cd apps/gperf/tests && $(MAKE) -f GNUmakefile.adainset all
 
 .PHONY: cinset
 cinset: ACE gperf taoinset
-	$(KEEP_GOING)@cd apps/gperf/tests && $(MAKE) -f GNUmakefile.cinset all
 
 .PHONY: cppinset
 cppinset: ACE gperf taoinset
-	$(KEEP_GOING)@cd apps/gperf/tests && $(MAKE) -f GNUmakefile.cppinset all
 
 .PHONY: iinset
 iinset: ACE gperf taoinset
-	$(KEEP_GOING)@cd apps/gperf/tests && $(MAKE) -f GNUmakefile.iinset all
 
 .PHONY: iinset2
 iinset2: ACE gperf taoinset iinset
-	$(KEEP_GOING)@cd apps/gperf/tests && $(MAKE) -f GNUmakefile.iinset2 all
 
 .PHONY: m3inset
 m3inset: ACE gperf taoinset
-	$(KEEP_GOING)@cd apps/gperf/tests && $(MAKE) -f GNUmakefile.m3inset all
 
 .PHONY: pinset
 pinset: ACE gperf taoinset
-	$(KEEP_GOING)@cd apps/gperf/tests && $(MAKE) -f GNUmakefile.pinset all
 
 .PHONY: preinset
 preinset: ACE gperf taoinset
-	$(KEEP_GOING)@cd apps/gperf/tests && $(MAKE) -f GNUmakefile.preinset all
 
 .PHONY: tinset
 tinset: ACE gperf taoinset
-	$(KEEP_GOING)@cd apps/gperf/tests && $(MAKE) -f GNUmakefile.tinset all
 
 .PHONY: mkcsregdb
 mkcsregdb: ACE