diff --git a/cde/configure.ac b/cde/configure.ac
index 48882c847..b6ae31608 100644
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -733,6 +733,9 @@ programs/dtinfo/dtinfo/src/Makefile
 programs/dtinfo/dtinfo/src/Widgets/Makefile
 programs/dtinfo/dtinfo/src/Support/Makefile
 programs/dtinfo/dtinfo/src/UAS/Makefile
+programs/dtinfo/dtinfo/src/UAS/Base/Makefile
+programs/dtinfo/dtinfo/src/UAS/MMDB/Makefile
+programs/dtinfo/dtinfo/src/UAS/DtSR/Makefile
 programs/dtinfo/dtinfo/src/Basic/Makefile
 programs/dtinfo/dtinfo/src/OliasSearch/Makefile
 programs/dtinfo/dtinfo/src/Marks/Makefile
diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Agents/Makefile.am
index 40dcaf69b..481ab3433 100644
--- a/cde/programs/dtinfo/dtinfo/src/Agents/Makefile.am
+++ b/cde/programs/dtinfo/dtinfo/src/Agents/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_LIBRARIES = libAgents.a
+noinst_LTLIBRARIES = libAgents.la
 
 # get our env
 include ../templates/dtinfo_env.mk
@@ -8,8 +8,8 @@ include ../templates/dtinfo_env.mk
 # class info
 include Classlist.mk
 
-libAgents_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
-libAgents_a_SOURCES = ../Prelude.h $(Agents_SRCS)
+libAgents_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
+libAgents_la_SOURCES = ../Prelude.h $(Agents_SRCS)
 
 BUILT_SOURCES = Agents.msg
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/cde/programs/dtinfo/dtinfo/src/Basic/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Basic/Makefile.am
index 2a0af0919..838e76858 100644
--- a/cde/programs/dtinfo/dtinfo/src/Basic/Makefile.am
+++ b/cde/programs/dtinfo/dtinfo/src/Basic/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_LIBRARIES = libBasic.a
+noinst_LTLIBRARIES = libBasic.la
 
 # get our env
 include ../templates/dtinfo_env.mk
@@ -8,6 +8,7 @@ include ../templates/dtinfo_env.mk
 # class info
 include Classlist.mk
 
-libBasic_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
+libBasic_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
+
+libBasic_la_SOURCES = ../Prelude.h $(Basic_SRCS)
 
-libBasic_a_SOURCES = ../Prelude.h $(Basic_SRCS)
diff --git a/cde/programs/dtinfo/dtinfo/src/Graphics/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Graphics/Makefile.am
index c9a7faeda..958c194b4 100644
--- a/cde/programs/dtinfo/dtinfo/src/Graphics/Makefile.am
+++ b/cde/programs/dtinfo/dtinfo/src/Graphics/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_LIBRARIES = libGraphics.a
+noinst_LTLIBRARIES = libGraphics.la
 
 # get our env
 include ../templates/dtinfo_env.mk
@@ -8,6 +8,7 @@ include ../templates/dtinfo_env.mk
 # class info
 include Classlist.mk
 
-libGraphics_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
+libGraphics_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
+
+libGraphics_la_SOURCES = ../Prelude.h $(Graphics_SRCS)
 
-libGraphics_a_SOURCES = ../Prelude.h $(Graphics_SRCS)
diff --git a/cde/programs/dtinfo/dtinfo/src/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Makefile.am
index b5618260d..b7fb10d27 100644
--- a/cde/programs/dtinfo/dtinfo/src/Makefile.am
+++ b/cde/programs/dtinfo/dtinfo/src/Makefile.am
@@ -1,7 +1,9 @@
 MAINTAINERCLEANFILES = Makefile.in
 
+# get our env variables
 include templates/dtinfo_env.mk
 
+# get the toplevel Classlist
 include Classlist.mk
 
 # CLASSLIST is defined in the top (dtinfo) level Classlist.mk file
@@ -35,115 +37,21 @@ Prelude.h:
 Dtinfo: Dtinfo.res $(RESFILES)
 	$(CPP_PROGRAM) -traditional -nostdinc -C Dtinfo.res | $(TREERES) > $@
 
-##### hacking area
-# Support
-include Support/Classlist.mk
-Support/Support.d: Support/Classlist.mk
-	cd Support && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Support $(Support_CLASSES)
+# dtinfo class dfiles and hfiles building
+include templates/dtinfo-dfiles-hfiles.mk
 
-Support/Support.h: Support/Classlist.mk
-	cd Support && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Support $(Support_CLASSES)
+# gather up the messages and generate the file. MSGS comes from the
+# dtinfo/src/Classlist.mk file.
 
+noinst_DATA = dtinfo.msg.updated
 
-# UAS
-include UAS/Classlist.mk
-UAS/UAS.d: UAS/Classlist.mk
-	cd UAS && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d UAS $(UAS_CLASSES)
-
-UAS/UAS.h: UAS/Classlist.mk
-	cd UAS && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h UAS $(UAS_CLASSES)
-
-
-# Basic
-include Basic/Classlist.mk
-Basic/Basic.d: Basic/Classlist.mk
-	cd Basic && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Basic $(Basic_CLASSES)
-
-Basic/Basic.h: Basic/Classlist.mk
-	cd Basic && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Basic $(Basic_CLASSES)
-
-
-# OliasSearch
-include OliasSearch/Classlist.mk
-OliasSearch/OliasSearch.d: OliasSearch/Classlist.mk
-	cd OliasSearch && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d OliasSearch $(OliasSearch_CLASSES)
-
-OliasSearch/OliasSearch.h: OliasSearch/Classlist.mk
-	cd OliasSearch && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h OliasSearch $(OliasSearch_CLASSES)
-
-
-# Marks
-include Marks/Classlist.mk
-Marks/Marks.d: Marks/Classlist.mk
-	cd Marks && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Marks $(Marks_CLASSES)
-
-Marks/Marks.h: Marks/Classlist.mk
-	cd Marks && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Marks $(Marks_CLASSES)
-
-
-# Graphics
-include Graphics/Classlist.mk
-Graphics/Graphics.d: Graphics/Classlist.mk
-	cd Graphics && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Graphics $(Graphics_CLASSES)
-
-Graphics/Graphics.h: Graphics/Classlist.mk
-	cd Graphics && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Graphics $(Graphics_CLASSES)
-
-
-# Preferences
-include Preferences/Classlist.mk
-Preferences/Preferences.d: Preferences/Classlist.mk
-	cd Preferences && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Preferences $(Preferences_CLASSES)
-
-Preferences/Preferences.h: Preferences/Classlist.mk
-	cd Preferences && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Preferences $(Preferences_CLASSES)
-
-
-# Managers
-include Managers/Classlist.mk
-Managers/Managers.d: Managers/Classlist.mk
-	cd Managers && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Managers $(Managers_CLASSES)
-
-Managers/Managers.h: Managers/Classlist.mk
-	cd Managers && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Managers $(Managers_CLASSES)
-
-
-# Other
-include Other/Classlist.mk
-Other/Other.d: Other/Classlist.mk
-	cd Other && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Other $(Other_CLASSES)
-
-Other/Other.h: Other/Classlist.mk
-	cd Other && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Other $(Other_CLASSES)
-
-
-# Query
-include Query/Classlist.mk
-Query/Query.d: Query/Classlist.mk
-	cd Query && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Query $(Query_CLASSES)
-
-Query/Query.h: Query/Classlist.mk
-	cd Query && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Query $(Query_CLASSES)
-
-
-# Agents
-include Agents/Classlist.mk
-Agents/Agents.d: Agents/Classlist.mk
-	cd Agents && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Agents $(Agents_CLASSES)
-
-Agents/Agents.h: Agents/Classlist.mk
-	cd Agents && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Agents $(Agents_CLASSES)
-
-
-# OnlineRender
-include OnlineRender/Classlist.mk
-OnlineRender/OnlineRender.d: OnlineRender/Classlist.mk
-	cd OnlineRender && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d OnlineRender $(OnlineRender_CLASSES)
-
-OnlineRender/OnlineRender.h: OnlineRender/Classlist.mk
-	cd OnlineRender && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h OnlineRender $(OnlineRender_CLASSES)
-
+dtinfo.msg.updated:
+	(msgs=; for i in $(MSGS) ; do msgs="$$msgs $$i/$$i.msg"; done; \
+	 cat $$msgs >dtinfo.cpp && \
+	 $(CPP_PROGRAM) -traditional -nostdinc -P -C dtinfo_msg.tmpl | $(MSGSETS) > dtinfo.msg.updated; \
+	 $(RM) dtinfo.cpp )
 
+CLEANFILES += dtinfo.msg.updated dtinfo.cpp
 
 #bin_PROGRAMS = dtinfo
 
diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Managers/Makefile.am
index f1152eccc..467f1907e 100644
--- a/cde/programs/dtinfo/dtinfo/src/Managers/Makefile.am
+++ b/cde/programs/dtinfo/dtinfo/src/Managers/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_LIBRARIES = libManagers.a
+noinst_LTLIBRARIES = libManagers.la
 
 # get our env
 include ../templates/dtinfo_env.mk
@@ -8,8 +8,8 @@ include ../templates/dtinfo_env.mk
 # class info
 include Classlist.mk
 
-libManagers_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
-libManagers_a_SOURCES = ../Prelude.h $(Managers_SRCS)
+libManagers_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
+libManagers_la_SOURCES = ../Prelude.h $(Managers_SRCS)
 
 BUILT_SOURCES = Managers.msg
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/cde/programs/dtinfo/dtinfo/src/Marks/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Marks/Makefile.am
index 504d4310b..fa1fa0af1 100644
--- a/cde/programs/dtinfo/dtinfo/src/Marks/Makefile.am
+++ b/cde/programs/dtinfo/dtinfo/src/Marks/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_LIBRARIES = libMarks.a
+noinst_LTLIBRARIES = libMarks.la
 
 # get our env
 include ../templates/dtinfo_env.mk
@@ -8,6 +8,7 @@ include ../templates/dtinfo_env.mk
 # class info
 include Classlist.mk
 
-libMarks_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
+libMarks_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
+
+libMarks_la_SOURCES = ../Prelude.h $(Marks_SRCS)
 
-libMarks_a_SOURCES = ../Prelude.h $(Marks_SRCS)
diff --git a/cde/programs/dtinfo/dtinfo/src/OliasSearch/Makefile.am b/cde/programs/dtinfo/dtinfo/src/OliasSearch/Makefile.am
index 23e86c222..5328f1b18 100644
--- a/cde/programs/dtinfo/dtinfo/src/OliasSearch/Makefile.am
+++ b/cde/programs/dtinfo/dtinfo/src/OliasSearch/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_LIBRARIES = libOliasSearch.a
+noinst_LTLIBRARIES = libOliasSearch.la
 
 # get our env
 include ../templates/dtinfo_env.mk
@@ -8,6 +8,7 @@ include ../templates/dtinfo_env.mk
 # class info
 include Classlist.mk
 
-libOliasSearch_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
+libOliasSearch_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
+
+libOliasSearch_la_SOURCES = ../Prelude.h $(OliasSearch_SRCS)
 
-libOliasSearch_a_SOURCES = ../Prelude.h $(OliasSearch_SRCS)
diff --git a/cde/programs/dtinfo/dtinfo/src/OnlineRender/Makefile.am b/cde/programs/dtinfo/dtinfo/src/OnlineRender/Makefile.am
index 9d108d752..c88c4ae4d 100644
--- a/cde/programs/dtinfo/dtinfo/src/OnlineRender/Makefile.am
+++ b/cde/programs/dtinfo/dtinfo/src/OnlineRender/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_LIBRARIES = libOnlineRender.a
+noinst_LTLIBRARIES = libOnlineRender.la
 
 # get our env
 include ../templates/dtinfo_env.mk
@@ -8,8 +8,8 @@ include ../templates/dtinfo_env.mk
 # class info
 include Classlist.mk
 
-libOnlineRender_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
-libOnlineRender_a_SOURCES = ../Prelude.h $(OnlineRender_SRCS)
+libOnlineRender_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
+libOnlineRender_la_SOURCES = ../Prelude.h $(OnlineRender_SRCS)
 
 BUILT_SOURCES = OnlineRender.msg
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/cde/programs/dtinfo/dtinfo/src/Other/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Other/Makefile.am
index 5fa82023f..58498c804 100644
--- a/cde/programs/dtinfo/dtinfo/src/Other/Makefile.am
+++ b/cde/programs/dtinfo/dtinfo/src/Other/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_LIBRARIES = libOther.a
+noinst_LTLIBRARIES = libOther.la
 
 # get our env
 include ../templates/dtinfo_env.mk
@@ -8,8 +8,8 @@ include ../templates/dtinfo_env.mk
 # class info
 include Classlist.mk
 
-libOther_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
-libOther_a_SOURCES = ../Prelude.h $(Other_SRCS)
+libOther_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
+libOther_la_SOURCES = ../Prelude.h $(Other_SRCS)
 
 BUILT_SOURCES = Other.msg
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/cde/programs/dtinfo/dtinfo/src/Preferences/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Preferences/Makefile.am
index 9171333d8..7b3ade344 100644
--- a/cde/programs/dtinfo/dtinfo/src/Preferences/Makefile.am
+++ b/cde/programs/dtinfo/dtinfo/src/Preferences/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_LIBRARIES = libPreferences.a
+noinst_LTLIBRARIES = libPreferences.la
 
 # get our env
 include ../templates/dtinfo_env.mk
@@ -8,6 +8,7 @@ include ../templates/dtinfo_env.mk
 # class info
 include Classlist.mk
 
-libPreferences_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
+libPreferences_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
+
+libPreferences_la_SOURCES = ../Prelude.h $(Preferences_SRCS)
 
-libPreferences_a_SOURCES = ../Prelude.h $(Preferences_SRCS)
diff --git a/cde/programs/dtinfo/dtinfo/src/Query/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Query/Makefile.am
index 7ac210cd9..1a5c473ef 100644
--- a/cde/programs/dtinfo/dtinfo/src/Query/Makefile.am
+++ b/cde/programs/dtinfo/dtinfo/src/Query/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_LIBRARIES = libQuery.a
+noinst_LTLIBRARIES = libQuery.la
 
 # get our env
 include ../templates/dtinfo_env.mk
@@ -8,8 +8,8 @@ include ../templates/dtinfo_env.mk
 # class info
 include Classlist.mk
 
-libQuery_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
-libQuery_a_SOURCES = ../Prelude.h $(Query_SRCS)
+libQuery_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
+libQuery_la_SOURCES = ../Prelude.h $(Query_SRCS)
 
 BUILT_SOURCES = Query.msg
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/cde/programs/dtinfo/dtinfo/src/Support/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Support/Makefile.am
index bbc3200c7..8e4a49736 100644
--- a/cde/programs/dtinfo/dtinfo/src/Support/Makefile.am
+++ b/cde/programs/dtinfo/dtinfo/src/Support/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_LIBRARIES = libSupport.a
+noinst_LTLIBRARIES = libSupport.la
 
 # get our env
 include ../templates/dtinfo_env.mk
@@ -8,6 +8,7 @@ include ../templates/dtinfo_env.mk
 # class info
 include Classlist.mk
 
-libSupport_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
+libSupport_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
+
+libSupport_la_SOURCES = ../Prelude.h $(Support_SRCS)
 
-libSupport_a_SOURCES = ../Prelude.h $(Support_SRCS)
diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Base/Classlist.mk b/cde/programs/dtinfo/dtinfo/src/UAS/Base/Classlist.mk
index cad625577..a4fbbd352 100644
--- a/cde/programs/dtinfo/dtinfo/src/UAS/Base/Classlist.mk
+++ b/cde/programs/dtinfo/dtinfo/src/UAS/Base/Classlist.mk
@@ -1,7 +1,7 @@
-/* $XConsortium: Classlist.mk /main/5 1996/10/30 14:46:19 drk $ */
-CLASSES=
+# $XConsortium: Classlist.mk /main/5 1996/10/30 14:46:19 drk $
+Base_CLASSES=
 
-SRCS= \
+Base_SRCS= \
 UAS_Base.C \
 UAS_Buffer.C \
 UAS_Collection.C \
@@ -20,6 +20,6 @@ UAS_TextRun.C \
 UAS_String.C \
 UAS_StyleSheet.C
 
-MSGS=\
+Base_MSGS=\
 UAS_Base.msg
 
diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Base/Makefile.am b/cde/programs/dtinfo/dtinfo/src/UAS/Base/Makefile.am
new file mode 100644
index 000000000..b9b7a3248
--- /dev/null
+++ b/cde/programs/dtinfo/dtinfo/src/UAS/Base/Makefile.am
@@ -0,0 +1,19 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+noinst_LTLIBRARIES = libBase.la
+
+# get our env
+include ../../templates/dtinfo_env.mk
+
+# class info
+include Classlist.mk
+
+libBase_la_CXXFLAGS = -I.. -I ../.. -I../Support $(DTINFO_DEFINES)	\
+	$(DTINFO_INCLUDES)
+libBase_la_SOURCES = $(Base_SRCS)
+
+BUILT_SOURCES = Base.msg
+CLEANFILES = $(BUILT_SOURCES)
+
+Base.msg:
+	cat $(Base_MSGS) > $@
diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Classlist.mk b/cde/programs/dtinfo/dtinfo/src/UAS/Classlist.mk
index 472cc89db..695412c0e 100644
--- a/cde/programs/dtinfo/dtinfo/src/UAS/Classlist.mk
+++ b/cde/programs/dtinfo/dtinfo/src/UAS/Classlist.mk
@@ -1,7 +1,7 @@
 # $XConsortium: Classlist.mk /main/4 1996/10/30 14:46:56 drk $
 
 UAS_MSGS = \
-Base \
-DtSR \
-MMDB
+Base/Base.msg \
+DtSR/DtSR.msg \
+MMDB/MMDB.msg
 
diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Classlist.mk b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Classlist.mk
index dc5086928..9b7d24735 100644
--- a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Classlist.mk
+++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Classlist.mk
@@ -1,7 +1,7 @@
-/* $XConsortium: Classlist.mk /main/5 1996/10/30 14:47:36 drk $ */
-CLASSES=
+# $XConsortium: Classlist.mk /main/5 1996/10/30 14:47:36 drk $
+DtSR_CLASSES=
 
-SRCS= \
+DtSR_SRCS= \
 DtSR_BookcaseEntry.C \
 DtSR_Parser.C \
 DtSR_SearchEngine.C \
@@ -12,6 +12,6 @@ DtSR_SearchZones.C \
 Tml_TextRenderer.C \
 TextParser.C
 
-MSGS= \
+DtSR_MSGS= \
 DtSR_Parser.msg \
 DtSR_SearchEngine.msg
diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.hh b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.hh
index 4401f6e7f..5b5f7828a 100644
--- a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.hh
+++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.hh
@@ -35,7 +35,7 @@
 #include "DtSR_Stems.hh"
 
 extern "C" {
-#include "Search.h"
+#include "Dt/Search.h"
 }
 
 class DtSR_BookcaseEntry : public UAS_BookcaseEntry
diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchEngine.hh b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchEngine.hh
index a1d717b31..4f1a2ebd3 100644
--- a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchEngine.hh
+++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchEngine.hh
@@ -31,7 +31,7 @@
 #include "UAS_SearchEngine.hh"
 
 extern "C" {
-#include "Search.h"
+#include "Dt/Search.h"
 }
 
 #include "DtSR_Parser.hh"
diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_Stems.hh b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_Stems.hh
index fd827e1e0..99e0ba610 100644
--- a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_Stems.hh
+++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_Stems.hh
@@ -25,7 +25,7 @@
 #define _DTSR_STEMS_HH_
 
 extern "C" {
-#include "Search.h"
+#include "Dt/Search.h"
 }
 
 #include "UAS_Base.hh"
diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Makefile.am b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Makefile.am
new file mode 100644
index 000000000..98f5a9971
--- /dev/null
+++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Makefile.am
@@ -0,0 +1,19 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+noinst_LTLIBRARIES = libDtSR.la
+
+# get our env
+include ../../templates/dtinfo_env.mk
+
+# class info
+include Classlist.mk
+
+libDtSR_la_CXXFLAGS = -I../Base -I./Util_Classes -I../..	\
+	$(DTINFO_DEFINES) $(DTINFO_INCLUDES)
+libDtSR_la_SOURCES = $(DtSR_SRCS)
+
+BUILT_SOURCES = DtSR.msg
+CLEANFILES = $(BUILT_SOURCES)
+
+DtSR.msg:
+	cat $(DtSR_MSGS) > $@
diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Classlist.mk b/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Classlist.mk
index a627f986e..68a8266b3 100644
--- a/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Classlist.mk
+++ b/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Classlist.mk
@@ -1,7 +1,7 @@
-/* $XConsortium: Classlist.mk /main/4 1996/10/30 14:48:10 drk $ */
-CLASSES=
+# $XConsortium: Classlist.mk /main/4 1996/10/30 14:48:10 drk $
+MMDB_CLASSES=
 
-SRCS= \
+MMDB_SRCS= \
 MMDB.C \
 MMDB_Common.C \
 MMDB_Factory.C \
@@ -11,5 +11,5 @@ MMDB_BookCase.C \
 MMDB_EmbeddedObject.C \
 MMDB_StyleSheet.C
 
-MSGS=\
+MMDB_MSGS=\
 UAS_MMDB.msg
diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Makefile.am b/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Makefile.am
new file mode 100644
index 000000000..170665df4
--- /dev/null
+++ b/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Makefile.am
@@ -0,0 +1,19 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+noinst_LTLIBRARIES = libMMDB.la
+
+# get our env
+include ../../templates/dtinfo_env.mk
+
+# class info
+include Classlist.mk
+
+libMMDB_la_CXXFLAGS = -I../Base -I../.. $(DTINFO_DEFINES)	\
+	$(DTINFO_INCLUDES)
+libMMDB_la_SOURCES = $(MMDB_SRCS)
+
+BUILT_SOURCES = MMDB.msg
+CLEANFILES = $(BUILT_SOURCES)
+
+MMDB.msg:
+	cat $(MMDB_MSGS) > $@
diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Makefile.am b/cde/programs/dtinfo/dtinfo/src/UAS/Makefile.am
index b8e60e114..083273f13 100644
--- a/cde/programs/dtinfo/dtinfo/src/UAS/Makefile.am
+++ b/cde/programs/dtinfo/dtinfo/src/UAS/Makefile.am
@@ -1,6 +1,8 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_LIBRARIES = libUAS.a
+SUBDIRS = Base MMDB DtSR
+
+noinst_LTLIBRARIES = libUAS.la
 
 # get our env
 include ../templates/dtinfo_env.mk
@@ -8,6 +10,15 @@ include ../templates/dtinfo_env.mk
 # class info
 include Classlist.mk
 
-libUAS_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
+libUAS_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
+libUAS_la_SOURCES =
+# this should make sure this is linked with a C++ compiler
+nodist_EXTRA_libUAS_la_SOURCES = dummy.cxx
+libUAS_la_LIBADD = Base/libBase.la MMDB/libMMDB.la DtSR/libDtSR.la
 
-libUAS_a_SOURCES = ../Prelude.h $(UAS_SRCS)
+noinst_DATA = UAS.msg
+
+UAS.msg: $(UAS_MSGS)
+	cat $(UAS_MSGS) > $@
+
+CLEANFILES = UAS.msg
diff --git a/cde/programs/dtinfo/dtinfo/src/Widgets/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Widgets/Makefile.am
index bc8729872..738e254e8 100644
--- a/cde/programs/dtinfo/dtinfo/src/Widgets/Makefile.am
+++ b/cde/programs/dtinfo/dtinfo/src/Widgets/Makefile.am
@@ -1,11 +1,11 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_LIBRARIES = libWidgets.a
+noinst_LTLIBRARIES = libWidgets.la
 
 # get our env
 include ../templates/dtinfo_env.mk
 
-libWidgets_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
+libWidgets_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
 
-libWidgets_a_SOURCES = Pixmap.c Tree.c Panner.c Simple.c Porthole.c	\
+libWidgets_la_SOURCES = Pixmap.c Tree.c Panner.c Simple.c Porthole.c	\
 	XawInitFake.c TabButton.c Restraint.c WXmOpButton.C
diff --git a/cde/programs/dtinfo/dtinfo/src/cgm/Makefile.am b/cde/programs/dtinfo/dtinfo/src/cgm/Makefile.am
index 95cfab6af..fdda10eec 100644
--- a/cde/programs/dtinfo/dtinfo/src/cgm/Makefile.am
+++ b/cde/programs/dtinfo/dtinfo/src/cgm/Makefile.am
@@ -1,18 +1,18 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_LIBRARIES = libcgm.a
+noinst_LTLIBRARIES = libcgm.la
 
 # get our env
 include ../templates/dtinfo_env.mk
 
 # class info
-libcgm_a_CFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)	\
+libcgm_la_CFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)	\
 	-I$(top_srcdir)/include/DtI
 
-libcgm_a_SOURCES = cgmcmds.c cgmcommon.c cgmio.c cgmtext.c getcgm.c
+libcgm_la_SOURCES = cgmcmds.c cgmcommon.c cgmio.c cgmtext.c getcgm.c
 
 noinst_PROGRAMS = testcgm
 testcgm_CPPFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)	\
 	-I$(top_srcdir)/include/DtI
 testcgm_SOURCES = testcgm.c
