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

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