DtWidget: make it build, change include/cppfile.inc a bit

cppfile.inc - don't set BUIT_SOURCES or CLEANFILES here as they
overwrite (or in case of the CLEANFILES +=...) ignore the settings.
Do those in the Makefile.am always.

We still need a better way to preprocess generic files.  cppfile.inc
will only work for one file per Makefile...

diff --git a/cde/include/cppfile.inc b/cde/include/cppfile.inc
index cadbc855ed04f06b4e599db88c50989a1611f238..1222b03d370d4a240b441717cdc7281acf08e41f 100644 (file)
--- a/cde/include/cppfile.inc
+++ b/cde/include/cppfile.inc
@@ -1,6 +1,3 @@
-BUILT_SOURCES = $(CPPTARGET)
-CLEANFILES += $(CPPTARGET)
-
 
 $(CPPTARGET): Makefile $(CPPSRC)
        $(RM) $@

diff --git a/cde/lib/DtWidget/Makefile.am b/cde/lib/DtWidget/Makefile.am
index ac099ec2e614b4a50dc847297c0803af03b3cdcd..0ae49560f5f479e25941b3ae419317273881546c 100644 (file)
--- a/cde/lib/DtWidget/Makefile.am
+++ b/cde/lib/DtWidget/Makefile.am
@@ -2,13 +2,9 @@ unixdir = ${prefix}/app-defaults/C
 
 MAINTAINERCLEANFILES = Makefile.in
 
-CLEANFILES = UNIXbindings
-
 lib_LTLIBRARIES = libDtWidget.la
 
-unix_PROGRAMS = UNIXbindings
-
-AM_CPPFLAGS = -DCDE_INSTALLATION_TOP=${prefix}
+AM_CPPFLAGS = -DCDE_INSTALLATION_TOP=${prefix} @DT_INCDIR@
 
 libDtWidget_la_CFLAGS = -DI18N_MSG -DMULTIBYTE
 
@@ -43,7 +39,11 @@ libDtWidget_la_SOURCES = ComboBox.c      Control.c       DialogBox.c \
                         SearchDlg.c     SpinBox.c       TitleBox.c \
                         View.c
 
+# cpp this...
+BUILT_SOURCES = UNIXbindings
+CLEANFILES = UNIXbindings
+
 CPPTARGET = UNIXbindings
 CPPSRC = UNIXbindings.cpp
-# FIXME
-#include $(srcdir)/include/cppfile.tmpl
+
+include $(top_builddir)/include/cppfile.inc

diff --git a/cde/lib/tt/bin/scripts/Makefile.am b/cde/lib/tt/bin/scripts/Makefile.am
index c2b4eeb37ae38e7810819f404a35e339601fad1e..f252a3847b56aa788f81b8c23c36c1491bd9602c 100644 (file)
--- a/cde/lib/tt/bin/scripts/Makefile.am
+++ b/cde/lib/tt/bin/scripts/Makefile.am
@@ -3,6 +3,8 @@ MAINTAINERCLEANFILES = Makefile.in
 include ../../tooltalk.inc
 
 noinst_SCRIPTS = ttce2xdr
+BUILT_SOURCES = ttce2xdr
+CLEANFILES = ttce2xdr
 
 AM_CPPFLAGS = $(TIRPCINC) $(TT_VERSION_DEFINE)