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/programs/dtcm/dtcm/Makefile.am
View File

@@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
bin_PROGRAMS = dtcm dtcm_delete dtcm_insert dtcm_lookup dtcm_editor
AM_CFLAGS = $(DT_INCDIR) $(CSA_INCDIR) -I../../../lib/csa \
-I../libDtCmP $(TIRPCINC)
-I../libDtCmP
LDADD = ../libDtCmP/libDtCmP.a $(LIBCSA) $(DTCLIENTLIBS) $(XTOOLLIB)

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

@@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
noinst_LIBRARIES = libDtCmP.a
libDtCmP_a_CFLAGS = $(CSA_INCDIR) -I../../../lib/csa -DRFC_MIME \
-DLINE_COUNT -DV2 -DOW_I18N $(TIRPCINC)
-DLINE_COUNT -DV2 -DOW_I18N
if SOLARIS
libDtCmP_a_CFLAGS += -xstrconst -Xc -v

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

@@ -2,9 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in
bin_PROGRAMS = rpc.cmsd
rpc_cmsd_CFLAGS = -I../../../lib/csa $(DT_INCDIR) $(CSA_INCDIR) $(TIRPCINC)
rpc_cmsd_CFLAGS = -I../../../lib/csa $(DT_INCDIR) $(CSA_INCDIR)
rpc_cmsd_LDADD = $(LIBCSA) $(DTCLIENTLIBS) $(XTOOLLIB)
rpc_cmsd_LDADD = $(LIBCSA) $(DTCLIENTLIBS) $(XTOOLLIB)
if SOLARIS
rpc_cmsd_CFLAGS += -xstrconst -Xc -v

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

@@ -2,8 +2,6 @@ MAINTAINERCLEANFILES = Makefile.in
bin_PROGRAMS = dtcreate
dtcreate_CPPFLAGS = $(TIRPCINC)
dtcreate_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
if SOLARIS

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

@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
bin_PROGRAMS = dtexec
dtexec_CFLAGS = $(TIRPCINC) -DMSGLOG_CLIENT_ONLY \
dtexec_CFLAGS = -DMSGLOG_CLIENT_ONLY \
-I../../lib/DtSvc/include
dtexec_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)

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

@@ -11,7 +11,7 @@ dist_config_DATA = dtfile.config
dist_bin_SCRIPTS = dtfile_error
dtfile_CPPFLAGS = -I./dtcopy $(TIRPCINC) -DSHAPE -D_ILS_MACROS -DSUN_PERF \
dtfile_CPPFLAGS = -I./dtcopy -DSHAPE -D_ILS_MACROS -DSUN_PERF \
-DCDE_INSTALLATION_TOP=\"${prefix}\" \
-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
-DKORNSHELL=\"$(KSH)\" -I/usr/include/freetype2

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

@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
bin_PROGRAMS = dtfile_copy
dtfile_copy_CFLAGS = -DSHAPE $(TIRPCINC)
dtfile_copy_CFLAGS = -DSHAPE
if SOLARIS
dtfile_copy_CFLAGS += -xF

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

@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
bin_PROGRAMS = dticon
dticon_CFLAGS = -D__TOOLTALK $(TIRPCINC)
dticon_CFLAGS = -D__TOOLTALK
dticon_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)

2
cde/programs/dtinfo/clients/dtinfo_start/Makefile.am
View File

@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
noinst_PROGRAMS = dtinfo_start
dtinfo_start_CFLAGS = -I. $(TIRPCINC)
dtinfo_start_CFLAGS = -I.
dtinfo_start_LDADD = ${X_LIBS} $(LIBTT) $(LIBSVC) $(XTOOLLIB) -lXm

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

@@ -15,7 +15,7 @@ KSH93LIBSHELL = $(KSH93SRC)/src/cmd/ksh93/libshell.a
bin_PROGRAMS = dtksh
dtksh_CPPFLAGS = -I$(KSH93SRC)/include/ast -I$(KSH93SRC)/src/cmd/ksh93/include \
-I$(KSH93SRC)/src/cmd/ksh93 $(TIRPCINC) -I${srcdir}/lib/DtPrint \
-I$(KSH93SRC)/src/cmd/ksh93 -I${srcdir}/lib/DtPrint \
-I${srcdir}/lib/DtHelp
dtksh_LDADD = $(DTHELPLIB) $(DTWIDGETLIB) $(DTSVCLIB) $(DTPRINTLIB) $(TTLIB) \
-lXm $(XTOOLLIB) ${X_LIB} $(KSH93SRC)/lib/libcmd.a \

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

@@ -15,7 +15,7 @@ AM_CFLAGS = -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
-DCDE_INSTALLATION_TOP=\"${prefix}\" \
-DCDE_LOGFILES_TOP=\"$(CDE_LOGFILES_TOP)\" \
-I/usr/include/freetype2 -DBINDIR=\"$(XBINDIR)\" \
-DXDMDIR=\"$(XDMDIR)\" $(TIRPCINC) \
-DXDMDIR=\"$(XDMDIR)\" \
-DKORNSHELL=$(KSH) -DUNIXCONN -DTCPCONN -DXDMCP
dtlogin_SOURCES = access.c account.c auth.c genauth.c daemon.c dm.c \

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

