This is based off of current master instead of the libmd patch as it doesn't
seem like it will be merged (though I could edit it to build on all systems
except linux so no wiki edits need be made).
Thank you for your time,
-Chase
Sent with [Proton Mail](https://proton.me/) secure email.
From b9cf8af1036cb1a8e5aea1be37ae7f88e5cd40c1 Mon Sep 17 00:00:00 2001
From: Chase <nicetry...@protonmail.ch>
Date: Sat, 30 Jul 2022 20:55:31 -0500
Subject: [PATCH 2/2] configure: detect libm
---
cde/configure.ac | 3 +++
cde/lib/DtHelp/Makefile.am | 2 +-
cde/lib/DtSearch/Makefile.am | 2 +-
cde/programs/dtappbuilder/src/ab/Makefile.am | 2 +-
cde/programs/dtappbuilder/src/abmf/Makefile.am | 2 +-
cde/programs/dtappbuilder/src/libABobj/Makefile.am | 4 +---
cde/programs/dtappbuilder/src/libAButil/Makefile.am | 4 ++--
cde/programs/dtcm/server/Makefile.am | 2 +-
cde/programs/dthelp/dthelpprint/Makefile.am | 2 +-
9 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/cde/configure.ac b/cde/configure.ac
index 88f662625..5946c27a3 100644
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -506,6 +506,9 @@ AC_CHECK_LIB(Xdmcp, XdmcpFlush, [XDMCPLIB="-lXdmcp"], [XDMCPLIB=""],
[${EXTRA_INCS} ${EXTRA_LIBS}])
AC_SUBST(XDMCPLIB)
+AC_SEARCH_LIBS(cos, m, [], [
+ AC_MSG_ERROR([cos not found, your system probably doesn't obey posix])])
+
AC_SEARCH_LIBS(dlopen, [dl dld], [], [
AC_MSG_ERROR([dlopen not found, your system probably doesn't obey posix]
)])
diff --git a/cde/lib/DtHelp/Makefile.am b/cde/lib/DtHelp/Makefile.am
index 8aad06f3f..a3b59681b 100644
--- a/cde/lib/DtHelp/Makefile.am
+++ b/cde/lib/DtHelp/Makefile.am
@@ -16,7 +16,7 @@ libDtHelp_la_CFLAGS = -I./il -I./jpeg -I../DtSvc/DtUtil2 -DDTLIB \
libDtHelp_la_LIBADD = $(JPEGLIB) il/libil.la $(LTLIBICONV)
if SOLARIS
-libDtHelp_la_LIBADD += -lw -lgen -lm -lc
+libDtHelp_la_LIBADD += -lw -lgen -lc
endif
diff --git a/cde/lib/DtSearch/Makefile.am b/cde/lib/DtSearch/Makefile.am
index fce13b0b6..5c359728f 100644
--- a/cde/lib/DtSearch/Makefile.am
+++ b/cde/lib/DtSearch/Makefile.am
@@ -22,7 +22,7 @@ endif
libDtSearch_la_LIBADD = raima/libraima.la
if SOLARIS
-libDtSearch_la_LIBADD += -lm -lc
+libDtSearch_la_LIBADD += -lc
endif
libDtSearch_la_SOURCES = apndext.c ausdopen.c ausexit.c \
diff --git a/cde/programs/dtappbuilder/src/ab/Makefile.am b/cde/programs/dtappbuilder/src/ab/Makefile.am
index e40629c7e..c0dee1a6f 100644
--- a/cde/programs/dtappbuilder/src/ab/Makefile.am
+++ b/cde/programs/dtappbuilder/src/ab/Makefile.am
@@ -47,7 +47,7 @@ dtbuilder_LDADD = ../libABil/libABil.a ../libABobjXm/libABobjXm.a \
../libABobj/libABobj.a ../libAButil/libAButil.a \
$(LIBWIDGET) $(LIBTERM) $(LIBHELP) $(LIBSVC) \
$(LIBTT) $(LIBXIN) -lUil $(MRESOURCELIB) $(XTOOLLIB) ${X_LIB} \
- $(UTILLIB) -lm
+ $(UTILLIB)
dtbuilder_CFLAGS = -DPIXMAP_WORKAROUND $(ABINCLUDES)
diff --git a/cde/programs/dtappbuilder/src/abmf/Makefile.am b/cde/programs/dtappbuilder/src/abmf/Makefile.am
index 4578520f1..ee697131a 100644
--- a/cde/programs/dtappbuilder/src/abmf/Makefile.am
+++ b/cde/programs/dtappbuilder/src/abmf/Makefile.am
@@ -44,7 +44,7 @@ dtcodegen_SOURCES = abmf.c args.c \
utils_header_file.c write_c.c \
write_code.c
-#ab_func_strings_LDADD = -lm ../libAButil/libAButil.a
+#ab_func_strings_LDADD = ../libAButil/libAButil.a
#ab_func_strings_SOURCES = ab_func_strings.c
diff --git a/cde/programs/dtappbuilder/src/libABobj/Makefile.am b/cde/programs/dtappbuilder/src/libABobj/Makefile.am
index f74e52884..af17282a9 100644
--- a/cde/programs/dtappbuilder/src/libABobj/Makefile.am
+++ b/cde/programs/dtappbuilder/src/libABobj/Makefile.am
@@ -4,10 +4,8 @@ ABINCLUDES = ../include
EXTRA_DEFINES = -D_POSIX_SOURCE=1
-EXTRALIBS = -lm
-
if SOLARIS
-EXTRALIBS += -lgen
+EXTRALIBS = -lgen
endif
noinst_LIBRARIES = libABobj.a
diff --git a/cde/programs/dtappbuilder/src/libAButil/Makefile.am b/cde/programs/dtappbuilder/src/libAButil/Makefile.am
index d683a00e8..af3aa55ac 100644
--- a/cde/programs/dtappbuilder/src/libAButil/Makefile.am
+++ b/cde/programs/dtappbuilder/src/libAButil/Makefile.am
@@ -21,13 +21,13 @@ libAButil_a_SOURCES = abio.c \
util_file.c \
util_string.c
-#util_test_LDADD = libAButil.a -lm
+#util_test_LDADD = libAButil.a
#util_test_CFLAGS = $(EXTRA_DEFINES) -I$(ABINCLUDES)
#util_test_SOURCES = util_test.c
-#istr_test_LDADD = libAButil.a -lm
+#istr_test_LDADD = libAButil.a
#istr_test_CFLAGS = $(EXTRA_DEFINES) -I$(ABINCLUDES)
diff --git a/cde/programs/dtcm/server/Makefile.am b/cde/programs/dtcm/server/Makefile.am
index bd49c472c..a4ac7dc55 100644
--- a/cde/programs/dtcm/server/Makefile.am
+++ b/cde/programs/dtcm/server/Makefile.am
@@ -7,7 +7,7 @@ rpc_cmsd_CFLAGS = -I../../../lib/csa $(DT_INCDIR) $(CSA_INCDIR)
rpc_cmsd_LDADD = $(LIBCSA) $(DTCLIENTLIBS) $(TIRPCLIB) $(XTOOLLIB)
if SOLARIS
-rpc_cmsd_LDADD += -lsocket -lnsl -lintl -lm
+rpc_cmsd_LDADD += -lsocket -lnsl -lintl
endif
rpc_cmsd_SOURCES = parser.c access.c callback.c cmscalendar.c \
diff --git a/cde/programs/dthelp/dthelpprint/Makefile.am b/cde/programs/dthelp/dthelpprint/Makefile.am
index c493da6e7..81eda923f 100644
--- a/cde/programs/dthelp/dthelpprint/Makefile.am
+++ b/cde/programs/dthelp/dthelpprint/Makefile.am
@@ -10,7 +10,7 @@ dthelpprint_CPPFLAGS = -I.. -I ../../../lib/DtHelp \
dthelpprint_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
if SOLARIS
-dthelpprint_LDADD += -lw -lgen -lm
+dthelpprint_LDADD += -lw -lgen
endif
dthelpprint_SOURCES = Main.c Initialize.c PrintUtil.c PrintTopics.c \
--
2.34.1
From bb3ab9a92f62825fb96b4e95cf67647df67b9c53 Mon Sep 17 00:00:00 2001
From: Chase <nicetry...@protonmail.ch>
Date: Sat, 30 Jul 2022 20:33:24 -0500
Subject: [PATCH 1/2] configure: detect libdl
---
cde/configure.ac | 4 ++
cde/lib/DtTerm/Makefile.am | 2 +-
cde/lib/tt/bin/shell/Makefile.am | 2 +-
cde/lib/tt/bin/tt_type_comp/Makefile.am | 2 +-
cde/lib/tt/bin/ttauth/Makefile.am | 2 +-
cde/lib/tt/bin/ttdbserverd/Makefile.am | 2 +-
cde/lib/tt/bin/ttsession/Makefile.am | 2 +-
cde/lib/tt/bin/tttar/Makefile.am | 2 +-
cde/lib/tt/bin/tttrace/Makefile.am | 2 +-
cde/lib/tt/demo/CoEd/CoEd/IMakeFile | 47 -------------------
cde/lib/tt/lib/Makefile.am | 2 +-
cde/programs/dsdm/Makefile.am | 4 --
cde/programs/dtaction/Makefile.am | 4 --
.../dtappbuilder/src/libABobj/Makefile.am | 2 +-
cde/programs/dtcalc/Makefile.am | 2 +-
cde/programs/dtcm/server/Makefile.am | 2 +-
cde/programs/dtcreate/Makefile.am | 4 --
cde/programs/dtdbcache/Makefile.am | 2 +-
cde/programs/dtdspmsg/Makefile.am | 2 +-
cde/programs/dthello/Makefile.am | 2 +-
cde/programs/dthelp/dthelpprint/Makefile.am | 2 +-
cde/programs/dticon/Makefile.am | 4 --
cde/programs/dtksh/Makefile.am | 6 +--
cde/programs/dtlogin/Makefile.am | 6 +--
cde/programs/dtpdm/Makefile.am | 2 +-
cde/programs/dtpdmd/Makefile.am | 4 --
cde/programs/dtprintinfo/Makefile.am | 4 --
cde/programs/dtscreen/Makefile.am | 2 +-
cde/programs/dtsearchpath/dtappg/Makefile.am | 2 +-
.../dtsearchpath/libCliSrv/Makefile.am | 2 +-
cde/programs/dtsession/Makefile.am | 4 +-
cde/programs/dtspcd/Makefile.am | 2 +-
cde/programs/dtudcexch/Makefile.am | 2 +-
cde/programs/util/dttypes/Makefile.am | 2 +-
34 files changed, 33 insertions(+), 104 deletions(-)
delete mode 100644 cde/lib/tt/demo/CoEd/CoEd/IMakeFile
diff --git a/cde/configure.ac b/cde/configure.ac
index d2551a566..88f662625 100644
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -506,6 +506,10 @@ AC_CHECK_LIB(Xdmcp, XdmcpFlush, [XDMCPLIB="-lXdmcp"], [XDMCPLIB=""],
[${EXTRA_INCS} ${EXTRA_LIBS}])
AC_SUBST(XDMCPLIB)
+AC_SEARCH_LIBS(dlopen, [dl dld], [], [
+ AC_MSG_ERROR([dlopen not found, your system probably doesn't obey posix]
+ )])
+
dnl iconv
AM_ICONV
diff --git a/cde/lib/DtTerm/Makefile.am b/cde/lib/DtTerm/Makefile.am
index 7b96f2127..36d71c183 100644
--- a/cde/lib/DtTerm/Makefile.am
+++ b/cde/lib/DtTerm/Makefile.am
@@ -18,7 +18,7 @@ libDtTerm_la_LIBADD += -lutil
endif
if SOLARIS
-libDtTerm_la_LIBADD += -ldl -lgen
+libDtTerm_la_LIBADD += -lgen
endif
if HAS_UTEMPTER_LIBRARY
diff --git a/cde/lib/tt/bin/shell/Makefile.am b/cde/lib/tt/bin/shell/Makefile.am
index 04b2403ca..0455255be 100644
--- a/cde/lib/tt/bin/shell/Makefile.am
+++ b/cde/lib/tt/bin/shell/Makefile.am
@@ -10,7 +10,7 @@ AM_CXXFLAGS = -I../../lib $(TT_VERSION_DEFINE)
LDADD = $(LIBTT) $(TIRPCLIB) $(XTOOLLIB)
if SOLARIS
-LDADD += -ldl -lintl -lsocket -lnsl
+LDADD += -lintl -lsocket -lnsl
endif
ttmv_SOURCES = ttmv.C mover.C
diff --git a/cde/lib/tt/bin/tt_type_comp/Makefile.am b/cde/lib/tt/bin/tt_type_comp/Makefile.am
index c9e3dbf7e..0c04b7908 100644
--- a/cde/lib/tt/bin/tt_type_comp/Makefile.am
+++ b/cde/lib/tt/bin/tt_type_comp/Makefile.am
@@ -21,7 +21,7 @@ tt_type_comp_SOURCES = mp_type_comp.C mp_types_table.C \
tt_type_comp_LDADD = ../../slib/libstt.a $(LIBTT) $(TIRPCLIB) $(XTOOLLIB)
if SOLARIS
-tt_type_comp_LDADD += $(XTOOLLIB) -ldl -lintl -lsocket -lnsl
+tt_type_comp_LDADD += $(XTOOLLIB) -lintl -lsocket -lnsl
endif
frozen.mp_types_lex.o: frozen.mp_types_gram.h
diff --git a/cde/lib/tt/bin/ttauth/Makefile.am b/cde/lib/tt/bin/ttauth/Makefile.am
index d17f8d302..a814ca899 100644
--- a/cde/lib/tt/bin/ttauth/Makefile.am
+++ b/cde/lib/tt/bin/ttauth/Makefile.am
@@ -11,7 +11,7 @@ ttauth_LDADD += $(TIRPCLIB) $(XTOOLLIB)
endif
if SOLARIS
-ttauth_LDADD += $(XTOOLLIB) -ldl -lintl -lsocket -lnsl
+ttauth_LDADD += $(XTOOLLIB) -lintl -lsocket -lnsl
endif
if BSD
diff --git a/cde/lib/tt/bin/ttdbserverd/Makefile.am b/cde/lib/tt/bin/ttdbserverd/Makefile.am
index 976a2a74e..1c8a3f098 100644
--- a/cde/lib/tt/bin/ttdbserverd/Makefile.am
+++ b/cde/lib/tt/bin/ttdbserverd/Makefile.am
@@ -16,7 +16,7 @@ rpc_ttdbserver_LDADD += $(TIRPCLIB) $(XTOOLLIB)
endif
if SOLARIS
-rpc_ttdbserver_LDADD += $(XTOOLLIB) -ldl -lintl -lsocket -lnsl
+rpc_ttdbserver_LDADD += $(XTOOLLIB) -lintl -lsocket -lnsl
endif
if BSD
diff --git a/cde/lib/tt/bin/ttsession/Makefile.am b/cde/lib/tt/bin/ttsession/Makefile.am
index 398d27b30..226a9468c 100644
--- a/cde/lib/tt/bin/ttsession/Makefile.am
+++ b/cde/lib/tt/bin/ttsession/Makefile.am
@@ -14,7 +14,7 @@ ttsession_LDADD += $(TIRPCLIB) $(XTOOLLIB)
endif
if SOLARIS
-ttsession_LDADD += $(XTOOLLIB) -ldl -lintl -lsocket -lnsl
+ttsession_LDADD += $(XTOOLLIB) -lintl -lsocket -lnsl
endif
if BSD
diff --git a/cde/lib/tt/bin/tttar/Makefile.am b/cde/lib/tt/bin/tttar/Makefile.am
index 510810986..e2349d881 100644
--- a/cde/lib/tt/bin/tttar/Makefile.am
+++ b/cde/lib/tt/bin/tttar/Makefile.am
@@ -11,7 +11,7 @@ tttar_LDADD = ../../slib/libstt.a ../../mini_isam/libisam.a \
$(LIBTT) $(TIRPCLIB) $(XTOOLLIB)
if SOLARIS
-tttar_LDADD += -ldl -lintl -lsocket -lnsl
+tttar_LDADD += -lintl -lsocket -lnsl
endif
tttar_SOURCES = tttar.C \
diff --git a/cde/lib/tt/bin/tttrace/Makefile.am b/cde/lib/tt/bin/tttrace/Makefile.am
index c7ae9a4c3..9759d3ddf 100644
--- a/cde/lib/tt/bin/tttrace/Makefile.am
+++ b/cde/lib/tt/bin/tttrace/Makefile.am
@@ -7,7 +7,7 @@ tttrace_CXXFLAGS = -I../../lib
tttrace_LDADD = $(LIBTT) $(TIRPCLIB) $(XTOOLLIB)
if SOLARIS
-tttrace_LDADD += -ldl -lintl -lsocket -lnsl
+tttrace_LDADD += -lintl -lsocket -lnsl
endif
tttrace_SOURCES = tttrace.C tttrace_objs.C
diff --git a/cde/lib/tt/demo/CoEd/CoEd/IMakeFile b/cde/lib/tt/demo/CoEd/CoEd/IMakeFile
deleted file mode 100644
index 3674f3702..000000000
--- a/cde/lib/tt/demo/CoEd/CoEd/IMakeFile
+++ /dev/null
@@ -1,47 +0,0 @@
-# %% (c) Copyright 1993, 1994 Hewlett-Packard Company
-# %% (c) Copyright 1993, 1994 International Business Machines Corp.
-# %% (c) Copyright 1993, 1994 Sun Microsystems, Inc.
-# %% (c) Copyright 1993, 1994 Novell, Inc.
-# %% $XConsortium: IMakeFile /main/3 1995/10/20 17:04:55 rswiston $
-#ifdef HideFromImake
- #
- # IMakeFile 1.7 17 Nov 1994
- #
- # This preamble turns this imakefile into a shell script which will
- # create/update this directory's makefile when invoked as follows:
- # % sh IMakeFile [[GNU]MakeFile]
- #
-IMAKEDIR=../../../imake; export IMAKEDIR
-exec make -f $IMAKEDIR/Boot.mk ${1+"$@"}
-#endif HideFromImake
-
-TT_DIR = ../../..
-
-include $(TT_DIR)/Make.macros
-
-.KEEP_STATE:
-
-default: all
-
-All:: $(MAKEFILE)s all
-all: DynamicDebugProg(CoEd)
-
-CoEd_SOURCES.C = CoEdTextBuffer.C CoEditor.C CoEd.C
-
-RUN_PATH = -R /tt/proto/lib:/usr/dt/lib:$(OPENWINHOME)/lib:/opt/SUNWspro/lib
-
-ProgramDynamicOptimized(CoEd)
-ProgramDynamicDebug(CoEd)
-SourceHygiene(CoEd)
-
-SaberProg(CoEd)
-
-AppendVal(CPPFLAGS,-I../../../proto/include -I/usr/dt/include -I$(OPENWINHOME)/include -I../libCoEd)
-
-AppendVal(LDFLAGS,-L../../../proto/lib -L/usr/dt/lib -L$(OPENWINHOME)/lib -L../libCoEd/$(OEUVRE)/pdc/O)
-
-#AppendVal(LDLIBS,-ltt-g -lXm -lXt -lX11 -Bstatic -lCoEd -Bdynamic)
-AppendVal(LDLIBS,-ltt -lXm -lXt -lX11 -Bstatic -lCoEd -Bdynamic)
-loc_LDLIBS_SunOS4 = -lce -lX -lI18N -ldl
-loc_LDLIBS_SunOS5 = -lnsl -lsocket -lintl -lgen
-AppendVal(LDLIBS,$(loc_LDLIBS_$(OS)))
diff --git a/cde/lib/tt/lib/Makefile.am b/cde/lib/tt/lib/Makefile.am
index 895861805..b9e17b595 100644
--- a/cde/lib/tt/lib/Makefile.am
+++ b/cde/lib/tt/lib/Makefile.am
@@ -18,7 +18,7 @@ libtt_la_LIBADD = api/c/libapi.la api/dnd/libdnd.la db/libdb.la mp/libmp.la \
if SOLARIS
# This stuff should be figured out by configure
-libtt_la_LIBADD += -lnsl -lsocket -lintl -ldl -lc -lw
+libtt_la_LIBADD += -lnsl -lsocket -lintl -lc -lw
endif
if LINUX
diff --git a/cde/programs/dsdm/Makefile.am b/cde/programs/dsdm/Makefile.am
index 78a3202be..acf6edf9f 100644
--- a/cde/programs/dsdm/Makefile.am
+++ b/cde/programs/dsdm/Makefile.am
@@ -2,8 +2,4 @@ bin_PROGRAMS = dsdm
dsdm_LDADD = $(XTOOLLIB)
-if SOLARIS
-dsdm_LDADD += -ldl
-endif
-
dsdm_SOURCES = dsdm.c proxy.c
diff --git a/cde/programs/dtaction/Makefile.am b/cde/programs/dtaction/Makefile.am
index f1370dfc8..6dde85bec 100644
--- a/cde/programs/dtaction/Makefile.am
+++ b/cde/programs/dtaction/Makefile.am
@@ -6,10 +6,6 @@ dtaction_SOURCES = Main.c
dtaction_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
-if SOLARIS
-dtaction_LDADD += -ldl
-endif
-
if LINUX
dtaction_LDADD += -lcrypt
endif
diff --git a/cde/programs/dtappbuilder/src/libABobj/Makefile.am b/cde/programs/dtappbuilder/src/libABobj/Makefile.am
index 3bf1128f7..f74e52884 100644
--- a/cde/programs/dtappbuilder/src/libABobj/Makefile.am
+++ b/cde/programs/dtappbuilder/src/libABobj/Makefile.am
@@ -7,7 +7,7 @@ EXTRA_DEFINES = -D_POSIX_SOURCE=1
EXTRALIBS = -lm
if SOLARIS
-EXTRALIBS += -ldl -lgen
+EXTRALIBS += -lgen
endif
noinst_LIBRARIES = libABobj.a
diff --git a/cde/programs/dtcalc/Makefile.am b/cde/programs/dtcalc/Makefile.am
index f86bf3a7b..c9bc32d1a 100644
--- a/cde/programs/dtcalc/Makefile.am
+++ b/cde/programs/dtcalc/Makefile.am
@@ -7,7 +7,7 @@ dtcalc_CPPFLAGS = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\"
dtcalc_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
if SOLARIS
-dtcalc_LDADD += -lintl -ldl
+dtcalc_LDADD += -lintl
endif
diff --git a/cde/programs/dtcm/server/Makefile.am b/cde/programs/dtcm/server/Makefile.am
index 9321ca858..bd49c472c 100644
--- a/cde/programs/dtcm/server/Makefile.am
+++ b/cde/programs/dtcm/server/Makefile.am
@@ -7,7 +7,7 @@ rpc_cmsd_CFLAGS = -I../../../lib/csa $(DT_INCDIR) $(CSA_INCDIR)
rpc_cmsd_LDADD = $(LIBCSA) $(DTCLIENTLIBS) $(TIRPCLIB) $(XTOOLLIB)
if SOLARIS
-rpc_cmsd_LDADD += -lsocket -lnsl -lintl -lm -ldl
+rpc_cmsd_LDADD += -lsocket -lnsl -lintl -lm
endif
rpc_cmsd_SOURCES = parser.c access.c callback.c cmscalendar.c \
diff --git a/cde/programs/dtcreate/Makefile.am b/cde/programs/dtcreate/Makefile.am
index b5b3c5c2a..6df2ba70a 100644
--- a/cde/programs/dtcreate/Makefile.am
+++ b/cde/programs/dtcreate/Makefile.am
@@ -4,10 +4,6 @@ bin_PROGRAMS = dtcreate
dtcreate_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
-if SOLARIS
-dtcreate_LDADD += -ldl
-endif
-
dtcreate_SOURCES = main.c AddFiletype.c Confirmed.c \
CreateActionAppShell.c FileCharacteristics.c OpenFile.c \
UxXt.c ca_aux.c cmncbs.c cmnutils.c cmnrtns.c ErrorDialog.c \
diff --git a/cde/programs/dtdbcache/Makefile.am b/cde/programs/dtdbcache/Makefile.am
index 9ab1be7db..61fc146dc 100644
--- a/cde/programs/dtdbcache/Makefile.am
+++ b/cde/programs/dtdbcache/Makefile.am
@@ -5,7 +5,7 @@ bin_PROGRAMS = dtdbcache
dtdbcache_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
if SOLARIS
-dtdbcache_LDADD += -ldl -lw -lgen
+dtdbcache_LDADD += -lw -lgen
endif
dtdbcache_SOURCES = Main.c
diff --git a/cde/programs/dtdspmsg/Makefile.am b/cde/programs/dtdspmsg/Makefile.am
index effc68aac..eb8d5b37e 100644
--- a/cde/programs/dtdspmsg/Makefile.am
+++ b/cde/programs/dtdspmsg/Makefile.am
@@ -15,6 +15,6 @@ dtdspmsg_LDADD =
dtdspmsg_CFLAGS = -DNO_XLIB
if SOLARIS
-dtdspmsg_LDADD += -ldl -lgen
+dtdspmsg_LDADD += -lgen
endif
diff --git a/cde/programs/dthello/Makefile.am b/cde/programs/dthello/Makefile.am
index 4f5775685..75b484662 100644
--- a/cde/programs/dthello/Makefile.am
+++ b/cde/programs/dthello/Makefile.am
@@ -5,7 +5,7 @@ bin_PROGRAMS = dthello
dthello_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
if SOLARIS
-dthello_LDADD += -ldl -lgen
+dthello_LDADD += -lgen
endif
if LINUX
diff --git a/cde/programs/dthelp/dthelpprint/Makefile.am b/cde/programs/dthelp/dthelpprint/Makefile.am
index 8dca02139..c493da6e7 100644
--- a/cde/programs/dthelp/dthelpprint/Makefile.am
+++ b/cde/programs/dthelp/dthelpprint/Makefile.am
@@ -10,7 +10,7 @@ dthelpprint_CPPFLAGS = -I.. -I ../../../lib/DtHelp \
dthelpprint_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
if SOLARIS
-dthelpprint_LDADD += -lw -ldl -lgen -lm
+dthelpprint_LDADD += -lw -lgen -lm
endif
dthelpprint_SOURCES = Main.c Initialize.c PrintUtil.c PrintTopics.c \
diff --git a/cde/programs/dticon/Makefile.am b/cde/programs/dticon/Makefile.am
index 7d4356444..2781d2781 100644
--- a/cde/programs/dticon/Makefile.am
+++ b/cde/programs/dticon/Makefile.am
@@ -6,10 +6,6 @@ dticon_CFLAGS = -D__TOOLTALK
dticon_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
-if SOLARIS
-dticon_LDADD += -ldl
-endif
-
dticon_SOURCES = dtIconShell.c event.c event.h fileIO.c fileIO.h \
fileIODialog.c globals.c graphics.c graphics.h \
help.c image.c image.h main.c newIconDialog.c \
diff --git a/cde/programs/dtksh/Makefile.am b/cde/programs/dtksh/Makefile.am
index 07c1d76ff..3d71f6566 100644
--- a/cde/programs/dtksh/Makefile.am
+++ b/cde/programs/dtksh/Makefile.am
@@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
-CLEANFILES = init.c FEATURE DtFuncs.dtsh
+CLEANFILES = init.c DtFuncs.dtsh
SUBDIRS = examples
@@ -31,10 +31,6 @@ dtksh_LDADD = $(DTCLIENTLIBS) ksh93/src/cmd/ksh93/pmain.o $(XTOOLLIB) \
libshell.a $(KSH93SRC)/lib/libcmd.a $(KSH93SRC)/lib/libast.a \
$(KSH93SRC)/lib/libdll.a
-if LINUX
-dtksh_LDADD += -ldl
-endif
-
if SOLARIS
dtksh_LDADD += -lsecdb -lsocket -lnsl
endif
diff --git a/cde/programs/dtlogin/Makefile.am b/cde/programs/dtlogin/Makefile.am
index 38aaab42f..d4ad631f9 100644
--- a/cde/programs/dtlogin/Makefile.am
+++ b/cde/programs/dtlogin/Makefile.am
@@ -88,9 +88,9 @@ endif
if SOLARIS
XBINDIR = /usr/bin/X11
-dtlogin_LDADD += -ldl -lgen -lresolv -lbsm -lcmd
-dtgreet_LDADD += -ldl -lgen -lresolv -lbsm -lcmd
-dtchooser_LDADD += -ldl -lgen -lresolv -lbsm -lcmd
+dtlogin_LDADD += -lgen -lresolv -lbsm -lcmd
+dtgreet_LDADD += -lgen -lresolv -lbsm -lcmd
+dtchooser_LDADD += -lgen -lresolv -lbsm -lcmd
dtlogin_SOURCES += solaris.c
endif
diff --git a/cde/programs/dtpdm/Makefile.am b/cde/programs/dtpdm/Makefile.am
index 178bf1997..5afc7f527 100644
--- a/cde/programs/dtpdm/Makefile.am
+++ b/cde/programs/dtpdm/Makefile.am
@@ -7,7 +7,7 @@ dtpdm_CFLAGS = -DI18N_MSG -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\"
dtpdm_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
if SOLARIS
-dtpdm_LDADD += -lintl -lgen -ldl -lresolv
+dtpdm_LDADD += -lintl -lgen -lresolv
endif
dtpdm_SOURCES = JobBox.c Main.c MainWindow.c PdmMsgs.c PdmOid.c \
diff --git a/cde/programs/dtpdmd/Makefile.am b/cde/programs/dtpdmd/Makefile.am
index 218089810..38c6416a9 100644
--- a/cde/programs/dtpdmd/Makefile.am
+++ b/cde/programs/dtpdmd/Makefile.am
@@ -6,9 +6,5 @@ dtpdmd_CFLAGS = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\"
dtpdmd_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
-if SOLARIS
-dtpdmd_LDADD += -ldl
-endif
-
dtpdmd_SOURCES = dispatch.c dtpdmd.c mailbox.c manager.c records.c \
nlmsg.c setup.c util.c dtpdmdP.h nlmsg.h
diff --git a/cde/programs/dtprintinfo/Makefile.am b/cde/programs/dtprintinfo/Makefile.am
index 104ecc820..3ec53d926 100644
--- a/cde/programs/dtprintinfo/Makefile.am
+++ b/cde/programs/dtprintinfo/Makefile.am
@@ -51,10 +51,6 @@ UI_SRC = UI/DtActions.C UI/DtFindD.h UI/DtProps.C UI/DtSetModList.h \
dtprintinfo_SOURCES = $(UTIL_SRC) $(LIBUI_SRC) $(OBJ_SRC) $(UI_SRC) \
DtPrintinfo.C dtprintinfomsg.h
-if SOLARIS
-dtprintinfo_LDADD += -ldl
-endif
-
# special processing for message files
SYM2NUM_CMD = CPP=$(GENCPP) $(KSH) sym2num
diff --git a/cde/programs/dtscreen/Makefile.am b/cde/programs/dtscreen/Makefile.am
index 083bbfa2a..93e390c09 100644
--- a/cde/programs/dtscreen/Makefile.am
+++ b/cde/programs/dtscreen/Makefile.am
@@ -5,7 +5,7 @@ bin_PROGRAMS = dtscreen
dtscreen_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
if SOLARIS
-dtscreen_LDADD += -ldl -lgen
+dtscreen_LDADD += -lgen
endif
dtscreen_SOURCES = blank.c dtscreen.c flame.c hopalong.c hsbramp.c \
diff --git a/cde/programs/dtsearchpath/dtappg/Makefile.am b/cde/programs/dtsearchpath/dtappg/Makefile.am
index 915c76af3..22f5c54f2 100644
--- a/cde/programs/dtsearchpath/dtappg/Makefile.am
+++ b/cde/programs/dtsearchpath/dtappg/Makefile.am
@@ -7,7 +7,7 @@ dtappgather_CXXFLAGS = -I../libCliSrv $(DT_INCDIR)
dtappgather_LDADD = ../libCliSrv/libCliSrv.a $(DTCLIENTLIBS) $(XTOOLLIB)
if SOLARIS
-dtappgather_LDADD += -ldl -lintl
+dtappgather_LDADD += -lintl
endif
dtappgather_SOURCES = Options.C dtappgather.C dtappgather.h Options.h
diff --git a/cde/programs/dtsearchpath/libCliSrv/Makefile.am b/cde/programs/dtsearchpath/libCliSrv/Makefile.am
index 2d46d4428..f7dc9f87b 100644
--- a/cde/programs/dtsearchpath/libCliSrv/Makefile.am
+++ b/cde/programs/dtsearchpath/libCliSrv/Makefile.am
@@ -6,7 +6,7 @@ libCliSrv_a_CXXFLAGS = $(DT_INCDIR)
if SOLARIS
libCliSrv_a_CXXFLAGS += -DIOSTREAMSWORKS
-libCliSrv_a_LIBADD = -ldl -lintl -lc -ladm
+libCliSrv_a_LIBADD = -lintl -lc -ladm
endif
libCliSrv_a_SOURCES = DirIterator.C Environ.C TTFile.C UnixEnv.C \
diff --git a/cde/programs/dtsession/Makefile.am b/cde/programs/dtsession/Makefile.am
index 83c224cef..bc8830826 100644
--- a/cde/programs/dtsession/Makefile.am
+++ b/cde/programs/dtsession/Makefile.am
@@ -30,12 +30,12 @@ dtsession_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB) $(DTPAMSVCLIB)
if SOLARIS
dtsession_SOURCES += OWsync.c
-dtsession_LDADD += -lelf -ldl
+dtsession_LDADD += -lelf
endif
if LINUX
dtsession_CFLAGS += -DUSE_X11SSEXT
-dtsession_LDADD += $(TIRPCLIB) -lXss -ldl
+dtsession_LDADD += $(TIRPCLIB) -lXss
endif
if BSD
diff --git a/cde/programs/dtspcd/Makefile.am b/cde/programs/dtspcd/Makefile.am
index c0b517af9..f116e56a2 100644
--- a/cde/programs/dtspcd/Makefile.am
+++ b/cde/programs/dtspcd/Makefile.am
@@ -9,7 +9,7 @@ dtspcd_CFLAGS = -DCDE_CONFIGURATION_TOP=\"${prefix}\" \
dtspcd_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
if SOLARIS
-dtspcd_LDADD += -ldl -lgen
+dtspcd_LDADD += -lgen
endif
cfgdir = $(CDE_INSTALLATION_TOP)/config
diff --git a/cde/programs/dtudcexch/Makefile.am b/cde/programs/dtudcexch/Makefile.am
index 0d3359470..6e2513bd5 100644
--- a/cde/programs/dtudcexch/Makefile.am
+++ b/cde/programs/dtudcexch/Makefile.am
@@ -11,7 +11,7 @@ dtudcexch_LDADD = $(LIBSVC) $(LIBTT) $(XTOOLLIB) ${X_LIBS} \
$(FONTEDT_PATH1)/libfal/libfal.a
if SOLARIS
-dtudcexch_LDADD += -ldl -lgen
+dtudcexch_LDADD += -lgen
endif
if FREEBSD
diff --git a/cde/programs/util/dttypes/Makefile.am b/cde/programs/util/dttypes/Makefile.am
index 83d3e758a..d8e2ef5e2 100644
--- a/cde/programs/util/dttypes/Makefile.am
+++ b/cde/programs/util/dttypes/Makefile.am
@@ -5,6 +5,6 @@ bin_PROGRAMS = dttypes
dttypes_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
if SOLARIS
-dttypes_LDADD += -ldl -lgen
+dttypes_LDADD += -lgen
endif
--
2.34.1
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
