diff --git a/src/gdd/Makefile b/src/gdd/Makefile
index 109bb30d3..1c2758f41 100644
--- a/src/gdd/Makefile
+++ b/src/gdd/Makefile
@@ -1,31 +1,87 @@
-#
-# Author: Jim Kowalkowski
-# Date: 2/96
-#
-# $Id$
-#
-# $Log$
-# Revision 1.3  1996/06/26 21:17:08  jhill
-# fixed to match config in src
-#
-# Revision 1.2  1996/06/25 19:18:10  jbk
-# moved from extensions to base - fixed trouble in dbMapper.cc
-#
-# Revision 1.1  1996/06/25 19:11:24  jbk
-# new in EPICS base
-#
-#
-# *Revision 1.2  1996/06/25 18:58:55  jbk
-# *more fixes for the aitString management functions and mapping menus
-# *Revision 1.1  1996/05/31 13:15:13  jbk
-# *add new stuff
-#
-#
 
 TOP=../..
-# EPICS=/usr/local/epics/R3.12.2
+include $(TOP)/configure/CONFIG
 
-include $(TOP)/config/CONFIG_BASE
+INC += gdd.h
+INC += gddI.h
+INC += gddContainer.h
+INC += gddContainerI.h
+INC += gddArray.h
+INC += gddArrayI.h
+INC += gddScalar.h
+INC += gddScalarI.h
+INC += gddSemaphore.h
+INC += gddNewDel.h
+INC += gddUtils.h
+INC += gddUtilsI.h
+INC += gddErrorCodes.h
+INC += aitTypes.h
+INC += aitConvert.h
+INC += aitHelpers.h
+INC += dbMapper.h
+INC += gddAppTable.h
+INC += gddAppFuncTable.h
+#INC += gddApps.h
+INC += smartGDDPointer.h
 
-include $(TOP)/config/RULES_ARCHS
+###### NEEDS WORK ??????   ############################
+ifeq ($(HOST_ARCH),$(T_A))
+INC = gddApps.h
+endif
+#######################################################
 
