Change "if SUN" conditionals in remaining Makefile.am files to "if SOLARIS"

2025-02-15 04:32:24 +00:00 · 2019-10-28 18:53:22 -06:00 · 2019-10-28 18:53:22 -06:00 · 730da7747c
commit 730da7747c
parent 24171c3194
36 changed files with 41 additions and 41 deletions
--- 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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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