From e831b068961d9821383b7cbdd533d9a9fe88c5c5 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Wed, 20 Nov 2019 16:09:46 -0700 Subject: [PATCH] dtsearchpath: make it build --- cde/.gitignore | 3 ++- cde/configure.ac | 4 +++ cde/programs/dtsearchpath/0030.dttmpdir.src | 26 +++++++++---------- cde/programs/dtsearchpath/Makefile.am | 24 ++++++++--------- cde/programs/dtsearchpath/dtappg/Makefile.am | 10 +++---- cde/programs/dtsearchpath/dtsp/Makefile.am | 18 ++++++------- .../dtsearchpath/libCliSrv/Makefile.am | 11 +++----- 7 files changed, 46 insertions(+), 50 deletions(-) diff --git a/cde/.gitignore b/cde/.gitignore index f7a76177..eddc0bff 100644 --- 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 613088b2..a50f3691 100644 --- 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 f8b99cd9..db05cb19 100644 --- 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 55d77480..7704c8a9 100644 --- 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 bd78cf6d..77840ff4 100644 --- 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 94fc1e9b..2cb89143 100644 --- 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 bdc3840c..f4b1a543 100644 --- 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 -- 2.25.1