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

Remove $(TIRPCINC) from all Makefile.am files - it no longer exists

Browse Source 
Also, restructure some of the dependencies in the lib/tt binaries.  We
will link with libtt (which will include libtirpc as a dependency),
and XTOOLLIB - all the right X11 stuff without needing to add it to
every OS.  Removed several uneeded OS specializations ("if LINUX",
etc) as a result.
This commit is contained in:
Jon Trulson
2019-11-20 18:35:03 -07:00
parent 0f1223a07e
commit c329d5cfd7
43 changed files with 52 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cde/lib/DtSvc/Makefile.am
View File

@@ -6,7 +6,7 @@ libDtSvc_la_LDFLAGS = -version-info 2:1:0
# USe CPPFLAGS so it will apply to both C and C++ components
libDtSvc_la_CPPFLAGS = -I./include -DMULTIBYTE -DNLS16 -I../include \
$(TIRPCINC) @DT_INCDIR@ -DCDE_INSTALLATION_TOP=\"${prefix}\" \
@DT_INCDIR@ -DCDE_INSTALLATION_TOP=\"${prefix}\" \
-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
if SOLARIS

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

@@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in
lib_LTLIBRARIES = libcsa.la
libcsa_la_CFLAGS = -DRFC_MIME -DLINE_COUNT -DV2 -DOW_I18N $(TIRPCINC) \
libcsa_la_CFLAGS = -DRFC_MIME -DLINE_COUNT -DV2 -DOW_I18N \
@CSA_INCDIR@
libcsa_la_LIBADD = -lXt $(TIRPCLIB)

17
cde/lib/tt/bin/dbck/Makefile.am
View File

@@ -4,21 +4,10 @@ include ../../tooltalk.inc
bin_PROGRAMS = ttdbck
ttdbck_LDADD = @LIBTT@ $(X_LIBS) ../../slib/libstt.a ../../mini_isam/libisam.a
ttdbck_LDADD = @LIBTT@ ../../slib/libstt.a ../../mini_isam/libisam.a \
$(XTOOLLIB)
if LINUX
ttdbck_LDADD += $(TIRPCLIB) $(XTOOLLIB)
endif
if SOLARIS
ttdbck_LDADD += $(XTOOLLIB)
endif
if OPENBSD
ttdbck_LDADD += $(XTOOLLIB)
endif
ttdbck_CXXFLAGS = $(TIRPCINC) -I../../slib -I../../lib -I../../mini_isam \
ttdbck_CXXFLAGS = -I../../slib -I../../lib -I../../mini_isam \
$(TT_VERSION_DEFINE)
ttdbck_SOURCES = binkey.C binkey_utils.C common.C \

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

@@ -6,7 +6,7 @@ noinst_SCRIPTS = ttce2xdr
BUILT_SOURCES = ttce2xdr
CLEANFILES = ttce2xdr
AM_CPPFLAGS = $(TIRPCINC) $(TT_VERSION_DEFINE)
AM_CPPFLAGS = $(TT_VERSION_DEFINE)
ttce2xdr: ttce2xdr.cpp

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

@@ -4,20 +4,12 @@ include ../../tooltalk.inc
bin_PROGRAMS = ttmv ttrm ttcp ttrmdir
AM_CXXFLAGS = -I../../lib $(TIRPCINC) $(TT_VERSION_DEFINE)
AM_CXXFLAGS = -I../../lib $(TT_VERSION_DEFINE)
LDADD = @LIBTT@ $(X_LIBS)
if LINUX
LDADD += $(TIRPCLIB) $(XTOOLLIB)
endif
LDADD = @LIBTT@ $(XTOOLLIB)
if SOLARIS
LDADD += $(XTOOLLIB) -ldl -lintl -lsocket -lnsl
endif
if OPENBSD
LDADD += $(XTOOLLIB)
LDADD += -ldl -lintl -lsocket -lnsl
endif
ttmv_SOURCES = ttmv.C mover.C

12
cde/lib/tt/bin/tt_type_comp/Makefile.am
View File

