dtsearchpath: make it build

diff --git a/cde/.gitignore b/cde/.gitignore
index f7a761779e81dc16ea3e57fa2deea346c2d4f7a0..eddc0bfff8be550ad15bc66d85a5d671b4a84a08 100644 (file)
--- a/cde/.gitignore
+++ b/cde/.gitignore
@@ -1172,7 +1172,8 @@ programs/dtprintinfo/libUI/Test
 # programs/dtsearchpath
 programs/dtsearchpath/0010.dtpaths
 programs/dtsearchpath/0030.dttmpdir
-programs/dtsearchpath/dtappg/dtappg
+programs/dtsearchpath/dtappg/dtappgather
+programs/dtsearchpath/dtsp/dtsearchpath
 
 # programs/dtsession
 programs/dtsession/dtsession.msg

diff --git a/cde/configure.ac b/cde/configure.ac
index 613088b283f408ded37c9178de63ef3ff31fe237..a50f36914e9324c027985384e9c497026a7ae05c 100644 (file)
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -415,6 +415,10 @@ programs/dtcm/libDtCmP/Makefile
 programs/dtcm/server/Makefile
 programs/dtcm/dtcm/Makefile
 
+programs/dtsearchpath/Makefile
+programs/dtsearchpath/libCliSrv/Makefile
+programs/dtsearchpath/dtsp/Makefile
+programs/dtsearchpath/dtappg/Makefile
 
 ])
 

diff --git a/cde/programs/dtsearchpath/0030.dttmpdir.src b/cde/programs/dtsearchpath/0030.dttmpdir.src
index f8b99cd97b631048ea52e33f5f2e8d26afba7d04..db05cb191ebd27a0740ab8dea38fd9c100255709 100644 (file)
--- a/cde/programs/dtsearchpath/0030.dttmpdir.src
+++ b/cde/programs/dtsearchpath/0030.dttmpdir.src
@@ -18,8 +18,8 @@ XCOMM ##  Invoked by:        CDE_INSTALLATION_TOP/bin/Xsession
 XCOMM ##
 XCOMM ##  Product:           @(#)Common Desktop Environment 1.0          
 XCOMM ##
-XCOMM ##  Note:              Creates the /var/dt directory if one doesn't exist.
-XCOMM ##                     However, root privilege may be required.  If /var/dt
+XCOMM ##  Note:              Creates the CDE_LOGFILES_TOP directory if one doesn't exist.
+XCOMM ##                     However, root privilege may be required.  If CDE_LOGFILES_TOP
 XCOMM ##                     disappears, then logging in as root should restore it.
 XCOMM ##
 XCOMM ##  $TOG: 0030.dttmpdir.src /main/7 1997/04/21 12:08:15 samborn $
@@ -61,28 +61,28 @@ then
 fi
 
 XCOMM 
-XCOMM  Create the /var/dt subdirectory, if one doesn't exist
+XCOMM  Create the CDE_LOGFILES_TOP subdirectory, if one doesn't exist
 XCOMM 
-if [[ ! -d /var/dt ]]
+if [[ ! -d CDE_LOGFILES_TOP ]]
 then
         HASH
        HASH  This step requires root privilege
        HASH
-       mkdir -p /var/dt >/dev/null 2>/dev/null
-       chmod 755 /var/dt >/dev/null 2>/dev/null
-       chgrp bin /var/dt >/dev/null 2>/dev/null
-       chown bin /var/dt >/dev/null 2>/dev/null
+       mkdir -p CDE_LOGFILES_TOP >/dev/null 2>/dev/null
+       chmod 755 CDE_LOGFILES_TOP >/dev/null 2>/dev/null
+       chgrp bin CDE_LOGFILES_TOP >/dev/null 2>/dev/null
+       chown bin CDE_LOGFILES_TOP >/dev/null 2>/dev/null
 fi
 
-if [ ! -d /var/dt/tmp ]
+if [ ! -d CDE_LOGFILES_TOP/tmp ]
 then
        HASH
        HASH  This step requires root privilege
        HASH
-       mkdir -p /var/dt/tmp >/dev/null 2>/dev/null
-       chmod 755 /var/dt/tmp >/dev/null 2>/dev/null
-       chgrp bin /var/dt/tmp >/dev/null 2>/dev/null
-       chown bin /var/dt/tmp >/dev/null 2>/dev/null
+       mkdir -p CDE_LOGFILES_TOP/tmp >/dev/null 2>/dev/null
+       chmod 755 CDE_LOGFILES_TOP/tmp >/dev/null 2>/dev/null
+       chgrp bin CDE_LOGFILES_TOP/tmp >/dev/null 2>/dev/null
+       chown bin CDE_LOGFILES_TOP/tmp >/dev/null 2>/dev/null
 fi
 
 XCOMM #########################         eof       ########################

diff --git a/cde/programs/dtsearchpath/Makefile.am b/cde/programs/dtsearchpath/Makefile.am
index 55d774805804788a0ad11d056abc5de56b4a4790..7704c8a9bb8a203f57c161b62107bd2278d52408 100644 (file)
--- a/cde/programs/dtsearchpath/Makefile.am
+++ b/cde/programs/dtsearchpath/Makefile.am
@@ -1,19 +1,19 @@
-xsessiondir = ${prefix}/config/Xsession.d
-
 MAINTAINERCLEANFILES = Makefile.in
 
 SUBDIRS = libCliSrv dtsp dtappg
 
-dist_xsession_SCRIPTS
+BUILT_SOURCES = 0010.dtpaths 0030.dttmpdir
+CLEANFILES = $(BUILT_SOURCES)
+
+LOCAL_CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP)     \
+       -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP)                \
+       -DCDE_LOGFILES_TOP=$(CDE_LOGFILES_TOP) -DKORNSHELL=$(KSH)
 
