From ad2ad2b66bea8b5604297e72d3760509d1b80b64 Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Fri, 22 Nov 2019 16:58:58 -0700
Subject: [PATCH] tttypes: make it build

---
 cde/.gitignore                   |  2 ++
 cde/configure.ac                 |  2 ++
 cde/programs/tttypes/Makefile.am | 13 ++++++++-----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/cde/.gitignore b/cde/.gitignore
index 191bda83e..2ebe977e5 100644
--- a/cde/.gitignore
+++ b/cde/.gitignore
@@ -2402,6 +2402,8 @@ programs/tttypes/dticon.done
 programs/tttypes/dticon.ptype.deps
 programs/tttypes/dtinfo.done
 programs/tttypes/dtinfo.ptype.deps
+programs/tttypes/dtinfo_start.done
+programs/tttypes/dtinfo_start.ptype.deps
 programs/tttypes/dtmail.done
 programs/tttypes/dtmail.ptype.deps
 programs/tttypes/dtpad.done
diff --git a/cde/configure.ac b/cde/configure.ac
index 0afe5a828..87496dfb5 100644
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -465,6 +465,8 @@ programs/dtpdmd/Makefile
 
 programs/types/Makefile
 
+programs/tttypes/Makefile
+
 ])
 
 AC_OUTPUT
diff --git a/cde/programs/tttypes/Makefile.am b/cde/programs/tttypes/Makefile.am
index 8d9c4006e..e083aeee5 100644
--- a/cde/programs/tttypes/Makefile.am
+++ b/cde/programs/tttypes/Makefile.am
@@ -1,8 +1,10 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-CLEANFILES = *.done types.xdr .tt_lock
+# We need to ensure that the jobs here are run in sequence to build up
+# the types.xdr file.
+.NOTPARALLEL:
 
-.SUFFIXES: .ptype .done
+SUFFIXES: .ptype .done
 
 LOCALDEPFILES = \
         dtfile.done \
@@ -13,13 +15,14 @@ LOCALDEPFILES = \
         dtdbcache.done \
         dtterm.done \
         dtinfo.done \
-        dtinfo.done
+        dtinfo_start.done
 
-all:: types.xdr
+BUILT_SOURCES = types.xdr
+CLEANFILES = *.done types.xdr .tt_lock
 
 types.xdr: $(LOCALDEPFILES)
 
-TT_TYPE_COMP = $(srcdir)/lib/tt/bin/tt_type_comp/tt_type_comp
+TT_TYPE_COMP = $(top_builddir)/lib/tt/bin/tt_type_comp/tt_type_comp
 
 .ptype.done:
 	$(RM) $@