From e675e06dd1bdc81cae027ae90f8896b8401c2b63 Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Tue, 19 Nov 2019 19:43:34 -0700
Subject: [PATCH] dtspcd: make it build

---
 cde/configure.ac                |  2 ++
 cde/programs/dtspcd/Makefile.am | 36 ++++++++++++++++-----------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/cde/configure.ac b/cde/configure.ac
index 31fda4089..e9512b909 100644
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -406,6 +406,8 @@ programs/dtcalc/Makefile
 
 programs/dtaction/Makefile
 
+programs/dtspcd/Makefile
+
 ])
 
 AC_OUTPUT
diff --git a/cde/programs/dtspcd/Makefile.am b/cde/programs/dtspcd/Makefile.am
index effa03727..a9c4ae8ba 100644
--- a/cde/programs/dtspcd/Makefile.am
+++ b/cde/programs/dtspcd/Makefile.am
@@ -1,31 +1,31 @@
-configdir = ${prefix}/config
-
 MAITAINERCLEANFILES = Makefile.in
 
 bin_PROGRAMS = dtspcd
 
-config_PROGRAMS = dtspcdenv
+dtspcd_CFLAGS = $(TIRPCINC) -DCDE_CONFIGURATION_TOP=\"${prefix}\" \
+		-DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
+		-I$(top_builddir)/include/Dt
 
-dtspcd_CFLAGS = $(TIRPCINC) -I../dthelp -DCDE_CONFIGURATION_TOP=\"${prefix}\" \
-		-DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\"
-
-dtspcd_LDADD = $(LIBHELP) $(LIBSVC) $(LIBTT) -lXm $(XTOOLLIB) ${X_LIBS} -lm
+dtspcd_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
 
 if SOLARIS
 dtspcd_LDADD += -ldl -lgen
 endif
 
-if HPUX
-dtspcd_CFLAGS += -D_XOPEN_SOURCE -D__hpux_8_0 -DFUNCPROTO
-endif
-
-dtspcdenv_CPPFLAGS = -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
-                    -DCDE_INSTALLATION_TOP=${prefix} \
-                    -DCDE_LOGFILES_TOP=$(CDE_LOGFILES_TOP) \
-                    -DDEF_SYSTEM_PATH=$(PATH)
+# I really think we should get rid of dtspcd in general...
 
 dtspcd_SOURCES = main.c spcd_event.c
 
-CPPTARGET = dtspcdenv
-CPPSRC = dtspcdenv.src
-include $(srcdir)/include/cppfile.tmpl
+DEF_SYSTEM_PATH = "/bin:/usr/bin"
+LOCAL_CPP_DEFINES = -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP)	\
+	-DCDE_LOGFILES_TOP=$(CDE_LOGFILES_TOP) \
+	-DDEF_SYSTEM_PATH=$(DEF_SYSTEM_PATH)
+
+CPP_TARGETS = dtspcdenv
+BUILT_SOURCES = $(CPP_TARGETS)
+CLEANFILES = $(CPP_TARGETS)
+
+dtspcdenv: dtspcdenv.src
+	$(RM) $@
+	$(GENCPP) -P -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+