@@ -2,8 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
noinst_LIBRARIES = libMotifApp.a
libMotifApp_a_CXXFLAGS = -I../include/MotifApp -I../include -I../include/utils \
$(TIRPCINC)
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

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

@@ -4,7 +4,7 @@ bin_PROGRAMS = dtmail
dtmail_CXXFLAGS = -I../include -I../include/MotifApp -I../include/utils \
-I../include/DtMail -I../libDtMail/RFC -I$(x_includes) \
$(TIRPCINC) -I$(srcdir)/lib -I../../dthelp -DRELEASE_NOTES \
-I$(srcdir)/lib -I../../dthelp -DRELEASE_NOTES \
-DDTMAIL_TOOLTALK -DDTEDITOR
dtmail_LDADD = ../libDtMail/libDtMail.a ../MotifApp/libMotifApp.a -lXm \

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

@@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
bin_PROGRAMS = dtmailpr
dtmailpr_CXXFLAGS = -I../include -I../../dtcompat -I../../../. \
-I$(srcdir)/lib $(TIRPCINC)
-I$(srcdir)/lib
dtmailpr_LDADD = ../libDtMail/libDtMail.a @DTCLIENTLIBS@ \
-lXm @LIBXIN@ -lXinerama $(XTOOLLIB) ${X_LIBS} $(TIRPCLIB)

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

@@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
noinst_LIBRARIES = libCommon.a
libCommon_a_CXXFLAGS = -I../../include -I../../include/utils -I$(srcdir)/lib \
$(TIRPCINC) -DDL_NOT_DYNAMIC -DUSE_SOCKSTREAM
-DDL_NOT_DYNAMIC -DUSE_SOCKSTREAM
if SOLARIS
libCommon_a_CXXFLAGS += -DMMAP_NORESERVE -DSPRO_V2

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

@@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
noinst_LIBRARIES = libRFC.a
libRFC_a_CXXFLAGS = -I../Common -I../../include -I../../include/utils \
$(TIRPCINC) -DTTLOCK_OFF
-DTTLOCK_OFF
if SOLARIS
libRFC_a_CXXFLAGS += -DMMAP_NORESERVE -DSPRO_V2

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

@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
bin_PROGRAMS = dtpad
dtpad_CFLAGS = -DDT_LITE -DWORDWRAP -UNLS16 $(TIRPCINC)
dtpad_CFLAGS = -DDT_LITE -DWORDWRAP
dtpad_LDADD = @DTCLIENTLIBS@ -lXm $(TIRPCLIB) $(XTOOLLIB)

2
cde/programs/dtsearchpath/dtsp/Makefile.am
View File

@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
bin_PROGRAMS = dtsearchpath
dtsearchpath_CPPFLAGS = -I../libCliSrv $(DT_INCDIR) $(TIRPCINC)
dtsearchpath_CPPFLAGS = -I../libCliSrv $(DT_INCDIR)
if SOLARIS
dtsearchpath_CPPFLAGS += -DIOSTREAMSWORKS

2
cde/programs/dtsearchpath/libCliSrv/Makefile.am
View File

@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
noinst_LIBRARIES = libCliSrv.a
libCliSrv_a_CXXFLAGS = $(DT_INCDIR) $(TIRPCINC)
libCliSrv_a_CXXFLAGS = $(DT_INCDIR)
if SOLARIS
libCliSrv_a_CXXFLAGS += -DIOSTREAMSWORKS

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

@@ -4,7 +4,7 @@ bin_PROGRAMS = dtsession
dtsession_CFLAGS = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
-Ddtsession $(TIRPCINC)
-Ddtsession
dtsession_SOURCES = SmMain.c SmHelp.c SmGlobals.c SmCommun.c \
SmError.c SmProperty.c SmProtocol.c SmSave.c SmScreen.c \

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

@@ -2,7 +2,7 @@ MAITAINERCLEANFILES = Makefile.in
bin_PROGRAMS = dtspcd
dtspcd_CFLAGS = $(TIRPCINC) -DCDE_CONFIGURATION_TOP=\"${prefix}\" \
dtspcd_CFLAGS = -DCDE_CONFIGURATION_TOP=\"${prefix}\" \
-DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
$(DT_INCDIR)

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) $(TIRPCINC)
-I$(DT_INCDIR)
dtstyle_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)

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

@@ -10,7 +10,7 @@ endif
dtterm_CFLAGS = -I$(top_builddir)/lib/DtTerm/TermPrim \
-I$(top_builddir)/lib/DtTerm/Term \
-I$(top_builddir)/lib/DtTerm/TermView $(TIRPCINC) \
-I$(top_builddir)/lib/DtTerm/TermView \
$(DT_INCDIR) \
-DSUN_TERMINAL_SERVER

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

@@ -8,8 +8,7 @@ CLEANFILES = sys.dtwmrc Dtwm.defs
AM_CPPFLAGS = -DLARGECURSORS -DR2_COMPAT -DOPAQUE -DSHAPE -DUNMAP_ON_RESTART \
-DBATCH_DRAG_REQUESTS -DCDE_INSTALLATION_TOP=\"${prefix}\" \
-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
$(TIRPCINC)
-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
dtwm_LDADD = @DTCLIENTLIBS@ $(TIRPCLIB) -lXm -lXext $(XTOOLLIB)
dtfplist_LDADD = @DTCLIENTLIBS@ $(TIRPCLIB) -lXm -lXext $(XTOOLLIB)