+AITGENSRCS := gdd.cc gddTest.cc gddAppTable.cc gddNewDel.cc \
+	gddAppDefs.cc aitTypes.c aitConvert.cc aitHelpers.cc  \
+	gddArray.cc gddContainer.cc gddErrorCodes.cc gddUtils.cc
+
+LIBSRCS := gdd.cc gddTest.cc gddAppTable.cc gddNewDel.cc \
+	gddAppDefs.cc aitTypes.c aitConvert.cc aitHelpers.cc dbMapper.cc \
+	gddArray.cc gddContainer.cc gddErrorCodes.cc gddUtils.cc \
+	smartGDDPointer.cc
+
+LIBRARY := gdd
+
+LIBTYPE := SHARED
+
+include $(TOP)/configure/RULES_BUILD
+
+# cannot generate these dependencies automatically
+#
+# Problem: Some dependencies are include files that may
+#	not have been installed if we are building for
+#	the first time
+#	-> use explicit reference to the uninstalled files in '..'
+aitConvert$(OBJ): ../aitConvert.cc aitConvertGenerated.cc\
+		../aitConvert.h ../aitTypes.h
+
+
+dbMapper.cc:	../gdd.h ../gddI.h ../gddContainer.h ../gddContainerI.h \
+		../gddArray.h ../gddScalar.h ../gddAppTable.h ../dbMapper.h \
+		gddApps.h ../aitTypes.h  ../gddUtils.h ../gddUtilsI.h
+
+# Rules for generated files
+#
+aitConvertGenerated.cc: aitGen$(EXE) ../aitTypes.h
+	./aitGen$(EXE)
+
+gddApps.h : genApps$(EXE)
+	./genApps$(EXE) $@
+
+# unfortunately there is only one TESTPROD/TESTPROD_SRCS allowed
+# right now
+# (or many 'simple' progs:
+#  TESTPROD:=a b c
+#  where a is build from a.cc,   b from b.cc, c from c.cc
+# )
+#
+# This rule, however, should be system-independent:
+aitGen$(EXE): aitGen$(OBJ) aitTypes$(OBJ)
+	$(LINK.c) $^ 
+
+genApps$(EXE): genApps$(OBJ) $(addsuffix $(OBJ), $(basename $(AITGENSRCS)))
+	$(LINK.cc) $^ 
+
+clean::
+	$(RM) aitConvertGenerated.cc aitGen$(EXE) genApps$(EXE)
+
+#	EOF base/src/gdd/Makefile
diff --git a/src/gdd/Makefile.Host b/src/gdd/Makefile.Host
deleted file mode 100644
index 2aa1f83d4..000000000
--- a/src/gdd/Makefile.Host
+++ /dev/null
@@ -1,83 +0,0 @@
-#	base/src/gdd/Makefile.Host
-#
-
-TOP= ../../..
-include $(TOP)/config/CONFIG_BASE
-
-INC += gdd.h
-INC += gddI.h
-INC += gddContainer.h
-INC += gddContainerI.h
-INC += gddArray.h
-INC += gddArrayI.h
-INC += gddScalar.h
-INC += gddScalarI.h
-INC += gddSemaphore.h
-INC += gddNewDel.h
-INC += gddUtils.h
-INC += gddUtilsI.h
-INC += gddErrorCodes.h
-INC += aitTypes.h
-INC += aitConvert.h
-INC += aitHelpers.h
-INC += dbMapper.h
-INC += gddAppTable.h
-INC += gddAppFuncTable.h
-INC += gddApps.h
-INC += smartGDDPointer.h
-
-AITGENSRCS := gdd.cc gddTest.cc gddAppTable.cc gddNewDel.cc \
-	gddAppDefs.cc aitTypes.c aitConvert.cc aitHelpers.cc  \
-	gddArray.cc gddContainer.cc gddErrorCodes.cc gddUtils.cc
-
-LIBSRCS := gdd.cc gddTest.cc gddAppTable.cc gddNewDel.cc \
-	gddAppDefs.cc aitTypes.c aitConvert.cc aitHelpers.cc dbMapper.cc \
-	gddArray.cc gddContainer.cc gddErrorCodes.cc gddUtils.cc \
-	smartGDDPointer.cc
-
-LIBRARY := gdd
-
-LIBTYPE := SHARED
-
-include $(TOP)/config/RULES.Host
-
-# cannot generate these dependencies automatically
-#
-# Problem: Some dependencies are include files that may
-#	not have been installed if we are building for
-#	the first time
-#	-> use explicit reference to the uninstalled files in '..'
-aitConvert$(OBJ): ../aitConvert.cc aitConvertGenerated.cc\
-		../aitConvert.h ../aitTypes.h
-
-
-dbMapper.cc:	../gdd.h ../gddI.h ../gddContainer.h ../gddContainerI.h \
-		../gddArray.h ../gddScalar.h ../gddAppTable.h ../dbMapper.h \
-		gddApps.h ../aitTypes.h  ../gddUtils.h ../gddUtilsI.h
-
-# Rules for generated files
-#
-aitConvertGenerated.cc: aitGen$(EXE) ../aitTypes.h
-	./aitGen$(EXE)
-
-gddApps.h : genApps$(EXE)
-	./genApps$(EXE) $@
-
-# unfortunately there is only one TESTPROD/TESTPROD_SRCS allowed
-# right now
-# (or many 'simple' progs:
-#  TESTPROD:=a b c
-#  where a is build from a.cc,   b from b.cc, c from c.cc
-# )
-#
-# This rule, however, should be system-independent:
-aitGen$(EXE): aitGen$(OBJ) aitTypes$(OBJ)
-	$(LINK.c) $^ 
-
-genApps$(EXE): genApps$(OBJ) $(addsuffix $(OBJ), $(basename $(AITGENSRCS)))
-	$(LINK.cc) $^ 
-
-clean::
-	$(RM) aitConvertGenerated.cc aitGen$(EXE) genApps$(EXE)
-
-#	EOF base/src/gdd/Makefile.Host