1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00

dtsearchpath: make it build

This commit is contained in:
Jon Trulson 2019-11-20 16:09:46 -07:00
parent 444aa700c0
commit e831b06896
7 changed files with 46 additions and 50 deletions

3
cde/.gitignore vendored
View file

@ -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

View file

@ -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
])

View file

@ -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 ########################

View file

@ -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)
AM_CPPFLAGS = -DCDE_INSTALLATION_TOP=${prefix} \
-DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
-DKORNSHELL=$(KSH)
LOCAL_CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
-DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
-DCDE_LOGFILES_TOP=$(CDE_LOGFILES_TOP) -DKORNSHELL=$(KSH)
CPPSRC = 0010.dtpaths.src
CPPTARGET = 0010.dtpaths
include $(srcdir)/include/cppfile.tmpl
0010.dtpaths: 0010.dtpaths.src
$(RM) $@
$(GENCPP) -P -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
0030.dttmpdir: 0030.dttmpdir.src
$(RM) $@
$(GENCPP) -P -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
CPPSRC = 0030.dttmpdir.src
CPPTARGET = 0030.dttmpdir
include $(srcdir)/include/cppfile.tmpl

View file

@ -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

View file

@ -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 $(DTCLIENTLIBS) $(XTOOLLIB)
dtsearchpath_LDADD = ../libCliSrv/libCliSrv.a $(LIBTT) $(XTOOLLIB) ${X_LIB}
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

View file

@ -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