debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure/Makefiles: add checks for Xmu, Xext, and Xdmcp

Browse Source 
We also remove sun pro specific options, and do some general cleanup
as well as remove hardcoded library refs like -lXm, -lXext, etc...
This commit is contained in:
Jon Trulson
2021-12-21 11:50:20 -07:00
parent 8875a12366
commit e10d06f210
35 changed files with 45 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cde/programs/dtappbuilder/Makefile.am
View File

@@ -1,7 +1,3 @@
MAINTAINERCLEANFILES = Makefile.in
if SOLARIS
.NO_PARALLEL:
endif
SUBDIRS = src

4
cde/programs/dtappbuilder/src/Makefile.am
View File

@@ -1,7 +1,3 @@
MAINTAINERCLEANFILES = Makefile.in
if SOLARIS
.NO_PARALLEL:
endif
SUBDIRS = libAButil libABobj libABobjXm libABil abmf ab

2
cde/programs/dtappbuilder/src/ab/Makefile.am
View File

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

12
cde/programs/dtappbuilder/src/abmf/Makefile.am
View File

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

8
cde/programs/dtappbuilder/src/libABobj/Makefile.am
View File

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

4
cde/programs/dtcm/dtcm/Makefile.am
View File

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

4
cde/programs/dtcm/libDtCmP/Makefile.am
View File

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

1
cde/programs/dtcm/server/Makefile.am
View File

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

3
cde/programs/dtfile/Makefile.am
View File

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

6
cde/programs/dtfile/dtcopy/Makefile.am
View File

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

2
cde/programs/dthello/Makefile.am
View File

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

4
cde/programs/dtimsstart/Makefile.am
View File

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

2
cde/programs/dtinfo/dtinfo/src/Makefile.am
View File

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

8
cde/programs/dtksh/Makefile.am
View File

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

6
cde/programs/dtlogin/Makefile.am
View File

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

20
cde/programs/dtmail/MotifApp/Makefile.am
View File

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

2
cde/programs/dtmail/dtmail/Makefile.am
View File

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

2
cde/programs/dtmail/libDtMail/Common/Makefile.am
View File

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

2
cde/programs/dtmail/libDtMail/RFC/Makefile.am
View File

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

3
cde/programs/dtpad/Makefile.am
View File

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

2
cde/programs/dtsession/Makefile.am
View File

@@ -5,7 +5,7 @@ bin_PROGRAMS = dtsession
bin_SCRIPTS = dtsession_res
if HAS_PAM_LIBRARY
DTPAMSVCLIB = @LIBPAMSVC@
DTPAMSVCLIB = $(LIBPAMSVC)
else
DTPAMSVCLIB =
endif

2
cde/programs/dtstyle/Makefile.am
View File

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

6
cde/programs/dtudcexch/Makefile.am
View File

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

4
cde/programs/dtwm/Makefile.am
View File

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