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/lib/DtPrint/Makefile.am
View File

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

8
cde/lib/DtSearch/raima/Makefile.am
View File

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

6
cde/lib/DtTerm/TermPrim/Makefile.am
View File

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

15
cde/lib/csa/Makefile.am
View File

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

2
cde/lib/tt/bin/shell/Makefile.am
View File

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

2
cde/lib/tt/bin/ttdbserverd/Makefile.am
View File

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

2
cde/lib/tt/bin/ttsession/Makefile.am
View File

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

2
cde/lib/tt/bin/tttar/Makefile.am
View File

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

2
cde/lib/tt/bin/tttrace/Makefile.am
View File

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

10
cde/lib/tt/lib/Makefile.am
View File

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