diff --git a/Makefile b/Makefile
index b91838404..e9dc53efb 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,9 @@
 #         install because the release.% syntax is illegal.
 #
 # $Log$
+# Revision 1.14  1994/09/07  20:42:19  jba
+# Minor changes
+#
 # Revision 1.13  1994/09/07  19:15:17  jba
 # Modified to eork with extensions and do depends
 #
@@ -30,72 +33,64 @@
 EPICS=..
 include $(EPICS)/config/CONFIG_SITE
 
-T_A = ${BUILD_ARCHS}
-
 all: install
 
 pre_build:
-	@(for ARCH in ${T_A};					\
+	@(for ARCH in ${BUILD_ARCHS};					\
 		do							\
 			${MAKE} ${MFLAGS} $@.$$ARCH;			\
 		done)
 
 build_libs:
-	@(for ARCH in ${T_A};					\
+	@(for ARCH in ${BUILD_ARCHS};					\
 		do							\
 			${MAKE} ${MFLAGS} $@.$$ARCH;			\
 		done)
 
 install_libs:
-	@(for ARCH in ${T_A};					\
+	@(for ARCH in ${BUILD_ARCHS};					\
 		do							\
 			${MAKE} ${MFLAGS} $@.$$ARCH;			\
 		done)
 
 build_prod:
-	@(for ARCH in ${T_A};					\
+	@(for ARCH in ${BUILD_ARCHS};					\
 		do							\
 			${MAKE} ${MFLAGS} $@.$$ARCH;			\
 		done)
 
 install_prod:
-	@(for ARCH in ${T_A};					\
+	@(for ARCH in ${BUILD_ARCHS};					\
 		do							\
 			${MAKE} ${MFLAGS} $@.$$ARCH;			\
 		done)
 
 install_man:
-	@(for ARCH in ${T_A};					\
+	@(for ARCH in ${BUILD_ARCHS};					\
 		do							\
 			${MAKE} ${MFLAGS} $@.$$ARCH;			\
 		done)
 
 install_includes:
-	@(for ARCH in ${T_A};					\
+	@(for ARCH in ${BUILD_ARCHS};					\
 		do							\
 			${MAKE} ${MFLAGS} $@.$$ARCH;			\
 		done)
 
 build:
-	@(for ARCH in ${T_A};					\
+	@(for ARCH in ${BUILD_ARCHS};					\
 		do							\
 			${MAKE} ${MFLAGS} $@.$$ARCH;			\
 		done)
 
 install:
-	@(for ARCH in ${T_A};					\
+	@(for ARCH in ${BUILD_ARCHS};					\
 		do							\
 			${MAKE} ${MFLAGS} $@.$$ARCH;			\
 		done)
 
 depends:
-	@(for ARCH in ${T_A};					\
-		do							\
-			${MAKE} ${MFLAGS} $@.$$ARCH;			\
-		done)
-
-clean:
-	@(for ARCH in ${T_A};					\
+	@(for ARCH in ${BUILD_ARCHS};					\
 		do							\
 			${MAKE} ${MFLAGS} $@.$$ARCH;			\
 		done)
@@ -108,9 +103,13 @@ built_release: depends install
 	@echo TOP: Creating Fully Built Release...
 	@tools/MakeRelease -b
 
-#clean:
-#	@echo "TOP: Cleaning"
-#	@tools/Clean
+clean:
+	@echo "TOP: Cleaning"
+	@tools/Clean
+
+uninstall:
+	@rm -rf bin/* lib/* rec.bak
+	@rm -f rec/default.dctsdr rec/default.sdrSum rec/*.h
 
 #  Notes for single architecture build rules:
 #    CheckArch only has to be run for dirs.% .  That
@@ -184,17 +183,23 @@ clean.%: dirs.%
 
 release.%:
 	@echo
-	@echo "The arch.release syntax is not supported by this build,"
-	@echo "   Use 'make release' instead."
+	@echo "The release.arch syntax is not supported by this build."
+	@echo "   Use 'make release' or 'make built_release' instead."
 	@echo
 
+uninstall.%:
+	@echo
+	@echo "The uninstall.arch syntax is not supported by this build."
+	@echo
+	
+
 # Clean RULE  syntax:  make clean.arch
 #             e.g.:    make clean.mv167
 #
 #  Clean files for a particular architecture
 #
 
-#clean.%:
-#	@echo "$*: Cleaning"
-#	@tools/Clean $*
+clean.%:
+	@echo "$*: Cleaning"
+	@tools/Clean $*
 
diff --git a/Makefile.subdirs b/Makefile.subdirs
index 0138909bc..6570fa37a 100644
--- a/Makefile.subdirs
+++ b/Makefile.subdirs
@@ -5,6 +5,9 @@
 #    by Matthew Needes and Mike Bordua
 #
 # $Log$
+# Revision 1.11  1994/09/07  19:15:19  jba
+# Modified to eork with extensions and do depends
+#
 # Revision 1.10  1994/08/21  00:55:52  mcn
 # New stuff.
 #
@@ -101,10 +104,3 @@ depends:
 			cd $$TMP;					\
 		done)
 
-clean:
-	@(for DIR in ${DIRS};						\
-		do							\
-			TMP=`pwd`; echo "${T_A}: $@: $$DIR";	 	\
-			cd $$DIR/O.${T_A}; ${MAKE} ${MFLAGS} $@;	\
-			cd $$TMP;					\
-		done)