From 7c2983185d10abdad1ec040c97210e35bd3d2500 Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Fri, 25 Oct 2019 10:43:05 -0600
Subject: [PATCH] Re-fix tt_type_comp -- it doesn't actually need yacc/lex

---
 cde/lib/tt/bin/tt_type_comp/Makefile.am | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/cde/lib/tt/bin/tt_type_comp/Makefile.am b/cde/lib/tt/bin/tt_type_comp/Makefile.am
index ce04ad67c..25e3915d6 100644
--- a/cde/lib/tt/bin/tt_type_comp/Makefile.am
+++ b/cde/lib/tt/bin/tt_type_comp/Makefile.am
@@ -2,28 +2,20 @@ MAINTAINERCLEANFILES = Makefile.in
 
 include ../../tooltalk.inc
 
-# JET - this is kind of hacky - we need to have ylwrap compile as C++
-# not C, but the default lex/yac suffices are /l and .y, which means
-# C.  So we "fix" that.
+BUILT_SOURCES = mp_types_gram.h
+CLEANFILES = mp_types_gram.h
 
-BUILT_SOURCES = mp_types_lex.L mp_types_gram.Y
-CLEANFILES = mp_types_lex.L mp_types_gram.Y
-mp_types_lex.L:
-	$(LN_S) mp_types_lex.l mp_types_lex.L
-
-mp_types_gram.Y:
-	$(LN_S) mp_types_gram.y mp_types_gram.Y
-
-AM_YFLAGS = -d
+mp_types_gram.h:
+	$(RM) mp_types_gram.h
+	$(LN_S) frozen.mp_types_gram.h mp_types_gram.h
 
 bin_PROGRAMS = tt_type_comp
 
 tt_type_comp_CXXFLAGS = $(TIRPCINC) -I../../lib -I../../slib \
-			$(TT_VERSION_DEFINE) -I../../lib
+			$(TT_VERSION_DEFINE)
 
 tt_type_comp_SOURCES = mp_type_comp.C        mp_types_table.C \
-		frozen.mp_types_lex.C frozen.mp_types_gram.C \
-		mp_types_lex.L mp_types_gram.Y
+		frozen.mp_types_lex.C frozen.mp_types_gram.C
 
 tt_type_comp_LDADD = @LIBTT@ $(X_LIBS) ../../slib/libstt.a
 
@@ -39,3 +31,4 @@ if OPENBSD
 tt_type_comp_LDADD += $(XTOOLLIB)
 endif
 
+frozen.mp_types_lex.o: frozen.mp_types_gram.h