dtterm: make it build

cde/configure.ac

@@ -400,6 +400,8 @@ programs/dtdbcache/Makefile
 
 programs/dticon/Makefile
 
+programs/dtterm/Makefile
+
 ])
 
 AC_OUTPUT

cde/programs/dtterm/Makefile.am

@@ -1,48 +1,36 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-if SOLARIS
-.NO_PARALLEL:
-endif
-
-all:: dtterm.ti DtTermFallBackResources.c
-
-SUBDIRS = util
-
 bin_PROGRAMS = dtterm
 
+dtterm_LDADD = $(LIBTERM) $(DTCLIENTLIBS) $(XTOOLLIB) 
+
 if BSD
-UTILLIB = -lutil
+dtterm_LDADD += -lutil
 endif
 
-if SOLARIS
+dtterm_CFLAGS = -I$(top_builddir)/lib/DtTerm/TermPrim	\
-LIBHELP =
+	-I$(top_builddir)/lib/DtTerm/Term			\
-endif
+	-I$(top_builddir)/lib/DtTerm/TermView $(TIRPCINC)	\
-
+	-I$(top_builddir)/include/Dt \
-dtterm_LDADD = $(LIBTERM) $(XINPUTLIB) $(LIBHELP) \
+	-DSUN_TERMINAL_SERVER
-        -lXm $(XTOOLLIB) ${X_LIB} $(UTILLIB) $(LIBSVC) $(LIBTT)
-
-dtterm_CFLAGS = -I$(DTTERMSRC)/TermPrim -I$(DTTERMSRC)/Term \
-		-I$(DTTERMSRC)/TermView $(TIRPCINC)
-
-if AIX
-dtterm_CFLAGS += -DHAS_KNL -DHAS_KTAB
-endif
-
-if HPVUE
-AM_CPPFLAGS += -DBUILD_HPVUE -DHPVUE
-endif
 
 dtterm_SOURCES = DtTermLogit.c DtTermMain.c DtTermFallBackResources.c	\
-		 sunDtTermServer.c 		DtTermSyntax.c
+		 sunDtTermServer.c DtTermSyntax.c DtTermLogit.h		\
+		 DtTermMain.h DtTermServer.h DtTermSyntax.h
 
-CPPSRC = Dtterm.ad.src
+CPP_TARGETS = dtterm.ti DtTermFallBackResources.c.src	\
-CPPTARGET = Dtterm.ad
+	DtTermFallBackResources.c Dtterm.ad
-include $(srcdir)/include/cppfile.tmpl
 
-CPPSRC = Dtterm.ad.src
+BUILT_SOURCES = $(CPP_TARGETS)
-CPPTARGET = DtTermFallBackResources.c.src
+CLEANFILES = $(CPP_TARGETS)
-AM_CPPFLAGS = -DFALLBACK_RESOURCES
+
-include $(srcdir)/include/cppfile.tmpl
+Dtterm.ad: Dtterm.ad.src
+	$(RM) $@
+	$(GENCPP) -P -DXCOMM=# $< > $@
+
+DtTermFallBackResources.c.src: Dtterm.ad.src
+	$(RM) $@
+	$(GENCPP) -P -DXCOMM=# -DFALLBACK_RESOURCES $< > $@
 
 DtTermFallBackResources.c: DtTermFallBackResources.c.src
 	$(RM) $@
@@ -50,4 +38,4 @@ DtTermFallBackResources.c: DtTermFallBackResources.c.src
 
 dtterm.ti: terminfoChecklist
 	$(RM) $@
-	CPP="$(CPP) $(TIC_DEFINES)" $(SHELL) terminfoCreate < terminfoChecklist > $@
+	CPP="$(GENCPP)" $(SHELL) terminfoCreate < terminfoChecklist > $@