1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00

configure: add programs/ dthelp, dsdm, dtmail, dtpad, and dtfile

At this stage, these certainly won't actually build yet.

Just fix up the relevent Makefile.am files so that autogen does not
emit errors and warnings for them.

Removed AIX/HPUX support in Makefile.am files.  No point in
propogating that stuff when we've already removed much of that
unmaintained code from the codebase.

Commented out all of the Sun Pro stuff.  Someone whos using that will
need to go through and fix it.  This is mostly in dtmail and dthelp.

In fact, someone who does Solaris in general will need to go through
this stuff.

Next up, we'll replace any remaining 'if SUN' conditionals with 'if
SOLARIS' which is a more appropriate name and was already defined in
configure.ac.

Then we'll see about getting these new directories building.
This commit is contained in:
Jon Trulson 2019-10-28 18:39:21 -06:00
parent 4b8a65e884
commit 24171c3194
15 changed files with 130 additions and 163 deletions

View file

@ -1,7 +1,7 @@
AC_INIT([cde-desktop], [2.3.1], [jon@radscan.com])
AC_CONFIG_HEADERS([include/autotools_config.h])
AC_CONFIG_MACRO_DIRS([m4])
AM_INIT_AUTOMAKE([foreign])
AM_INIT_AUTOMAKE([foreign subdir-objects])
AC_PREFIX_DEFAULT(/usr/dt)
@ -314,6 +314,34 @@ lib/DtMrm/Makefile
lib/csa/Makefile
programs/Makefile
programs/dthelp/Makefile
programs/dthelp/dthelpgen/Makefile
programs/dthelp/dthelpprint/Makefile
programs/dthelp/parser/pass1/helptag/Makefile
programs/dthelp/parser/pass1/Makefile
programs/dthelp/parser/pass1/eltdef/Makefile
programs/dthelp/parser/pass1/build/Makefile
programs/dthelp/parser/Makefile
programs/dthelp/parser/canon1/Makefile
programs/dthelp/parser/pass2/Makefile
programs/dthelp/dthelpview/Makefile
programs/dsdm/Makefile
programs/dtmail/Makefile
programs/dtmail/dtmail/Makefile
programs/dtmail/MotifApp/Makefile
programs/dtmail/dtmailpr/Makefile
programs/dtmail/libDtMail/Makefile
programs/dtmail/libDtMail/RFC/Makefile
programs/dtmail/libDtMail/Common/Makefile
programs/dtpad/Makefile
programs/dtfile/Makefile
programs/dtfile/dtcopy/Makefile
])
AC_OUTPUT

View file

@ -1,8 +1,8 @@
bin_PROGAMS = dsdm
bin_PROGRAMS = dsdm
dsdm_LDADD = ${X_LIBS}
if SUN
if SOLARIS
dsdm_LDADD += -ldl
endif

View file

@ -4,6 +4,8 @@ SUBDIRS = dtcopy
bin_PROGRAMS = dtfile
BUILT_SOURCES = dtfile.config dtfile_error
dist_config_DATA = dtfile.config
dist_bin_SCRIPTS = dtfile_error
@ -25,8 +27,8 @@ if LINUX
dtfile_CPPFLAGS += -DFILE_MAP_OPTIMIZE
endif
if SUN
dtfile_CFLAGS += -xF
if SOLARIS
dtfile_CFLAGS = -xF
dtfile_LDADD += -lintl -lresolv
endif
@ -40,10 +42,10 @@ dtfile_SOURCES = ChangeDir.c ChangeDirP.c Command.c Common.c \
Prefs.c PrefsP.c SharedMsgs.c SharedProcs.c \
ToolTalk.c Trash.c Utils.c fsDialog.c
CPPSRC = dtfile.config.cpp
CPPTARGET = dtfile.config
include $(srcdir)/include/cppfile.tmpl
dtfile.config: dtfile.config.cpp
$(RM) dtfile.config
$(CPP) -P -DXCOMM=# $(AM_CPPFLAGS) dtfile.config.cpp -o dtfile.config
CPPSRC = dtfile_error
CPPTARGET = dtfile_error
include $(srcdir)/include/cppfile.tmpl
dtfile_error: dtfile_error.cpp
$(RM) dtfile_error
$(CPP) -P -DXCOMM=# $(AM_CPPFLAGS) dtfile_error.cpp -o dtfile_error

