diff --git a/cde/lib/tt/bin/tt_type_comp/Makefile.am b/cde/lib/tt/bin/tt_type_comp/Makefile.am
index 5b0d63584..ce04ad67c 100644
--- a/cde/lib/tt/bin/tt_type_comp/Makefile.am
+++ b/cde/lib/tt/bin/tt_type_comp/Makefile.am
@@ -2,10 +2,28 @@ 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_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
+
 bin_PROGRAMS = tt_type_comp
 
 tt_type_comp_CXXFLAGS = $(TIRPCINC) -I../../lib -I../../slib \
-			$(TT_VERSION_DEFINE)
+			$(TT_VERSION_DEFINE) -I../../lib
+
+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
 
 tt_type_comp_LDADD = @LIBTT@ $(X_LIBS) ../../slib/libstt.a
 
@@ -21,7 +39,3 @@ if OPENBSD
 tt_type_comp_LDADD += $(XTOOLLIB)
 endif
 
-tt_type_comp_SOURCES = mp_type_comp.C        mp_types_table.C \
-		       frozen.mp_types_lex.C frozen.mp_types_gram.C
-
-frozen.mp_types_lex.o: frozen.mp_types_gram.h