dtterm: make it build

diff --git a/cde/configure.ac b/cde/configure.ac
index 39dd54f7cb2c191356d27b1ce1893fd80cb3b245..b80fe18c031d68e27140c415bcc6c80eec6ac02a 100644 (file)
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -400,6 +400,8 @@ programs/dtdbcache/Makefile
 
 programs/dticon/Makefile
 
+programs/dtterm/Makefile
+
 ])
 
 AC_OUTPUT

diff --git a/cde/programs/dtterm/Makefile.am b/cde/programs/dtterm/Makefile.am
index 3d2d1d64b36aacabeb77189abf1879ab8c502d59..182609a678dc0e652f9fc04dd81af114536d2c17 100644 (file)
--- a/cde/programs/dtterm/Makefile.am
+++ b/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
 
-if BSD
-UTILLIB = -lutil
-endif
+dtterm_LDADD = $(LIBTERM) $(DTCLIENTLIBS) $(XTOOLLIB) 
 
-if SOLARIS
-LIBHELP =
+if BSD
+dtterm_LDADD += -lutil
 endif
 
-dtterm_LDADD = $(LIBTERM) $(XINPUTLIB) $(LIBHELP) \
-        -lXm $(XTOOLLIB) ${X_LIB} $(UTILLIB) $(LIBSVC) $(LIBTT)
-
-dtterm_CFLAGS = -I$(DTTERMSRC)/TermPrim -I$(DTTERMSRC)/Term \
-               -I$(DTTERMSRC)/TermView $(TIRPCINC)
+dtterm_CFLAGS = -I$(top_builddir)/lib/DtTerm/TermPrim  \
+       -I$(top_builddir)/lib/DtTerm/Term                       \
+       -I$(top_builddir)/lib/DtTerm/TermView $(TIRPCINC)       \
+       -I$(top_builddir)/include/Dt \
+       -DSUN_TERMINAL_SERVER
 
-if AIX
-dtterm_CFLAGS += -DHAS_KNL -DHAS_KTAB
-endif
+dtterm_SOURCES = DtTermLogit.c DtTermMain.c DtTermFallBackResources.c  \
+                sunDtTermServer.c DtTermSyntax.c DtTermLogit.h         \
+                DtTermMain.h DtTermServer.h DtTermSyntax.h
 
-if HPVUE
-AM_CPPFLAGS += -DBUILD_HPVUE -DHPVUE
-endif
+CPP_TARGETS = dtterm.ti DtTermFallBackResources.c.src  \
+       DtTermFallBackResources.c Dtterm.ad
 
-dtterm_SOURCES = DtTermLogit.c         DtTermMain.c    DtTermFallBackResources.c \
-                sunDtTermServer.c              DtTermSyntax.c
+BUILT_SOURCES = $(CPP_TARGETS)
+CLEANFILES = $(CPP_TARGETS)
 
-CPPSRC = Dtterm.ad.src
-CPPTARGET = Dtterm.ad
-include $(srcdir)/include/cppfile.tmpl
+Dtterm.ad: Dtterm.ad.src
+       $(RM) $@
+       $(GENCPP) -P -DXCOMM=# $< > $@
 
-CPPSRC = Dtterm.ad.src
-CPPTARGET = DtTermFallBackResources.c.src
-AM_CPPFLAGS = -DFALLBACK_RESOURCES
-include $(srcdir)/include/cppfile.tmpl
+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 > $@