View file

@ -4,7 +4,7 @@ bin_PROGRAMS = dtfile_copy
dtfile_copy_CFLAGS = -DSHAPE
if SUN
if SOLARIS
dtfile_copy_CFLAGS += -xF
endif

View file

@ -1,4 +1,8 @@
bin_PROGRAM = dthelpgen dthelpgen.dtsh
MAINTAINERCLEANFILES = Makefile.in
bin_PROGRAMS = dthelpgen
bin_SCRIPTS = dthelpgen.dtsh
dthelpgen_CPPFLAGS = -I.. -DCDE_INSTALLATION_TOP=\"${prefix}\" \
-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"

View file

@ -5,7 +5,7 @@ dthelpprint_CPPFLAGS = -I.. -DCDE_CONFIGURATION_TOP='"${prefix}"' \
dthelpprint_LDADD = $(LIBSVC) $(LIBTT) $(LIBHELP) $(XTOOLLIB) ${X_LIBS}
if SUN
if SOLARIS
dthelpprint_LDADD += -lw -ldl -lgen -lm
endif

View file

@ -20,10 +20,10 @@ build_CFLAGS = -I$(HELPUTILSRC)
build_LDADD = -l$(HELPUTILLIB)
if HPUX
build_LDADD += -Wl,-a archive
build_LDFLAGS = -Wl,-a archive
endif
if SUN
if SOLARIS
.NO_PARALLEL:
endif

View file

@ -20,10 +20,10 @@ HELPTSSFILE = $(HELPTAGSRC)/htag.tss
eltdef_LDADD = -l$(HELPUTILLIB)
if HPUX
eltdef += -Wl,-a archive
eltdef_LDFLAGS = -Wl,-a archive
endif
if SUN
if SOLARIS
.NO_PARALLEL:
endif

View file

@ -6,8 +6,6 @@ ARCCMD = arc u
UNARCCMD = arc x
ARCDELCMD = arc d
.SUFFIXES : .e .arc .c .h
HELPTAG = ..
HELPTAGSRC = $(HELPTAG)/helptag
HELPPARSERSRC = $(HELPTAG)/parser
@ -21,12 +19,12 @@ HELPTSSFILE = $(HELPTAGSRC)/htag.tss
XLATESRC = $(DTHELPSRC)
XLATEHDRS = $(XLATESRC)/XlationSvc.h $(XLATESRC)/LocaleXlate.h
XLATESRCS = ${srcdir}/lib/DtSvc/DtUtil2/XlationSvc.c \
${srcdir}/lib/DtSvc/DtUtil2/LocaleXlate.c
XLATESRCS = ${top_srcdir}/lib/DtSvc/DtUtil2/XlationSvc.c \
${top_srcdir}/lib/DtSvc/DtUtil2/LocaleXlate.c
ELTHDRS = $(HELPUTILSRC)/entdef.h $(HELPUTILSRC)/entext.h
XCOMM PARSEHDRS are header files used by many parser routines
# PARSEHDRS are header files used by many parser routines
PARSEHDRS = $(HELPUTILSRC)/basic.h $(HELPUTILSRC)/trie.h \
$(HELPUTILSRC)/common.h $(HELPUTILSRC)/dtddef.h \
$(HELPUTILSRC)/dtdext.h $(HELPUTILSRC)/sparse.h \
@ -45,17 +43,17 @@ dthelp_htag1_CFLAGS = -I$(HELPUTILSRC) -I$(HELPPARSERSRC) -I$(HELPELTDEFSRC) \
dthelp_htag1_LDADD = $(HELPUTILLIB)
if HPUX
dthelp_htag1_LDADD += -Wl,-a archive
dthelp_htag1_LDFLAGS = -Wl,-a archive
endif
if SUN
if SOLARIS
dthelp_htag1_LDADD += -lm -ldl -lgen
endif
dthelp_htag1_LDADD += custom.c default.c help.c make.c option.c out.c \
dthelp_htag1_SOURCES = custom.c default.c help.c make.c option.c out.c \
special.c xref.c $(XLATESRCS)
dthelp_htag1: $(HELPPARSERSRC)/parser
dthelp_htag1$(EXEEXT): $(HELPPARSERSRC)/parser
$(RM) dthelp_htag1
$(CP) $(HELPPARSERSRC)/parser dthelp_htag1
@ -67,8 +65,3 @@ arcappl archptag :
unarcappl unarchptag :
$(UNARCCMD) hptag.arc
tags ::
etags -t *.c *.h *.if
etags ::
etags -t *.c *.h *.if