-AM_CPPFLAGS = -DCDE_INSTALLATION_TOP=${prefix} \
-              -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
-              -DKORNSHELL=$(KSH)
+0010.dtpaths: 0010.dtpaths.src
+       $(RM) $@
+       $(GENCPP) -P -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
 
-CPPSRC = 0010.dtpaths.src
-CPPTARGET = 0010.dtpaths
-include $(srcdir)/include/cppfile.tmpl
+0030.dttmpdir: 0030.dttmpdir.src
+       $(RM) $@
+       $(GENCPP) -P -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
 
-CPPSRC = 0030.dttmpdir.src
-CPPTARGET = 0030.dttmpdir
-include $(srcdir)/include/cppfile.tmpl

diff --git a/cde/programs/dtsearchpath/dtappg/Makefile.am b/cde/programs/dtsearchpath/dtappg/Makefile.am
index bd78cf6d0d0c284e244bfa6670175aeef31b1008..77840ff4780868e961a20fd037c544424d668255 100644 (file)
--- a/cde/programs/dtsearchpath/dtappg/Makefile.am
+++ b/cde/programs/dtsearchpath/dtappg/Makefile.am
@@ -2,16 +2,12 @@ MAINTAINERCLEANFILES = Makefile.in
 
 bin_PROGRAMS = dtappgather
 
-dtappgather_CXXFLAGS = -I../libCliSrv
+dtappgather_CXXFLAGS = -I../libCliSrv $(DT_INCDIR)
 
-if AIX
-dtappgather_CXXFLAGS += -DIOSTREAMSWORKS
-endif
-
-dtappgather_LDADD = ../libCliSrv/libCliSrv.a $(LIBTT) $(XTOOLLIB) ${X_LIB}
+dtappgather_LDADD = ../libCliSrv/libCliSrv.a $(DTCLIENTLIBS) $(XTOOLLIB)
 
 if SOLARIS
 dtappgather_LDADD += -ldl -lintl
 endif
 
-dtappgather_SOURCES = Options.C dtappgather.C
+dtappgather_SOURCES = Options.C dtappgather.C dtappgather.h Options.h

diff --git a/cde/programs/dtsearchpath/dtsp/Makefile.am b/cde/programs/dtsearchpath/dtsp/Makefile.am
index 94fc1e9b5abf86b97ba00a67fed6a9ce7bfb5c8b..2cb891438cba233877d400f5d5c2b3feaaf2f850 100644 (file)
--- a/cde/programs/dtsearchpath/dtsp/Makefile.am
+++ b/cde/programs/dtsearchpath/dtsp/Makefile.am
@@ -2,18 +2,16 @@ MAINTAINERCLEANFILES = Makefile.in
 
 bin_PROGRAMS = dtsearchpath
 
-dtsearchpath_CFLAGS = -I../libCliSrv $(TIRPCINC)
+dtsearchpath_CPPFLAGS = -I../libCliSrv $(DT_INCDIR) $(TIRPCINC)
 
 if SOLARIS
-dtsearchpath_CFLAGS += -DIOSTREAMSWORKS
+dtsearchpath_CPPFLAGS += -DIOSTREAMSWORKS
 endif
 
-if AIX
-dtsearchpath_CFLAGS += -DIOSTREAMSWORKS
-endif
-
-dtsearchpath_LDADD = ../libCliSrv/libCliSrv.a $(LIBTT) $(XTOOLLIB) ${X_LIB}
+dtsearchpath_LDADD = ../libCliSrv/libCliSrv.a $(DTCLIENTLIBS) $(XTOOLLIB)
 
-dtsearchpath_SOURCES = AppSearchPath.C DbSearchPath.C HelpSearchPath.C \
-                      IconSearchPath.C InfoLibSearchPath.C ManSearchPath.C \
-                      Options.C SearchPath.C dtsearchpath.C
+dtsearchpath_SOURCES = AppSearchPath.C DbSearchPath.C                  \
+                      HelpSearchPath.C IconSearchPath.C                \
+                      InfoLibSearchPath.C ManSearchPath.C Options.C    \
+                      SearchPath.C dtsearchpath.C Options.h            \
+                      SearchPath.h

diff --git a/cde/programs/dtsearchpath/libCliSrv/Makefile.am b/cde/programs/dtsearchpath/libCliSrv/Makefile.am
index bdc3840c821f0113bf4535f21a983790f8b761f4..f4b1a5439a9937b90f79930378b8f736c4eb4a1f 100644 (file)
--- a/cde/programs/dtsearchpath/libCliSrv/Makefile.am
+++ b/cde/programs/dtsearchpath/libCliSrv/Makefile.am
@@ -2,15 +2,12 @@ MAINTAINERCLEANFILES = Makefile.in
 
 noinst_LIBRARIES = libCliSrv.a
 
-libCliSrv_a_CXXFLAGS = $(TIRPCINC)
+libCliSrv_a_CXXFLAGS = $(DT_INCDIR) $(TIRPCINC)
 
 if SOLARIS
 libCliSrv_a_CXXFLAGS += -DIOSTREAMSWORKS
-libCliSrv_a_LDADD = -ldl -lintl -Bstatic -Bdynamic -lm -lc -ladm -Bstatic
+libCliSrv_a_LIBADD = -ldl -lintl -lc -ladm
 endif
 
-if AIX
-libCliSrv_a_CXXFLAGS += -DIOSTREAMSWORKS
-endif
-
-libCliSrv_a_SOURCES = DirIterator.C Environ.C TTFile.C UnixEnv.C cstring.C
+libCliSrv_a_SOURCES = DirIterator.C Environ.C TTFile.C UnixEnv.C       \
+       cstring.C cstring.h DirIterator.h Environ.h TTFile.h