diff --git a/cde/lib/DtSvc/Makefile.am b/cde/lib/DtSvc/Makefile.am index 6f289be3c..65890aa7a 100644 --- a/cde/lib/DtSvc/Makefile.am +++ b/cde/lib/DtSvc/Makefile.am @@ -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 diff --git a/cde/lib/csa/Makefile.am b/cde/lib/csa/Makefile.am index 05160c4c9..c255667c7 100644 --- a/cde/lib/csa/Makefile.am +++ b/cde/lib/csa/Makefile.am @@ -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) diff --git a/cde/lib/tt/bin/dbck/Makefile.am b/cde/lib/tt/bin/dbck/Makefile.am index 25d831aeb..30308e08f 100644 --- a/cde/lib/tt/bin/dbck/Makefile.am +++ b/cde/lib/tt/bin/dbck/Makefile.am @@ -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 \ diff --git a/cde/lib/tt/bin/scripts/Makefile.am b/cde/lib/tt/bin/scripts/Makefile.am index 96cf914d5..490104a5d 100644 --- a/cde/lib/tt/bin/scripts/Makefile.am +++ b/cde/lib/tt/bin/scripts/Makefile.am @@ -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 diff --git a/cde/lib/tt/bin/shell/Makefile.am b/cde/lib/tt/bin/shell/Makefile.am index f4ba38866..429f7530e 100644 --- a/cde/lib/tt/bin/shell/Makefile.am +++ b/cde/lib/tt/bin/shell/Makefile.am @@ -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 diff --git a/cde/lib/tt/bin/tt_type_comp/Makefile.am b/cde/lib/tt/bin/tt_type_comp/Makefile.am index 25e3915d6..8b9c0b17e 100644 --- a/cde/lib/tt/bin/tt_type_comp/Makefile.am +++ b/cde/lib/tt/bin/tt_type_comp/Makefile.am @@ -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 diff --git a/cde/lib/tt/bin/ttdbserverd/Makefile.am b/cde/lib/tt/bin/ttdbserverd/Makefile.am index b11842629..f30262bc9 100644 --- a/cde/lib/tt/bin/ttdbserverd/Makefile.am +++ b/cde/lib/tt/bin/ttdbserverd/Makefile.am @@ -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 diff --git a/cde/lib/tt/bin/ttsession/Makefile.am b/cde/lib/tt/bin/ttsession/Makefile.am index 96ba65208..ad23a7bc5 100644 --- a/cde/lib/tt/bin/ttsession/Makefile.am +++ b/cde/lib/tt/bin/ttsession/Makefile.am @@ -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 diff --git a/cde/lib/tt/bin/tttar/Makefile.am b/cde/lib/tt/bin/tttar/Makefile.am index 48b64b31e..17032872b 100644 --- a/cde/lib/tt/bin/tttar/Makefile.am +++ b/cde/lib/tt/bin/tttar/Makefile.am @@ -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 \ diff --git a/cde/lib/tt/bin/tttrace/Makefile.am b/cde/lib/tt/bin/tttrace/Makefile.am index 356ca95ca..8584a807e 100644 --- a/cde/lib/tt/bin/tttrace/Makefile.am +++ b/cde/lib/tt/bin/tttrace/Makefile.am @@ -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 diff --git a/cde/lib/tt/lib/Makefile.am b/cde/lib/tt/lib/Makefile.am index 52bcc2974..ebb9eeebc 100644 --- a/cde/lib/tt/lib/Makefile.am +++ b/cde/lib/tt/lib/Makefile.am @@ -6,8 +6,6 @@ include ../tooltalk.inc lib_LTLIBRARIES = libtt.la -libtt_la_CFLAGS = $(TIRPCINC) - if AIX libtt_la_SOURCES = realpath.c else diff --git a/cde/lib/tt/lib/api/c/Makefile.am b/cde/lib/tt/lib/api/c/Makefile.am index 67b1a470a..55dbfd359 100644 --- a/cde/lib/tt/lib/api/c/Makefile.am +++ b/cde/lib/tt/lib/api/c/Makefile.am @@ -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 \ diff --git a/cde/lib/tt/lib/api/dnd/Makefile.am b/cde/lib/tt/lib/api/dnd/Makefile.am index 523b01ea4..13fc308b6 100644 --- a/cde/lib/tt/lib/api/dnd/Makefile.am +++ b/cde/lib/tt/lib/api/dnd/Makefile.am @@ -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 diff --git a/cde/lib/tt/lib/db/Makefile.am b/cde/lib/tt/lib/db/Makefile.am index 77595c0aa..47701fe2e 100644 --- a/cde/lib/tt/lib/db/Makefile.am +++ b/cde/lib/tt/lib/db/Makefile.am @@ -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 \ diff --git a/cde/lib/tt/lib/mp/Makefile.am b/cde/lib/tt/lib/mp/Makefile.am index 16f71fc7e..33189b540 100644 --- a/cde/lib/tt/lib/mp/Makefile.am +++ b/cde/lib/tt/lib/mp/Makefile.am @@ -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 \ diff --git a/cde/lib/tt/lib/tttk/Makefile.am b/cde/lib/tt/lib/tttk/Makefile.am index 8540371ac..0a11019a5 100644 --- a/cde/lib/tt/lib/tttk/Makefile.am +++ b/cde/lib/tt/lib/tttk/Makefile.am @@ -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 \ diff --git a/cde/lib/tt/lib/util/Makefile.am b/cde/lib/tt/lib/util/Makefile.am index 523f955f3..db05b9498 100644 --- a/cde/lib/tt/lib/util/Makefile.am +++ b/cde/lib/tt/lib/util/Makefile.am @@ -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 \ diff --git a/cde/lib/tt/mini_isam/Makefile.am b/cde/lib/tt/mini_isam/Makefile.am index a8a8901c8..244fa668f 100644 --- a/cde/lib/tt/mini_isam/Makefile.am +++ b/cde/lib/tt/mini_isam/Makefile.am @@ -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 \ diff --git a/cde/lib/tt/slib/Makefile.am b/cde/lib/tt/slib/Makefile.am index 6c95a072f..a6499ca01 100644 --- a/cde/lib/tt/slib/Makefile.am +++ b/cde/lib/tt/slib/Makefile.am @@ -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 \ diff --git a/cde/programs/dtcm/dtcm/Makefile.am b/cde/programs/dtcm/dtcm/Makefile.am index 0bf7ecf7a..7a616ba6d 100644 --- a/cde/programs/dtcm/dtcm/Makefile.am +++ b/cde/programs/dtcm/dtcm/Makefile.am @@ -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) diff --git a/cde/programs/dtcm/libDtCmP/Makefile.am b/cde/programs/dtcm/libDtCmP/Makefile.am index 21e559990..bd9bebd84 100644 --- a/cde/programs/dtcm/libDtCmP/Makefile.am +++ b/cde/programs/dtcm/libDtCmP/Makefile.am @@ -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 diff --git a/cde/programs/dtcm/server/Makefile.am b/cde/programs/dtcm/server/Makefile.am index ced8dc0e1..6b5617866 100644 --- a/cde/programs/dtcm/server/Makefile.am +++ b/cde/programs/dtcm/server/Makefile.am @@ -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 diff --git a/cde/programs/dtcreate/Makefile.am b/cde/programs/dtcreate/Makefile.am index 0739f1008..b5b3c5c2a 100644 --- a/cde/programs/dtcreate/Makefile.am +++ b/cde/programs/dtcreate/Makefile.am @@ -2,8 +2,6 @@ MAINTAINERCLEANFILES = Makefile.in bin_PROGRAMS = dtcreate -dtcreate_CPPFLAGS = $(TIRPCINC) - dtcreate_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB) if SOLARIS diff --git a/cde/programs/dtexec/Makefile.am b/cde/programs/dtexec/Makefile.am index 75c6ad18c..3a4878e6e 100644 --- a/cde/programs/dtexec/Makefile.am +++ b/cde/programs/dtexec/Makefile.am @@ -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) diff --git a/cde/programs/dtfile/Makefile.am b/cde/programs/dtfile/Makefile.am index 30bd7a8b3..2ce5f4749 100644 --- a/cde/programs/dtfile/Makefile.am +++ b/cde/programs/dtfile/Makefile.am @@ -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 diff --git a/cde/programs/dtfile/dtcopy/Makefile.am b/cde/programs/dtfile/dtcopy/Makefile.am index 817ab7e6b..c3d33fbeb 100644 --- a/cde/programs/dtfile/dtcopy/Makefile.am +++ b/cde/programs/dtfile/dtcopy/Makefile.am @@ -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 diff --git a/cde/programs/dticon/Makefile.am b/cde/programs/dticon/Makefile.am index f316ad73f..925c1c215 100644 --- a/cde/programs/dticon/Makefile.am +++ b/cde/programs/dticon/Makefile.am @@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in bin_PROGRAMS = dticon -dticon_CFLAGS = -D__TOOLTALK $(TIRPCINC) +dticon_CFLAGS = -D__TOOLTALK dticon_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB) diff --git a/cde/programs/dtinfo/clients/dtinfo_start/Makefile.am b/cde/programs/dtinfo/clients/dtinfo_start/Makefile.am index 53469edfb..8f0810741 100644 --- a/cde/programs/dtinfo/clients/dtinfo_start/Makefile.am +++ b/cde/programs/dtinfo/clients/dtinfo_start/Makefile.am @@ -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 diff --git a/cde/programs/dtksh/Makefile.am b/cde/programs/dtksh/Makefile.am index 1aa9c32e0..001512ae1 100644 --- a/cde/programs/dtksh/Makefile.am +++ b/cde/programs/dtksh/Makefile.am @@ -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 \ diff --git a/cde/programs/dtlogin/Makefile.am b/cde/programs/dtlogin/Makefile.am index f2bd810fe..caa086eba 100644 --- a/cde/programs/dtlogin/Makefile.am +++ b/cde/programs/dtlogin/Makefile.am @@ -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 \ diff --git a/cde/programs/dtmail/MotifApp/Makefile.am b/cde/programs/dtmail/MotifApp/Makefile.am index 047f71675..c77f7b7b1 100644 --- a/cde/programs/dtmail/MotifApp/Makefile.am +++ b/cde/programs/dtmail/MotifApp/Makefile.am @@ -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 diff --git a/cde/programs/dtmail/dtmail/Makefile.am b/cde/programs/dtmail/dtmail/Makefile.am index 3128f6bad..29c68b141 100644 --- a/cde/programs/dtmail/dtmail/Makefile.am +++ b/cde/programs/dtmail/dtmail/Makefile.am @@ -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 \ diff --git a/cde/programs/dtmail/dtmailpr/Makefile.am b/cde/programs/dtmail/dtmailpr/Makefile.am index 090dae2f6..bd939802e 100644 --- a/cde/programs/dtmail/dtmailpr/Makefile.am +++ b/cde/programs/dtmail/dtmailpr/Makefile.am @@ -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) diff --git a/cde/programs/dtmail/libDtMail/Common/Makefile.am b/cde/programs/dtmail/libDtMail/Common/Makefile.am index 15270519a..2098dd808 100644 --- a/cde/programs/dtmail/libDtMail/Common/Makefile.am +++ b/cde/programs/dtmail/libDtMail/Common/Makefile.am @@ -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 diff --git a/cde/programs/dtmail/libDtMail/RFC/Makefile.am b/cde/programs/dtmail/libDtMail/RFC/Makefile.am index 8e185cf1c..df15c2041 100644 --- a/cde/programs/dtmail/libDtMail/RFC/Makefile.am +++ b/cde/programs/dtmail/libDtMail/RFC/Makefile.am @@ -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 diff --git a/cde/programs/dtpad/Makefile.am b/cde/programs/dtpad/Makefile.am index b87aa4846..03adbe52a 100644 --- a/cde/programs/dtpad/Makefile.am +++ b/cde/programs/dtpad/Makefile.am @@ -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) diff --git a/cde/programs/dtsearchpath/dtsp/Makefile.am b/cde/programs/dtsearchpath/dtsp/Makefile.am index 2cb891438..52e42722a 100644 --- a/cde/programs/dtsearchpath/dtsp/Makefile.am +++ b/cde/programs/dtsearchpath/dtsp/Makefile.am @@ -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 diff --git a/cde/programs/dtsearchpath/libCliSrv/Makefile.am b/cde/programs/dtsearchpath/libCliSrv/Makefile.am index f4b1a5439..2d46d4428 100644 --- a/cde/programs/dtsearchpath/libCliSrv/Makefile.am +++ b/cde/programs/dtsearchpath/libCliSrv/Makefile.am @@ -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 diff --git a/cde/programs/dtsession/Makefile.am b/cde/programs/dtsession/Makefile.am index 72cbeff41..54ee02734 100644 --- a/cde/programs/dtsession/Makefile.am +++ b/cde/programs/dtsession/Makefile.am @@ -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 \ diff --git a/cde/programs/dtspcd/Makefile.am b/cde/programs/dtspcd/Makefile.am index f6caf7c29..d054eae91 100644 --- a/cde/programs/dtspcd/Makefile.am +++ b/cde/programs/dtspcd/Makefile.am @@ -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) diff --git a/cde/programs/dtstyle/Makefile.am b/cde/programs/dtstyle/Makefile.am index a794a37cb..11c826eca 100644 --- a/cde/programs/dtstyle/Makefile.am +++ b/cde/programs/dtstyle/Makefile.am @@ -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) diff --git a/cde/programs/dtterm/Makefile.am b/cde/programs/dtterm/Makefile.am index fe3dc23c3..fd290794d 100644 --- a/cde/programs/dtterm/Makefile.am +++ b/cde/programs/dtterm/Makefile.am @@ -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 diff --git a/cde/programs/dtwm/Makefile.am b/cde/programs/dtwm/Makefile.am index 239a39ecf..6f63b3cdc 100644 --- a/cde/programs/dtwm/Makefile.am +++ b/cde/programs/dtwm/Makefile.am @@ -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)