View file

@ -4,35 +4,21 @@ noinst_LIBRARIES = libMotifApp.a
libMotifApp_a_CXXFLAGS = -I../include/MotifApp -I../include -I../include/utils \
$(TIRPCINC)
if SUN
if USE_SPRO_V3
libMotifApp_a_CXXFLAGS += -noex -xO0 -USPRO_V2
if DEBUGTREE
libMotifApp_a_CXXFLAGS += -xsb
endif
endif
# FIXME - some of these aren't set and sould be by configure.ac
#if SOLARIS
libMotifApp_a_CXXFLAGS += -DMMAP_NORESERVE -DSPRO_V2
#if USE_SPRO_V3
#libMotifApp_a_CXXFLAGS += -noex -xO0 -USPRO_V2
#endif
if I386
libMotifApp_a_CXXFLAGS += -DBIG_ENDIAN
endif
#if DEBUGTREE
#libMotifApp_a_CXXFLAGS += -xsb
#endif
#
#libMotifApp_a_CXXFLAGS += -DMMAP_NORESERVE -DSPRO_V2
endif
if HPUX
libMotifApp_a_CXXFLAGS += -DUSE_SOCKSTREAM -DBIG_ENDIAN -DDO_ANONYMOUS_MAP \
-DNEED_MMAP_WRAPPER -DSENDMAIL_LOCKS +p \
-DMAILGROUP_REQUIRED -DMAIL_SPOOL_PATH=\"/var/mail/%s\"
endif
if AIX
libMotifApp_a_CXXFLAGS += -DI_HAVE_NO_BOOL -DI_HAVE_SELECT_H -DBIG_ENDIAN \
-DSTRCASECMP_NOT_DEFINED -DDO_ANONYMOUS_MAP \
-DSENDMAIL_LOCKS -DMAILGROUP_REQUIRED \
-DMAIL_SPOOL_PATH=\"/var/spool/mail/%s\"
endif
#endif
libMotifApp_a_SOURCES = Application.C AskFirstCmd.C \
BasicComponent.C BusyPixmap.C \
@ -51,8 +37,8 @@ libMotifApp_a_SOURCES = Application.C AskFirstCmd.C \
UndoCmd.C WarnNoUndoCmd.C \
WorkingDialogManager.C
if SUN
clean::
if SOLARIS
clean-local:
$(RM) -r .sb
$(RM) .make.state*
endif

View file

@ -9,31 +9,31 @@ dtmail_CXXFLAGS = -I../include -I../include/MotifApp -I../include/utils \
dtmail_LDADD = ../libDtMail/libDtMail.a ../MotifApp/libMotifApp.a
if SUN
dtmail_LDADD += -lw
if SUNPRODIR
SUNPRO_DIR = SUNPRODIR
else
SUNPRO_DIR = /opt/SUNWspro
endif
C++LIBPATH = -L$(SUNPRO_DIR)/lib
if USE_SPRO_V3
SPRO_V3_OPTIONS = -noex -USPRO_V2
if DEBUGTREE
SPRO_V3_OPTIONS += -xsb
endif
else
EXTRA_CCOPTIONS += -DSPRO_V2
endif
EXTRA_C++OPTIONS = -xF +w $(SPRO_V3_OPTIONS)
EXTRA_CCOPTIONS = -xF -xstrconst -Xa -v
if USE_EDITRES
EXTRA_LIBRARIES = $(XMULIB) ExtraLibraries
endif
endif
# FIXME solaris....
#if SOLARIS
#dtmail_LDFLAGS = -lw
#if SUNPRODIR
#SUNPRO_DIR = SUNPRODIR
#else
#SUNPRO_DIR = /opt/SUNWspro
#endif
#C++LIBPATH = -L$(SUNPRO_DIR)/lib
#
#if USE_SPRO_V3
#SPRO_V3_OPTIONS = -noex -USPRO_V2
#if DEBUGTREE
#3SPRO_V3_OPTIONS += -xsb
#endif
#else
#EXTRA_CCOPTIONS += -DSPRO_V2
#endif
#
#EXTRA_C++OPTIONS = -xF +w $(SPRO_V3_OPTIONS)
#EXTRA_CCOPTIONS = -xF -xstrconst -Xa -v
#if USE_EDITRES
#EXTRA_LIBRARIES = $(XMULIB) ExtraLibraries
#endif
#endif SOLARIS
dtmail_SOURCES = AliasListUiItem.C AlternatesListUiItem.C \

