projects / oweals / cde.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 264871c)
types: make it build
authorJon Trulson <jon@radscan.com>
Fri, 22 Nov 2019 21:33:34 +0000 (14:33 -0700)
committerJon Trulson <jon@radscan.com>
Fri, 22 Nov 2019 23:57:47 +0000 (16:57 -0700)
cde/.gitignore patch | blob | history
cde/configure.ac patch | blob | history
cde/programs/types/Makefile.am patch | blob | history

diff --git a/cde/.gitignore b/cde/.gitignore
index 65a23db4ad834f4213d220fb11d151430df0076f..191bda83e87d8d871a1f6e18c100ef760ab2ab15 100644 (file)
--- a/cde/.gitignore
+++ b/cde/.gitignore
@@ -2413,6 +2413,7 @@ programs/tttypes/types.xdr
 # programs/types
 programs/types/IconBrowse.dt
 programs/types/autoStart.dt
+programs/types/compat.dt
 programs/types/datatypes.dt
 programs/types/develop.dt
 programs/types/dt.dt
@@ -2430,9 +2431,13 @@ programs/types/dtwm.fp
 programs/types/error.ds
 programs/types/hp.dt
 programs/types/ibm.dt
+programs/types/laserrom.dt
 programs/types/miscActions.dt
 programs/types/miscImages.dt
 programs/types/print.dt
+programs/types/printerNN.dt
+programs/types/sunOW.dt
+programs/types/unsupported.dt
 programs/types/user-prefs.dt
 programs/types/uxstd.dt
 programs/types/xclients.dt
diff --git a/cde/configure.ac b/cde/configure.ac
index 051dbbe00e9c36c0e713f8d8bcf4c12091e8dca8..0afe5a82885a499acc2afc7a6647694584595c45 100644 (file)
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -463,6 +463,8 @@ programs/dtsr/Makefile
 
 programs/dtpdmd/Makefile
 
+programs/types/Makefile
+
 ])
 
 AC_OUTPUT
diff --git a/cde/programs/types/Makefile.am b/cde/programs/types/Makefile.am
index 504c4c5668f366794872afb5f91eb8dab2e8a911..836b2e295e1e27e376e590d0251f25e5065beb79 100644 (file)
--- a/cde/programs/types/Makefile.am
+++ b/cde/programs/types/Makefile.am
@@ -1,121 +1,142 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-AM_CPPFLAGS = -DCDE_INSTALLATION_TOP=${prefix} \
-             -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
-             -DKORNSHELL=$(KSH) -DDTKORNSHELL=/usr/dt/bin/dtksh
-
-TARGETS = IconBrowse.dt   autoStart.dt    datatypes.dt \
-        develop.dt      dt.dt           dt.softinit \
-        dtappman.dt     dtfile.dt       dthelp.dt \
-        dthelpprint.dt  dthelptag.dt    dtims.dt \
-        dtinfo.dt       dtpad.dt        dtscreen.dt \
-        dtwm.fp         error.ds        hp.dt \
-        ibm.dt          miscActions.dt  miscImages.dt \
-        print.dt        user-prefs.dt   uxstd.dt \
-        xclients.dt
-
-
-
-CPPSRC = IconBrowse.dt.src
-CPPTARGET = IconBrowse.dt
-include $(srcdir)/include/cppfile.tmpl
-
-CPPSRC = autoStart.dt.src
-CPPTARGET = autoStart.dt
-include $(srcdir)/include/cppfile.tmpl
-
-CPPSRC = datatypes.dt.src
-CPPTARGET = datatypes.dt
-include $(srcdir)/include/cppfile.tmpl
-
-CPPSRC = develop.dt.src
-CPPTARGET = develop.dt
-include $(srcdir)/include/cppfile.tmpl
-
-CPPSRC = dt.dt.src
-CPPTARGET = dt.dt
-include $(srcdir)/include/cppfile.tmpl
-
-CPPSRC = dt.softinit.src
-CPPTARGET = dt.softinit
-include $(srcdir)/include/cppfile.tmpl
-
-CPPSRC = dtappman.dt.src
-CPPTARGET = dtappman.dt
-include $(srcdir)/include/cppfile.tmpl
-
-CPPSRC = dtfile.dt.src
-CPPTARGET = dtfile.dt
-include $(srcdir)/include/cppfile.tmpl
-
-CPPSRC = dthelp.dt.src
-CPPTARGET = dthelp.dt
-include $(srcdir)/include/cppfile.tmpl
-
-CPPSRC = dthelpprint.dt.src
-CPPTARGET = dthelpprint.dt
-include $(srcdir)/include/cppfile.tmpl
-
-CPPSRC = dthelptag.dt.src
-CPPTARGET = dthelptag.dt
-include $(srcdir)/include/cppfile.tmpl
-
-CPPSRC = dtims.dt.src
-CPPTARGET = dtims.dt
-include $(srcdir)/include/cppfile.tmpl
-
-CPPSRC = dtinfo.dt.src
-CPPTARGET = dtinfo.dt
-include $(srcdir)/include/cppfile.tmpl
-
-CPPSRC = dtpad.dt.src
-CPPTARGET = dtpad.dt
-include $(srcdir)/include/cppfile.tmpl
-
-CPPSRC = dtscreen.dt.src
-CPPTARGET = dtsreen.dt
-include $(srcdir)/include/cppfile.tmpl
-
-CPPSRC = dtwm.fp.src
-CPPTARGET = dtwm.fp
-include $(srcdir)/include/cppfile.tmpl
-
-CPPSRC = error.ds.src
-CPPTARGET = error.ds
-include $(srcdir)/include/cppfile.tmpl
-
-if HPUX
-CPPSRC = hp.dt.src
-CPPTARGET = hp.dt
-include $(srcdir)/include/cppfile.tmpl
-endif
+LOCAL_CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
+       -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) -DKORNSHELL=$(KSH) \
+       -DDTKORNSHELL=$(CDE_INSTALLATION_TOP)/bin/dtksh
 
