diff --git a/cde/configure.ac b/cde/configure.ac index fa89b66a1..a617c2914 100644 --- a/cde/configure.ac +++ b/cde/configure.ac @@ -442,12 +442,16 @@ dnl issues XTOOLLIB="" AC_CHECK_LIB(X11, XOpenDisplay, [XTOOLLIB="-lX11"], , [${EXTRA_INCS} ${EXTRA_LIBS}]) +AC_CHECK_LIB(Xext, XextFindDisplay, [XTOOLLIB="-lXext ${XTOOLLIB}"], , + [${EXTRA_INCS} ${EXTRA_LIBS}]) AC_CHECK_LIB(Xau, XauReadAuth, [XTOOLLIB="-lXau ${XTOOLLIB}"], , [${EXTRA_INCS} ${EXTRA_LIBS}]) AC_CHECK_LIB(Xpm, XpmLibraryVersion, [XTOOLLIB="-lXpm ${XTOOLLIB}"], , [${EXTRA_INCS} ${EXTRA_LIBS}]) AC_CHECK_LIB(Xt, XtInitialize, [XTOOLLIB="-lXt ${XTOOLLIB}"], , [${EXTRA_INCS} ${EXTRA_LIBS}]) +AC_CHECK_LIB(Xmu, XmuMakeAtom, [XTOOLLIB="-lXmu ${XTOOLLIB}"], , + [${EXTRA_INCS} ${EXTRA_LIBS}]) AC_CHECK_LIB(ICE, IceCloseConnection, [XTOOLLIB="-lICE ${XTOOLLIB}"], , [${EXTRA_INCS} ${EXTRA_LIBS}]) AC_CHECK_LIB(SM, SmcOpenConnection, [XTOOLLIB="-lSM ${XTOOLLIB}"], , @@ -457,6 +461,11 @@ AC_CHECK_LIB(Xm, XmTextSetString, [XTOOLLIB="-lXm ${XTOOLLIB}"], , XTOOLLIB="${EXTRA_INCS} ${EXTRA_LIBS} ${X_EXTRA_LIBS} ${XTOOLLIB}" AC_SUBST([XTOOLLIB]) +dnl only needed by dtlogin +AC_CHECK_LIB(Xdmcp, XdmcpFlush, [XDMCPLIB="-lXdmcp"], [XDMCPLIB=""], + [${EXTRA_INCS} ${EXTRA_LIBS}]) +AC_SUBST(XDMCPLIB) + dnl iconv AM_ICONV diff --git a/cde/lib/DtPrint/Makefile.am b/cde/lib/DtPrint/Makefile.am index 24f406aa9..fc235965c 100644 --- a/cde/lib/DtPrint/Makefile.am +++ b/cde/lib/DtPrint/Makefile.am @@ -9,9 +9,5 @@ if SOLARIS libDtPrint_la_CFLAGS += -DNO_REGCOMP endif -if HPUX -libDtPrint_la_CFLAGS += -DMESSAGE_CAT -endif - libDtPrint_la_SOURCES = PrintMsgs.c PrintDlgMgr.c PrintOptions.c PrintSetupB.c \ PsubDefProc.c PsubUtil.c diff --git a/cde/lib/DtSearch/raima/Makefile.am b/cde/lib/DtSearch/raima/Makefile.am index ae0884af0..5be3c10e4 100644 --- a/cde/lib/DtSearch/raima/Makefile.am +++ b/cde/lib/DtSearch/raima/Makefile.am @@ -2,10 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LTLIBRARIES = libraima.la -libraima_la_LIBADD = -lc -lm - libraima_la_CFLAGS = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \ - @DT_INCDIR@ -I$(top_srcdir)/include \ + $(DT_INCDIR) -I$(top_srcdir)/include \ -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \ -DNO_TRANS -DUNIX -D_POSIX_SOURCE -DMULTIBYTE @@ -21,10 +19,6 @@ if SOLARIS libraima_la_CFLAGS += -D_XOPEN_SOURCE=500 -DNO_REGCOMP endif -if HPUX -libraima_la_CFLAGS += -DMESSAGE_CAT -endif - libraima_la_SOURCES = alloc.c cmtype.c connect.c \ cotype.c crget.c crread.c crset.c \ diff --git a/cde/lib/DtTerm/TermPrim/Makefile.am b/cde/lib/DtTerm/TermPrim/Makefile.am index 75ee28b63..6ecc554f4 100644 --- a/cde/lib/DtTerm/TermPrim/Makefile.am +++ b/cde/lib/DtTerm/TermPrim/Makefile.am @@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LTLIBRARIES = libTermPrim.la -AM_CPPFLAGS = @DT_INCDIR@ +AM_CPPFLAGS = $(DT_INCDIR) libTermPrim_la_SOURCES = TermPrim.c \ TermPrimAction.c \ @@ -33,10 +33,6 @@ libTermPrim_la_SOURCES = TermPrim.c \ # JET there may be some more missing here... -if AIX -libTermPrim_la_SOURCES += TermPrimGetPty-clone.c -endif - if SOLARIS libTermPrim_la_SOURCES += TermPrimGetPty-svr4.c AM_CPPFLAGS += -DSUN_ARCHITECTURE diff --git a/cde/lib/csa/Makefile.am b/cde/lib/csa/Makefile.am index 458b7cc74..893a8b38b 100644 --- a/cde/lib/csa/Makefile.am +++ b/cde/lib/csa/Makefile.am @@ -5,24 +5,15 @@ MAINTAINERCLEANFILES = Makefile.in lib_LTLIBRARIES = libcsa.la libcsa_la_CFLAGS = -DRFC_MIME -DLINE_COUNT -DV2 -DOW_I18N \ - @CSA_INCDIR@ + $(CSA_INCDIR) -libcsa_la_LIBADD = -lXt $(TIRPCLIB) +libcsa_la_LIBADD = $(XTOOLLIB) $(TIRPCLIB) libcsa_la_LDFLAGS = -version-info 3:0:1 -if SOLARIS -libcsa_la_LDFLAGS += -G -z text -z defs -libcsa_la_CFLAGS += -v -endif - -if HPUX -libcsa_la_CFLAGS += -DHPUX -endif - if LINUX else -libcsa_la_LIBADD += $(LIBSVC) -lXm +libcsa_la_LIBADD += $(LIBSVC) $(XTOOLLIB) endif AM_YFLAGS = -d diff --git a/cde/lib/tt/bin/shell/Makefile.am b/cde/lib/tt/bin/shell/Makefile.am index 37cc642ad..04b2403ca 100644 --- a/cde/lib/tt/bin/shell/Makefile.am +++ b/cde/lib/tt/bin/shell/Makefile.am @@ -7,7 +7,7 @@ bin_PROGRAMS = ttmv ttrm ttcp ttrmdir AM_CXXFLAGS = -I../../lib $(TT_VERSION_DEFINE) -LDADD = @LIBTT@ $(TIRPCLIB) $(XTOOLLIB) +LDADD = $(LIBTT) $(TIRPCLIB) $(XTOOLLIB) if SOLARIS LDADD += -ldl -lintl -lsocket -lnsl diff --git a/cde/lib/tt/bin/ttdbserverd/Makefile.am b/cde/lib/tt/bin/ttdbserverd/Makefile.am index f3fdb882d..976a2a74e 100644 --- a/cde/lib/tt/bin/ttdbserverd/Makefile.am +++ b/cde/lib/tt/bin/ttdbserverd/Makefile.am @@ -8,7 +8,7 @@ bin_PROGRAMS = rpc.ttdbserver rpc_ttdbserver_CXXFLAGS = -I../../slib -I../../lib -I../../mini_isam \ $(TIRPC_DEFINES) $(TT_VERSION_DEFINE) -rpc_ttdbserver_LDADD = @LIBTT@ ${TIRPCLIB} $(X_LIBS) ../../slib/libstt.a \ +rpc_ttdbserver_LDADD = $(LIBTT) ${TIRPCLIB} $(X_LIBS) ../../slib/libstt.a \ ../../mini_isam/libisam.a if LINUX diff --git a/cde/lib/tt/bin/ttsession/Makefile.am b/cde/lib/tt/bin/ttsession/Makefile.am index b60031af9..398d27b30 100644 --- a/cde/lib/tt/bin/ttsession/Makefile.am +++ b/cde/lib/tt/bin/ttsession/Makefile.am @@ -7,7 +7,7 @@ bin_PROGRAMS = ttsession ttsession_CXXFLAGS = -I../../slib -I../../lib $(TT_VERSION_DEFINE) -ttsession_LDADD = @LIBTT@ $(X_LIBS) ../../slib/libstt.a +ttsession_LDADD = $(LIBTT) $(X_LIBS) ../../slib/libstt.a if LINUX ttsession_LDADD += $(TIRPCLIB) $(XTOOLLIB) diff --git a/cde/lib/tt/bin/tttar/Makefile.am b/cde/lib/tt/bin/tttar/Makefile.am index cea7ade71..510810986 100644 --- a/cde/lib/tt/bin/tttar/Makefile.am +++ b/cde/lib/tt/bin/tttar/Makefile.am @@ -8,7 +8,7 @@ bin_PROGRAMS = tttar tttar_CXXFLAGS = -I../../lib $(TT_VERSION_DEFINE) tttar_LDADD = ../../slib/libstt.a ../../mini_isam/libisam.a \ - @LIBTT@ $(TIRPCLIB) $(XTOOLLIB) + $(LIBTT) $(TIRPCLIB) $(XTOOLLIB) if SOLARIS tttar_LDADD += -ldl -lintl -lsocket -lnsl diff --git a/cde/lib/tt/bin/tttrace/Makefile.am b/cde/lib/tt/bin/tttrace/Makefile.am index e04215fbf..c7ae9a4c3 100644 --- a/cde/lib/tt/bin/tttrace/Makefile.am +++ b/cde/lib/tt/bin/tttrace/Makefile.am @@ -4,7 +4,7 @@ bin_PROGRAMS = tttrace tttrace_CXXFLAGS = -I../../lib -tttrace_LDADD = @LIBTT@ $(TIRPCLIB) $(XTOOLLIB) +tttrace_LDADD = $(LIBTT) $(TIRPCLIB) $(XTOOLLIB) if SOLARIS tttrace_LDADD += -ldl -lintl -lsocket -lnsl diff --git a/cde/lib/tt/lib/Makefile.am b/cde/lib/tt/lib/Makefile.am index b2d0b353d..0629e2d27 100644 --- a/cde/lib/tt/lib/Makefile.am +++ b/cde/lib/tt/lib/Makefile.am @@ -2,14 +2,14 @@ MAINTAINERCLEANFILES = Makefile.in SUBDIRS = api db mp util tttk - lib_LTLIBRARIES = libtt.la -if AIX -libtt_la_SOURCES = realpath.c -else +# if you are on a system that does not support realpath(), you may need to +# include realpath.c in the _SOURCES +# +#libtt_la_SOURCES = realpath.c + libtt_la_SOURCES = -endif # fake things so libtool creates this as a C++ library nodist_EXTRA_libtt_la_SOURCES = dummy.cxx diff --git a/cde/programs/dtappbuilder/Makefile.am b/cde/programs/dtappbuilder/Makefile.am index bb371c635..7bc72afdd 100644 --- a/cde/programs/dtappbuilder/Makefile.am +++ b/cde/programs/dtappbuilder/Makefile.am @@ -1,7 +1,3 @@ MAINTAINERCLEANFILES = Makefile.in -if SOLARIS -.NO_PARALLEL: -endif - SUBDIRS = src diff --git a/cde/programs/dtappbuilder/src/Makefile.am b/cde/programs/dtappbuilder/src/Makefile.am index c84f01b69..d10daf263 100644 --- a/cde/programs/dtappbuilder/src/Makefile.am +++ b/cde/programs/dtappbuilder/src/Makefile.am @@ -1,7 +1,3 @@ MAINTAINERCLEANFILES = Makefile.in -if SOLARIS -.NO_PARALLEL: -endif - SUBDIRS = libAButil libABobj libABobjXm libABil abmf ab diff --git a/cde/programs/dtappbuilder/src/ab/Makefile.am b/cde/programs/dtappbuilder/src/ab/Makefile.am index bd279d40f..0d43ea0cf 100644 --- a/cde/programs/dtappbuilder/src/ab/Makefile.am +++ b/cde/programs/dtappbuilder/src/ab/Makefile.am @@ -47,7 +47,7 @@ SOURCES.msg = \ dtbuilder_LDADD = ../libABil/libABil.a ../libABobjXm/libABobjXm.a \ ../libABobj/libABobj.a ../libAButil/libAButil.a \ $(LIBWIDGET) $(LIBTERM) $(LIBHELP) $(LIBSVC) \ - $(LIBTT) $(LIBXIN) -lUil $(MRESOURCELIB) -lXm $(XTOOLLIB) ${X_LIB} \ + $(LIBTT) $(LIBXIN) -lUil $(MRESOURCELIB) $(XTOOLLIB) ${X_LIB} \ $(UTILLIB) -lm dtbuilder_CFLAGS = -DPIXMAP_WORKAROUND $(ABINCLUDES) diff --git a/cde/programs/dtappbuilder/src/abmf/Makefile.am b/cde/programs/dtappbuilder/src/abmf/Makefile.am index f039c5233..4578520f1 100644 --- a/cde/programs/dtappbuilder/src/abmf/Makefile.am +++ b/cde/programs/dtappbuilder/src/abmf/Makefile.am @@ -4,14 +4,6 @@ ABINCLUDES = ../include EXTRA_DEFINES = -D_POSIX_SOURCE=1 -if HPUX -CCOPTIONS = -Ae -endif - -if AIX -CCOPTIONS = -qnoro -endif - if BSD UTILLIB = -lutil endif @@ -30,11 +22,11 @@ noinst_DATA = dtcodegen.cat dtcodegen_CFLAGS = $(EXTRA_DEFINES) -I$(ABINCLUDES) -I../libABil -dtcodegen_LDADD = -lXext ../libABil/libABil.a \ +dtcodegen_LDADD = ../libABil/libABil.a \ ../libABobjXm/libABobjXm.a \ ../libABobj/libABobj.a ../libAButil/libAButil.a \ $(LIBTERM) $(LIBSVC) $(LIBTT) $(LIBHELP) $(LIBXIN) \ - $(LIBWIDGET) $(UTILLIB) $(XTOOLLIB) -lm + $(LIBWIDGET) $(UTILLIB) $(XTOOLLIB) dtcodegen_SOURCES = abmf.c args.c \ diff --git a/cde/programs/dtappbuilder/src/libABobj/Makefile.am b/cde/programs/dtappbuilder/src/libABobj/Makefile.am index 6e725a8fd..3bf1128f7 100644 --- a/cde/programs/dtappbuilder/src/libABobj/Makefile.am +++ b/cde/programs/dtappbuilder/src/libABobj/Makefile.am @@ -6,14 +6,6 @@ EXTRA_DEFINES = -D_POSIX_SOURCE=1 EXTRALIBS = -lm -if HPUX -CCOPTIONS = -Ae -endif - -if AIX -EXTRALIBS += -liconv -endif - if SOLARIS EXTRALIBS += -ldl -lgen endif diff --git a/cde/programs/dtcm/dtcm/Makefile.am b/cde/programs/dtcm/dtcm/Makefile.am index f2e6dd0a1..93fbbf3a1 100644 --- a/cde/programs/dtcm/dtcm/Makefile.am +++ b/cde/programs/dtcm/dtcm/Makefile.am @@ -7,10 +7,6 @@ AM_CFLAGS = $(DT_INCDIR) $(CSA_INCDIR) -I../../../lib/csa \ LDADD = ../libDtCmP/libDtCmP.a $(LIBCSA) $(DTCLIENTLIBS) $(XTOOLLIB) -if SOLARIS -AM_CFLAGS += -xstrconst -Xc -v -endif - if FREEBSD LDADD += -lcompat endif diff --git a/cde/programs/dtcm/libDtCmP/Makefile.am b/cde/programs/dtcm/libDtCmP/Makefile.am index bd9bebd84..0841b0938 100644 --- a/cde/programs/dtcm/libDtCmP/Makefile.am +++ b/cde/programs/dtcm/libDtCmP/Makefile.am @@ -5,10 +5,6 @@ noinst_LIBRARIES = libDtCmP.a libDtCmP_a_CFLAGS = $(CSA_INCDIR) -I../../../lib/csa -DRFC_MIME \ -DLINE_COUNT -DV2 -DOW_I18N -if SOLARIS -libDtCmP_a_CFLAGS += -xstrconst -Xc -v -endif - libDtCmP_a_SOURCES = cm_tty.c cmfns.c dtfns.c props.c resource.c \ timeops.c util.c getdate.y diff --git a/cde/programs/dtcm/server/Makefile.am b/cde/programs/dtcm/server/Makefile.am index 4638a34bc..9321ca858 100644 --- a/cde/programs/dtcm/server/Makefile.am +++ b/cde/programs/dtcm/server/Makefile.am @@ -7,7 +7,6 @@ rpc_cmsd_CFLAGS = -I../../../lib/csa $(DT_INCDIR) $(CSA_INCDIR) rpc_cmsd_LDADD = $(LIBCSA) $(DTCLIENTLIBS) $(TIRPCLIB) $(XTOOLLIB) if SOLARIS -rpc_cmsd_CFLAGS += -xstrconst -Xc -v rpc_cmsd_LDADD += -lsocket -lnsl -lintl -lm -ldl endif diff --git a/cde/programs/dtfile/Makefile.am b/cde/programs/dtfile/Makefile.am index a3afa1c05..539761047 100644 --- a/cde/programs/dtfile/Makefile.am +++ b/cde/programs/dtfile/Makefile.am @@ -18,7 +18,7 @@ dtfile_CPPFLAGS = -I./dtcopy -DSHAPE -D_ILS_MACROS -DSUN_PERF \ dtfile_LDADD = dtcopy/sharedFuncs.o \ dtcopy/fsrtns.o \ - $(DTCLIENTLIBS) $(TIRPCLIB) -lXm -lXext $(XTOOLLIB) + $(DTCLIENTLIBS) $(TIRPCLIB) $(XTOOLLIB) if OPENBSD dtfile_CPPFLAGS += -DFILE_MAP_OPTIMIZE @@ -29,7 +29,6 @@ dtfile_CPPFLAGS += -DFILE_MAP_OPTIMIZE endif if SOLARIS -dtfile_CFLAGS = -xF dtfile_LDADD += -lintl -lresolv endif diff --git a/cde/programs/dtfile/dtcopy/Makefile.am b/cde/programs/dtfile/dtcopy/Makefile.am index c3d33fbeb..4859aad7d 100644 --- a/cde/programs/dtfile/dtcopy/Makefile.am +++ b/cde/programs/dtfile/dtcopy/Makefile.am @@ -4,11 +4,7 @@ bin_PROGRAMS = dtfile_copy dtfile_copy_CFLAGS = -DSHAPE -if SOLARIS -dtfile_copy_CFLAGS += -xF -endif - -dtfile_copy_LDADD = @DTCLIENTLIBS@ -lXm $(TIRPCLIB) $(XTOOLLIB) +dtfile_copy_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB) $(TIRPCLIB) dtfile_copy_SOURCES = main_dtcopy.c copydialog.c overwrtdialog.c dosync.c \ fsrtns.c utils.c errordialog.c sharedFuncs.c diff --git a/cde/programs/dthello/Makefile.am b/cde/programs/dthello/Makefile.am index 360e1dbbb..4f5775685 100644 --- a/cde/programs/dthello/Makefile.am +++ b/cde/programs/dthello/Makefile.am @@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in bin_PROGRAMS = dthello -dthello_LDADD = $(DTCLIENTLIBS) ${X_LIBS} -lXm $(XTOOLLIB) +dthello_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB) if SOLARIS dthello_LDADD += -ldl -lgen diff --git a/cde/programs/dtimsstart/Makefile.am b/cde/programs/dtimsstart/Makefile.am index c2d91440a..0b91977db 100644 --- a/cde/programs/dtimsstart/Makefile.am +++ b/cde/programs/dtimsstart/Makefile.am @@ -10,10 +10,6 @@ dtimsstart_CFLAGS = -DNLS dtimsstart_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB) -if SOLARIS -dtimsstart_CFLAGS += -xF -endif - dtimsstart_SOURCES = action.c env.c file.c main.c remote.c select.c \ start.c util.c win.c ximserr.h ximsfunc.h xims.h \ ximspath.h diff --git a/cde/programs/dtinfo/dtinfo/src/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Makefile.am index 603b40391..8b18891e2 100644 --- a/cde/programs/dtinfo/dtinfo/src/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Makefile.am @@ -67,6 +67,6 @@ bin_PROGRAMS = dtinfo dtinfo_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) dtinfo_LDADD = $(OLIASNORMALLIBS) $(LIBSEARCH) $(MMDB_LIBS) $(WWL_LIBS) \ - $(DTCLIENTLIBS) -lXmu $(XTOOLLIB) + $(DTCLIENTLIBS) $(XTOOLLIB) dtinfo_SOURCES = main.C Support/InputNotifier.C diff --git a/cde/programs/dtksh/Makefile.am b/cde/programs/dtksh/Makefile.am index 32bb57e5c..603ba6af4 100644 --- a/cde/programs/dtksh/Makefile.am +++ b/cde/programs/dtksh/Makefile.am @@ -10,10 +10,6 @@ dist_ksh_SCRIPTS = DtFuncs.dtsh KSH93SRC = ./ksh93 -if SOLARIS -.NO_PARALLEL: -endif - KSH93LIBSHELL = $(KSH93SRC)/lib/libshell.a bin_PROGRAMS = dtksh @@ -31,9 +27,9 @@ dtksh_CPPFLAGS = -I$(KSH93SRC)/include/ast -I$(KSH93SRC)/src/cmd/ksh93/include \ -DSHOPT_SUID_EXEC -D_API_ast=20100309 -DSHOPT_BRACEPAT \ -DBUILD_DTKSH -dtksh_LDADD = $(DTCLIENTLIBS) -lXm pmain.o $(XTOOLLIB) ${X_LIB} \ +dtksh_LDADD = $(DTCLIENTLIBS) pmain.o $(XTOOLLIB) \ libshell.a $(KSH93SRC)/lib/libcmd.a $(KSH93SRC)/lib/libast.a \ - $(KSH93SRC)/lib/libdll.a -lm + $(KSH93SRC)/lib/libdll.a if LINUX dtksh_LDADD += -ldl diff --git a/cde/programs/dtlogin/Makefile.am b/cde/programs/dtlogin/Makefile.am index ca0f6d487..38aaab42f 100644 --- a/cde/programs/dtlogin/Makefile.am +++ b/cde/programs/dtlogin/Makefile.am @@ -4,7 +4,7 @@ bin_PROGRAMS = dtlogin dtgreet dtchooser if HAS_PAM_LIBRARY PAM_LIB = -lpam -DTPAMSVCLIB = @LIBPAMSVC@ +DTPAMSVCLIB = $(LIBPAMSVC) else PAM_LIB = DTPAMSVCLIB = @@ -56,12 +56,12 @@ dtgreet_SOURCES = vgcallback.c vglogo.c vgmain.c vgutil.c vglang.c dtchooser_SOURCES = chooser.c dtchooser.c vglogo.c vgutil.c vgcallback.c \ vglang.c -dtlogin_LDADD = libresource.a @DTCLIENTLIBS@ -lXau -lXmu -lXext -lXdmcp \ +dtlogin_LDADD = libresource.a $(DTCLIENTLIBS) $(XDMCPLIB) \ $(XTOOLLIB) $(TIRPCLIB) $(DTPAMSVCLIB) $(PAM_LIB) dtgreet_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB) -dtchooser_LDADD = $(DTCLIENTLIBS) -lXmu -lXext -lXdmcp $(XTOOLLIB) +dtchooser_LDADD = $(DTCLIENTLIBS) $(XDMCPLIB) $(XTOOLLIB) if LINUX diff --git a/cde/programs/dtmail/MotifApp/Makefile.am b/cde/programs/dtmail/MotifApp/Makefile.am index c77f7b7b1..e6bb5005a 100644 --- a/cde/programs/dtmail/MotifApp/Makefile.am +++ b/cde/programs/dtmail/MotifApp/Makefile.am @@ -4,21 +4,6 @@ noinst_LIBRARIES = libMotifApp.a libMotifApp_a_CXXFLAGS = -I../include/MotifApp -I../include -I../include/utils -# FIXME - some of these aren't set and sould be by configure.ac -#if SOLARIS - -#if USE_SPRO_V3 -#libMotifApp_a_CXXFLAGS += -noex -xO0 -USPRO_V2 -#endif - -#if DEBUGTREE -#libMotifApp_a_CXXFLAGS += -xsb -#endif -# -#libMotifApp_a_CXXFLAGS += -DMMAP_NORESERVE -DSPRO_V2 - -#endif - libMotifApp_a_SOURCES = Application.C AskFirstCmd.C \ BasicComponent.C BusyPixmap.C \ ButtonInterface.C Cmd.C \ @@ -36,8 +21,3 @@ libMotifApp_a_SOURCES = Application.C AskFirstCmd.C \ UndoCmd.C WarnNoUndoCmd.C \ WorkingDialogManager.C -if SOLARIS -clean-local: - $(RM) -r .sb - $(RM) .make.state* -endif diff --git a/cde/programs/dtmail/dtmail/Makefile.am b/cde/programs/dtmail/dtmail/Makefile.am index 6f5173a32..bc02a1448 100644 --- a/cde/programs/dtmail/dtmail/Makefile.am +++ b/cde/programs/dtmail/dtmail/Makefile.am @@ -7,7 +7,7 @@ dtmail_CXXFLAGS = -I../include -I../include/MotifApp -I../include/utils \ -I$(srcdir)/lib -I../../dthelp -DRELEASE_NOTES \ -DDTMAIL_TOOLTALK -DDTEDITOR -dtmail_LDADD = ../libDtMail/libDtMail.a ../MotifApp/libMotifApp.a -lXm \ +dtmail_LDADD = ../libDtMail/libDtMail.a ../MotifApp/libMotifApp.a \ $(DTCLIENTLIBS) $(XTOOLLIB) $(TIRPCLIB) dtmail_SOURCES = AliasListUiItem.C AlternatesListUiItem.C \ diff --git a/cde/programs/dtmail/libDtMail/Common/Makefile.am b/cde/programs/dtmail/libDtMail/Common/Makefile.am index 2098dd808..c46b6c6db 100644 --- a/cde/programs/dtmail/libDtMail/Common/Makefile.am +++ b/cde/programs/dtmail/libDtMail/Common/Makefile.am @@ -6,7 +6,7 @@ libCommon_a_CXXFLAGS = -I../../include -I../../include/utils -I$(srcdir)/lib \ -DDL_NOT_DYNAMIC -DUSE_SOCKSTREAM if SOLARIS -libCommon_a_CXXFLAGS += -DMMAP_NORESERVE -DSPRO_V2 +libCommon_a_CXXFLAGS += -DMMAP_NORESERVE endif libCommon_a_SOURCES = APOPServer.C \ diff --git a/cde/programs/dtmail/libDtMail/RFC/Makefile.am b/cde/programs/dtmail/libDtMail/RFC/Makefile.am index df15c2041..bb7826b43 100644 --- a/cde/programs/dtmail/libDtMail/RFC/Makefile.am +++ b/cde/programs/dtmail/libDtMail/RFC/Makefile.am @@ -6,7 +6,7 @@ libRFC_a_CXXFLAGS = -I../Common -I../../include -I../../include/utils \ -DTTLOCK_OFF if SOLARIS -libRFC_a_CXXFLAGS += -DMMAP_NORESERVE -DSPRO_V2 +libRFC_a_CXXFLAGS += -DMMAP_NORESERVE endif libRFC_a_SOURCES = AliasExpand.C MIMEBodyPart.C \ diff --git a/cde/programs/dtpad/Makefile.am b/cde/programs/dtpad/Makefile.am index 03adbe52a..345061eb6 100644 --- a/cde/programs/dtpad/Makefile.am +++ b/cde/programs/dtpad/Makefile.am @@ -4,10 +4,9 @@ bin_PROGRAMS = dtpad dtpad_CFLAGS = -DDT_LITE -DWORDWRAP -dtpad_LDADD = @DTCLIENTLIBS@ -lXm $(TIRPCLIB) $(XTOOLLIB) +dtpad_LDADD = $(DTCLIENTLIBS) $(TIRPCLIB) $(XTOOLLIB) if SOLARIS -dtpad_CFLAGS += -xF dtpad_LDFLAGS = -lintl -lresolv endif diff --git a/cde/programs/dtsession/Makefile.am b/cde/programs/dtsession/Makefile.am index 713640f9a..83c224cef 100644 --- a/cde/programs/dtsession/Makefile.am +++ b/cde/programs/dtsession/Makefile.am @@ -5,7 +5,7 @@ bin_PROGRAMS = dtsession bin_SCRIPTS = dtsession_res if HAS_PAM_LIBRARY -DTPAMSVCLIB = @LIBPAMSVC@ +DTPAMSVCLIB = $(LIBPAMSVC) else DTPAMSVCLIB = endif diff --git a/cde/programs/dtstyle/Makefile.am b/cde/programs/dtstyle/Makefile.am index 11c826eca..728a2956c 100644 --- a/cde/programs/dtstyle/Makefile.am +++ b/cde/programs/dtstyle/Makefile.am @@ -4,7 +4,7 @@ bin_PROGRAMS = dtstyle dtstyle_CPPFLAGS = -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \ -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" -I../dthelp \ - -I$(DT_INCDIR) + $(DT_INCDIR) dtstyle_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB) diff --git a/cde/programs/dtudcexch/Makefile.am b/cde/programs/dtudcexch/Makefile.am index 4bce8dcc5..0d3359470 100644 --- a/cde/programs/dtudcexch/Makefile.am +++ b/cde/programs/dtudcexch/Makefile.am @@ -6,7 +6,7 @@ dtudcexch_CFLAGS = -I$(FONTEDT_PATH1) -I$(FONTEDT_PATH1)/include \ -I$(FONTEDT_PATH1)/libfal -I$(FONTEDT_PATH1)/dtgpftobdf \ -DFONTC='"'$(BDFTOPCF)'"' -dtudcexch_LDADD = $(LIBSVC) $(LIBTT) -lXm $(XTOOLLIB) ${X_LIBS} \ +dtudcexch_LDADD = $(LIBSVC) $(LIBTT) $(XTOOLLIB) ${X_LIBS} \ $(FONTEDT_PATH1)/libfuty/liboakfuty.a \ $(FONTEDT_PATH1)/libfal/libfal.a @@ -14,10 +14,6 @@ if SOLARIS dtudcexch_LDADD += -ldl -lgen endif -if AIX -dtudcexch_LDADD += -ldl -liconv -endif - if FREEBSD dtudcexch_LDADD += -liconv endif diff --git a/cde/programs/dtwm/Makefile.am b/cde/programs/dtwm/Makefile.am index 548f7271f..caf248448 100644 --- a/cde/programs/dtwm/Makefile.am +++ b/cde/programs/dtwm/Makefile.am @@ -12,8 +12,8 @@ AM_CPPFLAGS = -DLARGECURSORS -DR2_COMPAT -DOPAQUE -DSHAPE -DUNMAP_ON_RESTART \ -DBATCH_DRAG_REQUESTS -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \ -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" -dtwm_LDADD = $(DTCLIENTLIBS) -lXext $(XTOOLLIB) -dtfplist_LDADD = @DTCLIENTLIBS@ $(TIRPCLIB) -lXm -lXext $(XTOOLLIB) +dtwm_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB) +dtfplist_LDADD = $(DTCLIENTLIBS) $(TIRPCLIB) $(XTOOLLIB) if SOLARIS dtwm_LDADD += -lintl -lresolv