View file

@ -6,46 +6,34 @@ dtmailpr_CXXFLAGS = -I../include -I../../dtcompat -I../../../. \
-I$(srcdir)/lib $(TIRPCINC)
dtmailpr_LDADD = ../libDtMail/libDtMail.a $(LIBPRINT) $(LIBHELP) $(LIBWIDGET) \
$(LIBSVC) $(LIBTT) -lXm $(XTOOLLIB) ${X_LIBS} -lm
$(LIBSVC) $(LIBTT) -lXm $(XTOOLLIB) ${X_LIBS}
if FREEBSD
dtmailpr_LDADD += -liconv
endif
if AIX
dtmailpr_CXXFLAGS += -DI_HAVE_NO_BOOL -DI_HAVE_SELECT_H \
-DBIG_ENDIAN -DSTRCASECMP_NOT_DEFINED -DDO_ANONYMOUS_MAP \
-DSENDMAIL_LOCKS -DMAILGROUP_REQUIRED \
-DMAIL_SPOOL_PATH=\"/var/spool/mail/%s\"
dtmailpr_LDADD += -ldl -liconv -lgen
endif
if HPUX
dtmailpr_CXXFLAGS += -DBIG_ENDIAN -DDO_ANONYMOUS_MAP -DNEED_MMAP_WRAPPER \
-DSENDMAIL_LOCKS -DMAILGROUP_REQUIRED \
-DMAIL_SPOOL_PATH=\"/var/mail/%s\"
endif
if SUN
if SUNPRODIR
SUNPRO_DIR = /opt/SUNWspro
else
SUNPRO_DIR = SUNPRODIR
endif
if I386
dtmailpr_CXXFLAGS += -DBIG_ENDIAN
endif
if USE_SPRO_V3
dtmailpr_CXXFLAGS += -noex -USPRO_V2
if DEBUGTREE
dtmailpr_CXXFLAGS += -xsb
endif
endif
dtmailpr_CXXFLAGS += -L$(SUNPRO_DIR)/lib -xstrconst -Xc -v -DMMAP_NORESERVE \
-DSPRO_V2 +p +w
dtmailpr_LDADD += -Bstatic -lC -Bdynamic -lc -Bstatic -ldl -lgen -lm -lw \
-lintl -lnsl
endif
# FIXME - solaris
#if SOLARIS
# if SUNPRODIR
# SUNPRO_DIR = /opt/SUNWspro
# else
# SUNPRO_DIR = SUNPRODIR
#endif
#if I386
# JET -- i386 is NOT big endian...
#dtmailpr_CXXFLAGS += -DBIG_ENDIAN
#endif
#if USE_SPRO_V3
#dtmailpr_CXXFLAGS += -noex -USPRO_V2
#if DEBUGTREE
#dtmailpr_CXXFLAGS += -xsb
#endif
#endif
#
#dtmailpr_CXXFLAGS += -L$(SUNPRO_DIR)/lib -xstrconst -Xc -v -DMMAP_NORESERVE \
# -DSPRO_V2 +p +w
#dtmailpr_LDADD += -Bstatic -lC -Bdynamic -lc -Bstatic -ldl -lgen -lm -lw \
# -lintl -lnsl
#endif
dtmailpr_SOURCES = main.C message.C mailbox.C utils.C

