From 730da7747c0acad77490c43104685b8977526887 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Mon, 28 Oct 2019 18:53:22 -0600 Subject: [PATCH] Change "if SUN" conditionals in remaining Makefile.am files to "if SOLARIS" --- cde/programs/dtaction/Makefile.am | 2 +- cde/programs/dtappbuilder/Makefile.am | 2 +- cde/programs/dtappbuilder/src/Makefile.am | 2 +- cde/programs/dtcalc/Makefile.am | 2 +- cde/programs/dtcm/dtcm/Makefile.am | 2 +- cde/programs/dtcm/libDtCmP/Makefile.am | 2 +- cde/programs/dtcm/server/Makefile.am | 2 +- cde/programs/dtconfig/Makefile.am | 2 +- cde/programs/dtcreate/Makefile.am | 4 ++-- cde/programs/dtdbcache/Makefile.am | 2 +- cde/programs/dtdocbook/instant/Makefile.am | 2 +- cde/programs/dtdspmsg/Makefile.am | 2 +- cde/programs/dthello/Makefile.am | 2 +- cde/programs/dticon/Makefile.am | 4 ++-- cde/programs/dtimsstart/Makefile.am | 2 +- cde/programs/dtinfo/DtMmdb/dti_excs/Makefile.am | 2 +- cde/programs/dtinfo/dtinfo/wwl/src/Makefile.am | 2 +- cde/programs/dtksh/Makefile.am | 4 ++-- cde/programs/dtksh/ksh93/Makefile.am | 2 +- cde/programs/dtlogin/Makefile.am | 2 +- cde/programs/dtpdm/Makefile.am | 2 +- cde/programs/dtpdmd/Makefile.am | 2 +- cde/programs/dtprintinfo/Makefile.am | 4 ++-- cde/programs/dtscreen/Makefile.am | 2 +- cde/programs/dtsearchpath/dtappg/Makefile.am | 2 +- cde/programs/dtsearchpath/dtsp/Makefile.am | 2 +- cde/programs/dtsearchpath/libCliSrv/Makefile.am | 2 +- cde/programs/dtspcd/Makefile.am | 2 +- cde/programs/dtstyle/Makefile.am | 2 +- cde/programs/dtterm/Makefile.am | 4 ++-- cde/programs/dtudcexch/Makefile.am | 2 +- cde/programs/dtwm/Makefile.am | 2 +- cde/programs/fontaliases/Makefile.am | 2 +- cde/programs/localized/C/Makefile.am | 2 +- cde/programs/localized/Makefile.am | 2 +- cde/programs/nsgmls/Makefile.am | 2 +- 36 files changed, 41 insertions(+), 41 deletions(-) diff --git a/cde/programs/dtaction/Makefile.am b/cde/programs/dtaction/Makefile.am index fe63efe18..5e1249ab1 100644 --- a/cde/programs/dtaction/Makefile.am +++ b/cde/programs/dtaction/Makefile.am @@ -14,7 +14,7 @@ if AIX dtaction_LDADD += -liconv endif -if SUN +if SOLARIS dtaction_LDADD += -ldl endif diff --git a/cde/programs/dtappbuilder/Makefile.am b/cde/programs/dtappbuilder/Makefile.am index 501eb30c6..bb371c635 100644 --- a/cde/programs/dtappbuilder/Makefile.am +++ b/cde/programs/dtappbuilder/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -if SUN +if SOLARIS .NO_PARALLEL: endif diff --git a/cde/programs/dtappbuilder/src/Makefile.am b/cde/programs/dtappbuilder/src/Makefile.am index 9723cdd18..d3759c2b1 100644 --- a/cde/programs/dtappbuilder/src/Makefile.am +++ b/cde/programs/dtappbuilder/src/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -if SUN +if SOLARIS .NO_PARALLEL: endif diff --git a/cde/programs/dtcalc/Makefile.am b/cde/programs/dtcalc/Makefile.am index 8f78eb666..19f837d35 100644 --- a/cde/programs/dtcalc/Makefile.am +++ b/cde/programs/dtcalc/Makefile.am @@ -8,7 +8,7 @@ if AIX dtcalc_LDADD += -lmsaa -liconv endif -if SUN +if SOLARIS dtcalc_LDADD += -lintl -ldl endif diff --git a/cde/programs/dtcm/dtcm/Makefile.am b/cde/programs/dtcm/dtcm/Makefile.am index ec7f632b7..21ca884a8 100644 --- a/cde/programs/dtcm/dtcm/Makefile.am +++ b/cde/programs/dtcm/dtcm/Makefile.am @@ -7,7 +7,7 @@ AM_CFLAGS = -I../../../lib/csa -I../libDtCmP -I../../dthelp $(TIRPCINC) AM_LDADD = ../libDtCmP/libDtCmP.a $(LIBCSA) $(LIBPRINT) $(LIBHELP) \ $(LIBWIDGET) $(LIBSVC) $(LIBTT) -lXm $(XTOOLLIB) ${X_LIBS} -if SUN +if SOLARIS AM_CFLAGS += -xstrconst -Xc -v endif diff --git a/cde/programs/dtcm/libDtCmP/Makefile.am b/cde/programs/dtcm/libDtCmP/Makefile.am index 2ebc89b77..13481516f 100644 --- a/cde/programs/dtcm/libDtCmP/Makefile.am +++ b/cde/programs/dtcm/libDtCmP/Makefile.am @@ -7,7 +7,7 @@ noinst_LIBRARIES = libDtCmP.a libDtCmP_a_CFLAGS = -I../../../lib/csa -DRFC_MIME -DLINE_COUNT -DV2 -DOW_I18N \ $(TIRPCINC) -if SUN +if SOLARIS libDtCmP_a_CFLAGS += -xstrconst -Xc -v endif diff --git a/cde/programs/dtcm/server/Makefile.am b/cde/programs/dtcm/server/Makefile.am index 2fe31da95..f15fbec1e 100644 --- a/cde/programs/dtcm/server/Makefile.am +++ b/cde/programs/dtcm/server/Makefile.am @@ -8,7 +8,7 @@ rpc.cmsd_CFLAGS = -I$(CSASRC) -I$(HELPSRC) $(TIRPCINC) rpc.cmsd_LDADD = $(LIBCSA) $(LIBSVC) $(LIBTT) $(LIBWIDGET) $(XTOOLLIB) ${X_LIBS} -if SUN +if SOLARIS rpc.cmsd_CFLAGS += -xstrconst -Xc -v rpc.cmsd_LDADD += -lsocket -lnsl -lintl -lm -ldl endif diff --git a/cde/programs/dtconfig/Makefile.am b/cde/programs/dtconfig/Makefile.am index 3fda8fd94..5d86d4826 100644 --- a/cde/programs/dtconfig/Makefile.am +++ b/cde/programs/dtconfig/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -if SUN +if SOLARIS SUBDIRS = sun endif diff --git a/cde/programs/dtcreate/Makefile.am b/cde/programs/dtcreate/Makefile.am index 608def73c..31889e7ee 100644 --- a/cde/programs/dtcreate/Makefile.am +++ b/cde/programs/dtcreate/Makefile.am @@ -4,7 +4,7 @@ bin_PROGRAMS = dtcreate dtcreate_CPPFLAGS = $(TIRPCINC) -if SUN +if SOLARIS LIBHELP = endif @@ -19,7 +19,7 @@ if AIX dtcreate_LDADD += -liconv endif -if SUN +if SOLARIS dtcreate_LDADD += -ldl endif diff --git a/cde/programs/dtdbcache/Makefile.am b/cde/programs/dtdbcache/Makefile.am index f90031561..888dbd73c 100644 --- a/cde/programs/dtdbcache/Makefile.am +++ b/cde/programs/dtdbcache/Makefile.am @@ -8,7 +8,7 @@ if HPUX dtdbcache_LDADD += +e endif -if SUN +if SOLARIS dtdbcache_LDADD += -ldl -lw -lgen endif diff --git a/cde/programs/dtdocbook/instant/Makefile.am b/cde/programs/dtdocbook/instant/Makefile.am index 932d03a8c..40417d41c 100644 --- a/cde/programs/dtdocbook/instant/Makefile.am +++ b/cde/programs/dtdocbook/instant/Makefile.am @@ -26,7 +26,7 @@ instant_CFLAGS += -I/usr/pkg/include/tcl instant_LDADD += -ltcl86 endif -if SUN +if SOLARIS instant_LDADD += -lsocket -lnsl -lgen endif diff --git a/cde/programs/dtdspmsg/Makefile.am b/cde/programs/dtdspmsg/Makefile.am index 928390211..7fac0a4de 100644 --- a/cde/programs/dtdspmsg/Makefile.am +++ b/cde/programs/dtdspmsg/Makefile.am @@ -8,7 +8,7 @@ endif dtdspmsg_LDADD = -lm -if SUN +if SOLARIS dtdspmsg_LDADD += -ldl -lgen endif diff --git a/cde/programs/dthello/Makefile.am b/cde/programs/dthello/Makefile.am index 27595b1a2..9ddb9c8a6 100644 --- a/cde/programs/dthello/Makefile.am +++ b/cde/programs/dthello/Makefile.am @@ -9,7 +9,7 @@ if HPUX dthello_LDADD = -DHP_COLOR endif -if SUN +if SOLARIS dthello_LDADD = -ldl -lgen endif diff --git a/cde/programs/dticon/Makefile.am b/cde/programs/dticon/Makefile.am index 3e27b0785..eceb6cdef 100644 --- a/cde/programs/dticon/Makefile.am +++ b/cde/programs/dticon/Makefile.am @@ -4,14 +4,14 @@ bin_PROGRAMS = dticon dticon_CFLAGS = -D__TOOLTALK $(TIRPCINC) -if SUN +if SOLARIS LIBHELP = endif dticon_LDADD = ${X_LIBS} -lm $(LIBHELP) $(LIBWIDGET) $(LIBSVC) $(LIBTT) \ $(XTOOLLIB) -lXm -if SUN +if SOLARIS dticon_LDADD += -ldl endif diff --git a/cde/programs/dtimsstart/Makefile.am b/cde/programs/dtimsstart/Makefile.am index 5c63c3717..9479c8ade 100644 --- a/cde/programs/dtimsstart/Makefile.am +++ b/cde/programs/dtimsstart/Makefile.am @@ -12,7 +12,7 @@ dtimsstart_CFLAGS = -DNLS -I../../lib dtimsstart_LDADD = $(LIBHELP) $(LIBSVC) $(LIBTT) -lXm $(XTOOLLIB) ${X_LIBS} -if SUN +if SOLARIS dtimsstart_CFLAGS += -xF endif diff --git a/cde/programs/dtinfo/DtMmdb/dti_excs/Makefile.am b/cde/programs/dtinfo/DtMmdb/dti_excs/Makefile.am index 37fed6af3..fa5deee53 100644 --- a/cde/programs/dtinfo/DtMmdb/dti_excs/Makefile.am +++ b/cde/programs/dtinfo/DtMmdb/dti_excs/Makefile.am @@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libdti_excs.la libdti_excs_la_CXXFLAGS = -DC_API -DCC_VERSION=30 -DCHECK_INITIALIZED -if SUN +if SOLARIS libdti_excs_la_CXXFLAGS += -DHAS_TERMINATE endif diff --git a/cde/programs/dtinfo/dtinfo/wwl/src/Makefile.am b/cde/programs/dtinfo/dtinfo/wwl/src/Makefile.am index 66cd80380..b62994505 100644 --- a/cde/programs/dtinfo/dtinfo/wwl/src/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/wwl/src/Makefile.am @@ -4,7 +4,7 @@ noinst_LIBRARIES = libWWL.a libWWL_a_CXXFLAGS = -I../include -if SUN +if SOLARIS lbWWL_a_CXXFLAGS += -DSYSV -DSVR4 endif diff --git a/cde/programs/dtksh/Makefile.am b/cde/programs/dtksh/Makefile.am index 0ebded48b..1aa9c32e0 100644 --- a/cde/programs/dtksh/Makefile.am +++ b/cde/programs/dtksh/Makefile.am @@ -4,7 +4,7 @@ dist_ksh_SCRIPTS = DtFuncs.dtsh KSH93SRC = ./ksh93 -if SUN +if SOLARIS .NO_PARALLEL: endif @@ -25,7 +25,7 @@ if LINUX dtksh_LDADD += -ldl endif -if SUN +if SOLARIS dtksh_CPPFLAGS += -DDYNLIB endif diff --git a/cde/programs/dtksh/ksh93/Makefile.am b/cde/programs/dtksh/ksh93/Makefile.am index ae10374af..690a722b2 100644 --- a/cde/programs/dtksh/ksh93/Makefile.am +++ b/cde/programs/dtksh/ksh93/Makefile.am @@ -11,7 +11,7 @@ else CCFLAGS = endif -if SUN +if SOLARIS .NO_PARALLEL: endif diff --git a/cde/programs/dtlogin/Makefile.am b/cde/programs/dtlogin/Makefile.am index 5d86e74c8..59a030bea 100644 --- a/cde/programs/dtlogin/Makefile.am +++ b/cde/programs/dtlogin/Makefile.am @@ -28,7 +28,7 @@ XBINDIR = /usr/X11R7/bin AM_LDADD += -lm -lcrypt endif -if SUN +if SOLARIS XBINDIR = /usr/bin/X11 AM_LDADD += -lm -ldl -lgen -lresolv -lbsm -lcmd dtlogin_SOURCES += solaris.c diff --git a/cde/programs/dtpdm/Makefile.am b/cde/programs/dtpdm/Makefile.am index 549b49620..a645c5747 100644 --- a/cde/programs/dtpdm/Makefile.am +++ b/cde/programs/dtpdm/Makefile.am @@ -7,7 +7,7 @@ dtpdm_CFLAGS = -DI18N_MSG -DCDE_INSTALLATION_TOP=\"${prefix}\" dtpdm_LDADD = $(LIBPRINT) $(LIBHELP) $(LIBWIDGET) $(LIBSVC) $(LIBTT) -lXm \ $(XTOOLLIB) ${X_LIBS} -if SUN +if SOLARIS dtpdm_LDADD += -lintl -lm -lgen -ldl -lresolv endif diff --git a/cde/programs/dtpdmd/Makefile.am b/cde/programs/dtpdmd/Makefile.am index 096a94e05..b429788f3 100644 --- a/cde/programs/dtpdmd/Makefile.am +++ b/cde/programs/dtpdmd/Makefile.am @@ -6,7 +6,7 @@ dtpdmd_CFLAGS = -DCDE_INSTALLATION_TOP='"'${prefix}'"' dtpdmd_LDADD = $(XTOOLLIB) ${X_LIBS} -if SUN +if SOLARIS dtpdmd_LDADD += -lm -ldl endif diff --git a/cde/programs/dtprintinfo/Makefile.am b/cde/programs/dtprintinfo/Makefile.am index fb7a177cb..06a9a8b29 100644 --- a/cde/programs/dtprintinfo/Makefile.am +++ b/cde/programs/dtprintinfo/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = util libUI objects UI all:: dtprintinfo_cat.h dtprintinfo_msg.h dtprintinfo.msg -if SUN +if SOLARIS .NO_PARALLEL: endif @@ -15,7 +15,7 @@ dtprintinfo_LDADD = ./UI/libDtPrintinfo.a ./util/libUtil.a \ ./libUI/MotifUI/libMotifUI.a ./objects/PrintObj/libPrintObj.a \ $(LIBHELP) $(LIBWIDGET) $(LIBSVC) $(LIBTT) $(XTOOLLIB) ${X_LIBS} -if SUN +if SOLARIS dtprintinfo_LDADD += -lm -ldl endif diff --git a/cde/programs/dtscreen/Makefile.am b/cde/programs/dtscreen/Makefile.am index 6f4ebc2ed..d06a1fb59 100644 --- a/cde/programs/dtscreen/Makefile.am +++ b/cde/programs/dtscreen/Makefile.am @@ -6,7 +6,7 @@ dist_default_DATA = Dtscreen dtscreen_LDADD = -lm $(SVCLIB) $(LIBTT) $(XTOOLLIB) ${X_LIBS} -if SUN +if SOLARIS dtscreen_LDADD += -ldl -lgen endif diff --git a/cde/programs/dtsearchpath/dtappg/Makefile.am b/cde/programs/dtsearchpath/dtappg/Makefile.am index 32e03212d..bd78cf6d0 100644 --- a/cde/programs/dtsearchpath/dtappg/Makefile.am +++ b/cde/programs/dtsearchpath/dtappg/Makefile.am @@ -10,7 +10,7 @@ endif dtappgather_LDADD = ../libCliSrv/libCliSrv.a $(LIBTT) $(XTOOLLIB) ${X_LIB} -if SUN +if SOLARIS dtappgather_LDADD += -ldl -lintl endif diff --git a/cde/programs/dtsearchpath/dtsp/Makefile.am b/cde/programs/dtsearchpath/dtsp/Makefile.am index 01ae453d4..94fc1e9b5 100644 --- a/cde/programs/dtsearchpath/dtsp/Makefile.am +++ b/cde/programs/dtsearchpath/dtsp/Makefile.am @@ -4,7 +4,7 @@ bin_PROGRAMS = dtsearchpath dtsearchpath_CFLAGS = -I../libCliSrv $(TIRPCINC) -if SUN +if SOLARIS dtsearchpath_CFLAGS += -DIOSTREAMSWORKS endif diff --git a/cde/programs/dtsearchpath/libCliSrv/Makefile.am b/cde/programs/dtsearchpath/libCliSrv/Makefile.am index a11d20b90..bdc3840c8 100644 --- a/cde/programs/dtsearchpath/libCliSrv/Makefile.am +++ b/cde/programs/dtsearchpath/libCliSrv/Makefile.am @@ -4,7 +4,7 @@ noinst_LIBRARIES = libCliSrv.a libCliSrv_a_CXXFLAGS = $(TIRPCINC) -if SUN +if SOLARIS libCliSrv_a_CXXFLAGS += -DIOSTREAMSWORKS libCliSrv_a_LDADD = -ldl -lintl -Bstatic -Bdynamic -lm -lc -ladm -Bstatic endif diff --git a/cde/programs/dtspcd/Makefile.am b/cde/programs/dtspcd/Makefile.am index 31fb10b35..effa03727 100644 --- a/cde/programs/dtspcd/Makefile.am +++ b/cde/programs/dtspcd/Makefile.am @@ -11,7 +11,7 @@ dtspcd_CFLAGS = $(TIRPCINC) -I../dthelp -DCDE_CONFIGURATION_TOP=\"${prefix}\" \ dtspcd_LDADD = $(LIBHELP) $(LIBSVC) $(LIBTT) -lXm $(XTOOLLIB) ${X_LIBS} -lm -if SUN +if SOLARIS dtspcd_LDADD += -ldl -lgen endif diff --git a/cde/programs/dtstyle/Makefile.am b/cde/programs/dtstyle/Makefile.am index dc3bf39a5..532d25f53 100644 --- a/cde/programs/dtstyle/Makefile.am +++ b/cde/programs/dtstyle/Makefile.am @@ -15,7 +15,7 @@ if AIX dtstyle_CFLAGS += -DANSICPP -Aa -D_POSIX_SOURCE endif -if SUN +if SOLARIS EXTRA_SRC = OWsync.c endif diff --git a/cde/programs/dtterm/Makefile.am b/cde/programs/dtterm/Makefile.am index 9f1eeb074..3d2d1d64b 100644 --- a/cde/programs/dtterm/Makefile.am +++ b/cde/programs/dtterm/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -if SUN +if SOLARIS .NO_PARALLEL: endif @@ -14,7 +14,7 @@ if BSD UTILLIB = -lutil endif -if SUN +if SOLARIS LIBHELP = endif diff --git a/cde/programs/dtudcexch/Makefile.am b/cde/programs/dtudcexch/Makefile.am index cb7128b05..4bce8dcc5 100644 --- a/cde/programs/dtudcexch/Makefile.am +++ b/cde/programs/dtudcexch/Makefile.am @@ -10,7 +10,7 @@ dtudcexch_LDADD = $(LIBSVC) $(LIBTT) -lXm $(XTOOLLIB) ${X_LIBS} \ $(FONTEDT_PATH1)/libfuty/liboakfuty.a \ $(FONTEDT_PATH1)/libfal/libfal.a -if SUN +if SOLARIS dtudcexch_LDADD += -ldl -lgen endif diff --git a/cde/programs/dtwm/Makefile.am b/cde/programs/dtwm/Makefile.am index 8de3632a6..675a1449e 100644 --- a/cde/programs/dtwm/Makefile.am +++ b/cde/programs/dtwm/Makefile.am @@ -12,7 +12,7 @@ AM_CPPFLAGS = -DLARGECURSORS -DR2_COMPAT -DOPAQUE -DSHAPE -DUNMAP_ON_RESTART \ AM_LDADD = $(LIBXIN) -lXinerama $(LIBPRINT) $(LIBHELP) $(LIBWIDGET) \ $(LIBSVC) $(LIBTT) -lXm $(XTOOLLIB) ${X_LIBS} -if SUN +if SOLARIS AM_LDADD += -lintl -lresolv endif diff --git a/cde/programs/fontaliases/Makefile.am b/cde/programs/fontaliases/Makefile.am index 897f39fb1..ea7b68d75 100644 --- a/cde/programs/fontaliases/Makefile.am +++ b/cde/programs/fontaliases/Makefile.am @@ -4,7 +4,7 @@ if LINUX SUBDIRS = linux endif -if SUN +if SOLARIS SUBDIRS = sun endif diff --git a/cde/programs/localized/C/Makefile.am b/cde/programs/localized/C/Makefile.am index ffa5ebff3..1772241b4 100644 --- a/cde/programs/localized/C/Makefile.am +++ b/cde/programs/localized/C/Makefile.am @@ -1,4 +1,4 @@ -if SUN +if SOLARIS .NO_PARALLEL: endif diff --git a/cde/programs/localized/Makefile.am b/cde/programs/localized/Makefile.am index 6f6b96bde..eec5271bd 100644 --- a/cde/programs/localized/Makefile.am +++ b/cde/programs/localized/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = util C -if SUN +if SOLARIS .NO_PARALLEL: endif diff --git a/cde/programs/nsgmls/Makefile.am b/cde/programs/nsgmls/Makefile.am index d327f9167..280dff4b7 100644 --- a/cde/programs/nsgmls/Makefile.am +++ b/cde/programs/nsgmls/Makefile.am @@ -13,7 +13,7 @@ nsgmls_CXXFLAGS = -DSP_VOLATILE=volatile -DSP_CONST=const -DSP_ANSI_CLASS_INST \ -DSP_HAVE_LOCALE -DSP_MULTI_BYTE -DSP_MANUAL_INST endif -if SUN +if SOLARIS nsgmls_CXXFLAGS = -DSP_VOLATILE= -DSP_CONST= -DSP_HAVE_LOCALE \ -DSP_MULTI_BYTE -DSP_ANSI_CLASS_INST endif