@@ -11,24 +11,16 @@ mp_types_gram.h:
bin_PROGRAMS = tt_type_comp
tt_type_comp_CXXFLAGS = $(TIRPCINC) -I../../lib -I../../slib \
tt_type_comp_CXXFLAGS = -I../../lib -I../../slib \
$(TT_VERSION_DEFINE)
tt_type_comp_SOURCES = mp_type_comp.C mp_types_table.C \
frozen.mp_types_lex.C frozen.mp_types_gram.C
tt_type_comp_LDADD = @LIBTT@ $(X_LIBS) ../../slib/libstt.a
if LINUX
tt_type_comp_LDADD += $(TIRPCLIB) $(XTOOLLIB)
endif
tt_type_comp_LDADD = @LIBTT@ ../../slib/libstt.a $(XTOOLLIB)
if SOLARIS
tt_type_comp_LDADD += $(XTOOLLIB) -ldl -lintl -lsocket -lnsl
endif
if OPENBSD
tt_type_comp_LDADD += $(XTOOLLIB)
endif
frozen.mp_types_lex.o: frozen.mp_types_gram.h

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

@@ -5,7 +5,7 @@ include ../../tooltalk.inc
bin_PROGRAMS = rpc.ttdbserver
rpc_ttdbserver_CXXFLAGS = -I../../slib -I../../lib -I../../mini_isam \
$(TIRPC_DEFINES) $(TIRPCINC) $(TT_VERSION_DEFINE)
$(TIRPC_DEFINES) $(TT_VERSION_DEFINE)
rpc_ttdbserver_LDADD = @LIBTT@ $(X_LIBS) ../../slib/libstt.a \
../../mini_isam/libisam.a

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

@@ -4,7 +4,7 @@ include ../../tooltalk.inc
bin_PROGRAMS = ttsession
ttsession_CXXFLAGS = -I../../slib -I../../lib $(TIRPCINC) $(TT_VERSION_DEFINE)
ttsession_CXXFLAGS = -I../../slib -I../../lib $(TT_VERSION_DEFINE)
ttsession_LDADD = @LIBTT@ $(X_LIBS) ../../slib/libstt.a

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

@@ -4,20 +4,13 @@ include ../../tooltalk.inc
bin_PROGRAMS = tttar
tttar_CXXFLAGS = $(TIRPCINC) -I../../lib $(TT_VERSION_DEFINE)
tttar_CXXFLAGS = -I../../lib $(TT_VERSION_DEFINE)
tttar_LDADD = @LIBTT@ $(X_LIBS) ../../slib/libstt.a ../../mini_isam/libisam.a
if LINUX
tttar_LDADD += $(TIRPCLIB) $(XTOOLLIB)
endif
tttar_LDADD = @LIBTT@ ../../slib/libstt.a ../../mini_isam/libisam.a \
$(XTOOLLIB)
if SOLARIS
tttar_LDADD += $(XTOOLLIB) -ldl -lintl -lsocket -lnsl
endif
if OPENBSD
tttar_LDADD += $(XTOOLLIB)
tttar_LDADD += -ldl -lintl -lsocket -lnsl
endif
tttar_SOURCES = tttar.C \

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

@@ -4,20 +4,12 @@ include ../../tooltalk.inc
bin_PROGRAMS = tttrace
tttrace_CXXFLAGS = $(TIRPCINC) -I../../lib
tttrace_CXXFLAGS = -I../../lib
tttrace_LDADD = @LIBTT@ $(X_LIBS)
if LINUX
tttrace_LDADD += $(TIRPCLIB) $(XTOOLLIB)
endif
tttrace_LDADD = @LIBTT@ $(XTOOLLIB)
if SOLARIS
tttrace_LDADD += $(XTOOLLIB) -ldl -lintl -lsocket -lnsl
endif
if OPENBSD
tttrace_LDADD += $(XTOOLLIB)
tttrace_LDADD += -ldl -lintl -lsocket -lnsl
endif
tttrace_SOURCES = tttrace.C tttrace_objs.C

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

@@ -6,8 +6,6 @@ include ../tooltalk.inc
lib_LTLIBRARIES = libtt.la
libtt_la_CFLAGS = $(TIRPCINC)
if AIX
libtt_la_SOURCES = realpath.c
else

