mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
Remove $(TIRPCINC) from all Makefile.am files - it no longer exists
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
parent
0f1223a07e
commit
c329d5cfd7
43 changed files with 52 additions and 100 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -6,8 +6,6 @@ include ../tooltalk.inc
|
|||
|
||||
lib_LTLIBRARIES = libtt.la
|
||||
|
||||
libtt_la_CFLAGS = $(TIRPCINC)
|
||||
|
||||
if AIX
|
||||
libtt_la_SOURCES = realpath.c
|
||||
else
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ 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)
|
||||
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
|
||||
bin_PROGRAMS = dtcreate
|
||||
|
||||
dtcreate_CPPFLAGS = $(TIRPCINC)
|
||||
|
||||
dtcreate_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
|
||||
|
||||
if SOLARIS
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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,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,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
|
||||
bin_PROGRAMS = dticon
|
||||
|
||||
dticon_CFLAGS = -D__TOOLTALK $(TIRPCINC)
|
||||
dticon_CFLAGS = -D__TOOLTALK
|
||||
|
||||
dticon_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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,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,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,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
|
||||
|
|
|
|||
|
|
@ -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,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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue