From b9dbea9d3a6394c0171165ee7d2744ae800eadff Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Sun, 5 Dec 2021 11:36:35 -0700
Subject: [PATCH] dtinfo/dtinfo: get it to build

After fixing up some problems with the dtinfo/mmdb library, dtinfo now
links.
---
 cde/programs/dtinfo/dtinfo/src/Makefile.am    | 15 +++++--------
 .../dtinfo/dtinfo/src/templates/dtinfo_env.mk |  2 +-
 cde/programs/dtinfo/mmdb/Makefile.am          | 22 ++++++++++---------
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/cde/programs/dtinfo/dtinfo/src/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Makefile.am
index 8cd61415a..e34421454 100644
--- a/cde/programs/dtinfo/dtinfo/src/Makefile.am
+++ b/cde/programs/dtinfo/dtinfo/src/Makefile.am
@@ -37,7 +37,7 @@ Prelude.h:
 Dtinfo: Dtinfo.res $(RESFILES)
 	$(CPP_PROGRAM) -traditional -nostdinc -C Dtinfo.res | $(TREERES) > $@
 
-# dtinfo class dfiles and hfiles building
+# dtinfo class dfile and hfile building for the modules
 include templates/dtinfo-dfiles-hfiles.mk
 
 # gather up the messages and generate the file. MSGS comes from the
@@ -62,14 +62,11 @@ OLIASNORMALLIBS= Agents/libAgents.a Other/libOther.a			\
            OliasSearch/libOliasSearch.a Widgets/libWidgets.a		\
            cgm/libcgm.a
 
-#DTSEARCHLIBS = -L$(DTSEARCH_LIBDIR) -lDtSearch
+bin_PROGRAMS = dtinfo
 
+dtinfo_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
 
+dtinfo_LDADD = $(OLIASNORMALLIBS) $(LIBSEARCH) $(MMDB_LIBS) $(WWL_LIBS) \
+	$(DTCLIENTLIBS) -lXmu $(XTOOLLIB)
 
-#bin_PROGRAMS = dtinfo
-
-#dtinfo_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
-
-#dtinfo_LDADD = $(OLIASNORMALLIBS) $(LIBSEARCH) $(MMDB_LIBS) $(WWL_LIBS) $(DTCLIENTLIBS) -lXmu $(XTOOLLIB)
-
-# dtinfo_SOURCES = main.C Support/InputNotifier.C
+dtinfo_SOURCES = main.C Support/InputNotifier.C
diff --git a/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk b/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk
index 62c59cb54..675fd9ccd 100644
--- a/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk
+++ b/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk
@@ -40,5 +40,5 @@ TREERES = $(TOOLS)/misc/treeres
 MSGSETS = $(TOOLS)/misc/msgsets
 
 DTINFO_INCLUDES = -I.. $(UAS_INCLUDES) $(EXCEPTIONS_INCLUDES)	\
-	$(WWL_INCLUDES) $(TREE_INCLUDES) $(STYLE_SHEET_INCLUDES) \
+	$(WWL_INCLUDES) $(STYLE_SHEET_INCLUDES)			\
 	$(COMMON_CLASS_INCLUDES)
diff --git a/cde/programs/dtinfo/mmdb/Makefile.am b/cde/programs/dtinfo/mmdb/Makefile.am
index 5f598ed83..36e27e680 100644
--- a/cde/programs/dtinfo/mmdb/Makefile.am
+++ b/cde/programs/dtinfo/mmdb/Makefile.am
@@ -18,13 +18,15 @@ libMMDB_la_SOURCES =
 # fake things so libtool creates this as a C++ library
 nodist_EXTRA_libMMDB_la_SOURCES = dummy.cxx
 
-libMMDB_la_LIBADD = api/libapi.la btree/libbtree.la			\
-		   btree_berkeley/libbtree_berkeley.la			\
-		   compression/libcompression.la			\
-		   diskhash/libdiskhash.la dstr/libdstr.la		\
-		   dti_excs/libdti_excs.la dynhash/libdynhash.la	\
-		   hmphf/libhmphf.la index/libindex.la			\
-		   mgrs/libmgrs.la misc/libmisc.la			\
-		   object/libobject.la oliasdb/liboliasdb.la		\
-		   schema/libschema.la storage/libstorage.la		\
-		   utility/libutility.la
+libMMDB_la_LIBADD = api/libapi.la btree_berkeley/libbtree_berkeley.la	\
+			btree/libbtree.la				\
+			compression/libcompression.la			\
+			diskhash/libdiskhash.la dstr/libdstr.la		\
+			dti_cc/libdti_cc.la dti_excs/libdti_excs.la	\
+			dynhash/libdynhash.la HardCopy/libHardCopy.la	\
+			hmphf/libhmphf.la index/libindex.la		\
+			mgrs/libmgrs.la misc/libmisc.la			\
+			object/libobject.la oliasdb/liboliasdb.la	\
+			schema/libschema.la storage/libstorage.la	\
+			StyleSheet/libStyleSheet.la			\
+			utility/libutility.la