View file

@ -5,30 +5,12 @@ noinst_LIBRARIES = libCommon.a
libCommon_a_CXXFLAGS = -I../../include -I../../include/utils -I$(srcdir)/lib \
$(TIRPCINC) -DDL_NOT_DYNAMIC
if COMMENT
These are here in case we want to build as a shared library
DYNLIB_SRCS = DlDynamicLib.C
DYNLIB_DEFINES = -DDL_DYNAMIC_LIBS
endif
if SUN
if SOLARIS
libCommon_a_CXXFLAGS += -DMMAP_NORESERVE -DSPRO_V2
if I386
libCommon_a_CXXFLAGS += -DBIG_ENDIAN
endif
endif
if HPUX
libCommon_a_CXXFLAGS += -DUSE_SOCKSTREAM -DBIG_ENDIAN -DDO_ANONYMOUS_MAP \
-DNEED_MMAP_WRAPPER -DSENDMAIL_LOCKS \
-DMAILGROUP_REQUIRED -DMAIL_SPOOL_PATH=\"/var/mail/%s\"
endif
if AIX
libCommon_a_CXXFLAGS += -DI_HAVE_NO_BOOL -DI_HAVE_SELECT_H -DBIG_ENDIAN \
-DSTRCASECMP_NOT_DEFINED -DDO_ANONYMOUS_MAP \
-DSENDMAIL_LOCKS -DMAILGROUP_REQUIRED \
-DMAIL_SPOOL_PATH=\"/var/spool/mail/%s\"
# FIXME - i386 is NOT big endian...
#if I386
#libCommon_a_CXXFLAGS += -DBIG_ENDIAN
#endif
endif
libCommon_a_SOURCES = APOPServer.C \

View file

@ -5,27 +5,11 @@ noinst_LIBRARIES = libRFC.a
libRFC_a_CXXFLAGS = -I../Common -I../../include -I../../include/utils \
-I$(srcdir)/lib $(TIRPCINC) -DTTLOCK_OFF
if HPUX
libRFC_a_CXXFLAGS += -DUSE_SOCKSTREAM -DBIG_ENDIAN -DDO_ANONYMOUS_MAP \
-DNEED_MMAP_WRAPPER -DSENDMAIL_LOCKS \
-DMAILGROUP_REQUIRED -DMAIL_SPOOL_PATH=\"/var/mail/%s\"
endif
if AIX
libRFC_a_CXXFLAGS += -DI_HAVE_NO_BOOL -DI_HAVE_SELECT_H -DBIG_ENDIAN \
-DSTRCASECMP_NOT_DEFINED -DDO_ANONYMOUS_MAP \
-DSENDMAIL_LOCKS -DMAILGROUP_REQUIRED \
-DMAIL_SPOOL_PATH=\"/var/spool/mail/%s\"
endif
if SUN
if SOLARIS
libRFC_a_CXXFLAGS += -DMMAP_NORESERVE -DSPRO_V2
if I386
libRFC_a_CXXFLAGS += -DBIG_ENDIAN
endif
endif
libRFC_a_SOURCES += AliasExpand.C MIMEBodyPart.C \
libRFC_a_SOURCES = AliasExpand.C MIMEBodyPart.C \
MIMEPartial.C RFCBodyPart.C \
RFCEnvelope.C RFCFormat.C \
RFCMIME.C RFCMailBox.C \

View file

@ -7,9 +7,9 @@ dtpad_CFLAGS = -DDT_LITE -DWORDWRAP -UNLS16 $(TIRPCINC)
dtpad_LDADD = $(LIBPRINT) $(LIBHELP) $(LIBWIDGET) $(LIBSVC) $(LIBTT) -lXm \
$(XTOOLLIB) ${X_LIBS}
if SUN
if SOLARIS
dtpad_CFLAGS += -xF
dtpad_LDADD += -lintl -lresolv
dtpad_LDFLAGS = -lintl -lresolv
endif
dtpad_SOURCES = dtpad.c editCB.c fileCB.c \