2
cde/lib/tt/lib/api/c/Makefile.am
View File

@@ -6,7 +6,7 @@ include ../../../tooltalk.inc
noinst_LTLIBRARIES = libapi.la
libapi_la_CXXFLAGS = $(TIRPCINC) -I../../../lib
libapi_la_CXXFLAGS = -I../../../lib
libapi_la_SOURCES = api_api.C api_auth.C \
api_default.C api_error.C \

2
cde/lib/tt/lib/api/dnd/Makefile.am
View File

@@ -4,6 +4,6 @@ include ../../../tooltalk.inc
noinst_LTLIBRARIES = libdnd.la
libdnd_la_CFLAGS = $(TIRPCINC) -I../..
libdnd_la_CFLAGS = -I../..
libdnd_la_SOURCES = ttdnd.c

2
cde/lib/tt/lib/db/Makefile.am
View File

@@ -4,7 +4,7 @@ include ../../tooltalk.inc
noinst_LTLIBRARIES = libdb.la
libdb_la_CXXFLAGS = $(TIRPCINC) -I../../lib -I../../mini_isam
libdb_la_CXXFLAGS = -I../../lib -I../../mini_isam
libdb_la_SOURCES = db_server_clnt.C db_server_xdr.C \
old_db_server_functions.C tt_client_isam_file.C \

2
cde/lib/tt/lib/mp/Makefile.am
View File

@@ -4,7 +4,7 @@ include ../../tooltalk.inc
noinst_LTLIBRARIES = libmp.la
libmp_la_CXXFLAGS = $(TIRPCINC) -I../../lib -I../../mini_isam
libmp_la_CXXFLAGS = -I../../lib -I../../mini_isam
libmp_la_SOURCES = mp_arg.C mp_arg_utils.C mp_auth.C \
mp_auth_functions.C mp_c_file.C \

2
cde/lib/tt/lib/tttk/Makefile.am
View File

@@ -6,7 +6,7 @@ include ../../tooltalk.inc
noinst_LTLIBRARIES = libtttk.la
libtttk_la_CXXFLAGS = $(TIRPCINC) $(TT_VERSION_DEFINE) -I../ -I../../lib
libtttk_la_CXXFLAGS = $(TT_VERSION_DEFINE) -I../ -I../../lib
libtttk_la_SOURCES = ttdesktop.C ttdtfile.C ttdtprocid.C \
ttmedia.C tttk.C tttk2free.C \

2
cde/lib/tt/lib/util/Makefile.am
View File

@@ -4,7 +4,7 @@ include ../../tooltalk.inc
noinst_LTLIBRARIES = libutil.la
libutil_la_CXXFLAGS = $(TIRPCINC) $(TT_VERSION_DEFINE) -I../../lib
libutil_la_CXXFLAGS = $(TT_VERSION_DEFINE) -I../../lib
libutil_la_SOURCES = copyright.C tt_map_entry_utils.C \
tt_Xlib.C tt_new.C \

2
cde/lib/tt/mini_isam/Makefile.am
View File

@@ -4,7 +4,7 @@ include ../tooltalk.inc
noinst_LIBRARIES= libisam.a
libisam_a_CFLAGS = $(TIRPCINC) $(TT_VERSION_DEFINE)
libisam_a_CFLAGS = $(TT_VERSION_DEFINE)
libisam_a_SOURCES = isaddindex.c isamaddindex.c isopen.c isamopen.c \
isdelcurr.c isdelrec.c isamdelrec.c isbuild.c \

2
cde/lib/tt/slib/Makefile.am
View File

@@ -4,7 +4,7 @@ include ../tooltalk.inc
noinst_LIBRARIES = libstt.a
libstt_a_CXXFLAGS = $(TIRPCINC) $(TIRPC_DEFINES) -I../lib
libstt_a_CXXFLAGS = $(TIRPC_DEFINES) -I../lib
libstt_a_SOURCES = mp_ce_attrs.C mp_observer.C mp_observer_utils.C \
mp_otype.C mp_otype_utils.C mp_ptype.C \