-testcgm_LDADD = libcgm.a $(DTCLIENTLIBS) $(XTOOLLIB)
+testcgm_LDADD = libcgm.la $(DTCLIENTLIBS) $(XTOOLLIB)
diff --git a/cde/programs/dtinfo/dtinfo/src/templates/dtinfo-dfiles-hfiles.mk b/cde/programs/dtinfo/dtinfo/src/templates/dtinfo-dfiles-hfiles.mk
new file mode 100644
index 000000000..6f2da0ed7
--- /dev/null
+++ b/cde/programs/dtinfo/dtinfo/src/templates/dtinfo-dfiles-hfiles.mk
@@ -0,0 +1,109 @@
+## Build the dfiles and hfiles components for each of the class modules.
+## Moved into this file to keep Makefile.am in dtinfo/src readable
+
+# Support
+include Support/Classlist.mk
+Support/Support.d: Support/Classlist.mk
+	cd Support && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Support $(Support_CLASSES)
+
+Support/Support.h: Support/Classlist.mk
+	cd Support && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Support $(Support_CLASSES)
+
+
+# UAS
+include UAS/Classlist.mk
+UAS/UAS.d: UAS/Classlist.mk
+	cd UAS && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d UAS $(UAS_CLASSES)
+
+UAS/UAS.h: UAS/Classlist.mk
+	cd UAS && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h UAS $(UAS_CLASSES)
+
+
+# Basic
+include Basic/Classlist.mk
+Basic/Basic.d: Basic/Classlist.mk
+	cd Basic && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Basic $(Basic_CLASSES)
+
+Basic/Basic.h: Basic/Classlist.mk
+	cd Basic && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Basic $(Basic_CLASSES)
+
+
+# OliasSearch
+include OliasSearch/Classlist.mk
+OliasSearch/OliasSearch.d: OliasSearch/Classlist.mk
+	cd OliasSearch && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d OliasSearch $(OliasSearch_CLASSES)
+
+OliasSearch/OliasSearch.h: OliasSearch/Classlist.mk
+	cd OliasSearch && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h OliasSearch $(OliasSearch_CLASSES)
+
+
+# Marks
+include Marks/Classlist.mk
+Marks/Marks.d: Marks/Classlist.mk
+	cd Marks && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Marks $(Marks_CLASSES)
+
+Marks/Marks.h: Marks/Classlist.mk
+	cd Marks && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Marks $(Marks_CLASSES)
+
+
+# Graphics
+include Graphics/Classlist.mk
+Graphics/Graphics.d: Graphics/Classlist.mk
+	cd Graphics && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Graphics $(Graphics_CLASSES)
+
+Graphics/Graphics.h: Graphics/Classlist.mk
+	cd Graphics && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Graphics $(Graphics_CLASSES)
+
+
+# Preferences
+include Preferences/Classlist.mk
+Preferences/Preferences.d: Preferences/Classlist.mk
+	cd Preferences && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Preferences $(Preferences_CLASSES)
+
+Preferences/Preferences.h: Preferences/Classlist.mk
+	cd Preferences && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Preferences $(Preferences_CLASSES)
+
+
+# Managers
+include Managers/Classlist.mk
+Managers/Managers.d: Managers/Classlist.mk
+	cd Managers && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Managers $(Managers_CLASSES)
+
+Managers/Managers.h: Managers/Classlist.mk
+	cd Managers && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Managers $(Managers_CLASSES)
+
+
+# Other
+include Other/Classlist.mk
+Other/Other.d: Other/Classlist.mk
+	cd Other && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Other $(Other_CLASSES)
+
+Other/Other.h: Other/Classlist.mk
+	cd Other && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Other $(Other_CLASSES)
+
+
+# Query
+include Query/Classlist.mk
+Query/Query.d: Query/Classlist.mk
+	cd Query && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Query $(Query_CLASSES)
+
+Query/Query.h: Query/Classlist.mk
+	cd Query && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Query $(Query_CLASSES)
+
+
+# Agents
+include Agents/Classlist.mk
+Agents/Agents.d: Agents/Classlist.mk
+	cd Agents && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Agents $(Agents_CLASSES)
+
+Agents/Agents.h: Agents/Classlist.mk
+	cd Agents && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Agents $(Agents_CLASSES)
+
+
+# OnlineRender
+include OnlineRender/Classlist.mk
+OnlineRender/OnlineRender.d: OnlineRender/Classlist.mk
+	cd OnlineRender && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d OnlineRender $(OnlineRender_CLASSES)
+
+OnlineRender/OnlineRender.h: OnlineRender/Classlist.mk
+	cd OnlineRender && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h OnlineRender $(OnlineRender_CLASSES)
diff --git a/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk b/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk
index 086235ea9..9a2b9751c 100644
--- a/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk
+++ b/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk
@@ -24,6 +24,7 @@ COMMON_CLASS_INCLUDES = -I$(MMDB)/dti_cc -I$(MMDB)
 COMMON_CLASS_LIBDIR = $(STATIC) -L$(MMDB)/dti_cc
 STYLE_SHEET_INCLUDES = -I$(MMDB)/StyleSheet
 TREERES = $(TOOLS)/misc/treeres
+MSGSETS = $(TOOLS)/misc/msgsets
 
 DTINFO_INCLUDES = -I.. $(UAS_INCLUDES) $(EXCEPTIONS_INCLUDES)	\
 	$(WWL_INCLUDES) $(TREE_INCLUDES) $(STYLE_SHEET_INCLUDES) \
diff --git a/cde/programs/dtinfo/tools/misc/Makefile.am b/cde/programs/dtinfo/tools/misc/Makefile.am
index 6595e14c9..3aa8dfd49 100644
--- a/cde/programs/dtinfo/tools/misc/Makefile.am
+++ b/cde/programs/dtinfo/tools/misc/Makefile.am
@@ -10,6 +10,8 @@ dfiles_SOURCES = dfiles.c
 
 pmaker_SOURCES = pmaker.c
 
+# JET - this one migth need to be regenned via the lex file someday...
+# Maybe it should always be regenned?
 msgsets_SOURCES = msgsets.C
 
 treeres: treeres.src