-if AIX
-CPPSRC = ibm.dt.src
-CPPTARGET = ibm.dt
-include $(srcdir)/include/cppfile.tmpl
+if SOLARIS
+LOCAL_CPP_DEFINES += -D__sun
 endif
 
-CPPSRC = miscActions.dt.src
-CPPTARGET = miscActions.dt
-include $(srcdir)/include/cppfile.tmpl
+BUILT_SOURCES = autoStart.dt compat.dt datatypes.dt develop.dt         \
+       dtappman.dt dt.dt dtfile.dt dthelp.dt dthelpprint.dt            \
+       dthelptag.dt dtims.dt dtinfo.dt dtpad.dt dtscreen.dt            \
+       dt.softinit dtwm.fp error.ds hp.dt ibm.dt IconBrowse.dt         \
+       laserrom.dt miscActions.dt miscImages.dt print.dt               \
+       printerNN.dt sunOW.dt unsupported.dt user-prefs.dt uxstd.dt     \
+       xclients.dt
+
+CLEANFILES = $(BUILT_SOURCES)
+
+# Use -C to GENCPP to preserve /* and */ sequences
+
+autoStart.dt: autoStart.dt.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+compat.dt: compat.dt.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+datatypes.dt: datatypes.dt.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+develop.dt: develop.dt.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+dtappman.dt: dtappman.dt.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+dt.dt: dt.dt.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+dtfile.dt: dtfile.dt.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+dthelp.dt: dthelp.dt.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+dthelpprint.dt: dthelpprint.dt.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+dthelptag.dt: dthelptag.dt.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+dtims.dt: dtims.dt.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+dtinfo.dt: dtinfo.dt.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+dtpad.dt: dtpad.dt.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+dtscreen.dt: dtscreen.dt.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+dt.softinit: dt.softinit.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+dtwm.fp: dtwm.fp.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+error.ds: error.ds.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+hp.dt: hp.dt.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+ibm.dt: ibm.dt.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+IconBrowse.dt: IconBrowse.dt.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+laserrom.dt: laserrom.dt.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+miscActions.dt: miscActions.dt.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+miscImages.dt: miscImages.dt.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+print.dt: print.dt.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+printerNN.dt: printerNN.dt.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+sunOW.dt: sunOW.dt.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
 
-CPPSRC = miscImages.dt.src
-CPPTARGET = miscImages.dt
-include $(srcdir)/include/cppfile.tmpl
+unsupported.dt: unsupported.dt.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
 
-CPPSRC = print.dt.src
-CPPTARGET = print.dt
-include $(srcdir)/include/cppfile.tmpl
+user-prefs.dt: user-prefs.dt.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
 
-CPPSRC = user-prefs.dt.src
-CPPTARGET = user-prefs.dt
-include $(srcdir)/include/cppfile.tmpl
+uxstd.dt: uxstd.dt.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
 
-CPPSRC = uxstd.dt.src
-CPPTARGET = uxstd.dt
-include $(srcdir)/include/cppfile.tmpl
+xclients.dt: xclients.dt.src
+       $(RM) $@
+       $(GENCPP) -P -C -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
 
-CPPSRC = xclients.dt.src
-CPPTARGET = xclients.dt
-include $(srcdir)/include/cppfile.tmpl
Unnamed repository; edit this file 'description' to name the repository.