configure/Makefiles for TT: many fixups
Redo the way the main CDE libs are specified in configure.ac... The current way could not work due to evaluation issues, and the fact that variables like $srcdir and the like are only valid in Makefiles, not configure. Use @LIBNAME@ rather then $(LIBNAME) in Makefile.am files - this way the location is always evaluated when it's run, not in configure - which can't work for a variety of reasons. Got some of the TT binaries to build. Made a new include/cppfile.inc file that can be used to pre-process files. The downside is that currently you can only pre-process one file at a time per Makefile. Something more robust is needed, but at least tt/bin/shell now builds. Will need to come up with a better way.
This commit is contained in:
@@ -4,7 +4,7 @@ include ../../tooltalk.inc
|
||||
|
||||
bin_PROGRAMS = ttdbck
|
||||
|
||||
ttdbck_LDADD = $(LIBTT) $(X_LIBS) ../../slib/libstt.a ../../mini_isam/libisam.a
|
||||
ttdbck_LDADD = @LIBTT@ $(X_LIBS) ../../slib/libstt.a ../../mini_isam/libisam.a
|
||||
|
||||
if LINUX
|
||||
ttdbck_LDADD += $(TIRPCLIB) $(XTOOLLIB)
|
||||
|
||||
@@ -4,12 +4,9 @@ include ../../tooltalk.inc
|
||||
|
||||
noinst_SCRIPTS = ttce2xdr
|
||||
|
||||
ttce2xdr_CPPFLAGS = $(TIRPCINC) $(TT_VERSION_DEFINE)
|
||||
|
||||
all:: ttce2xdr
|
||||
AM_CPPFLAGS = $(TIRPCINC) $(TT_VERSION_DEFINE)
|
||||
|
||||
CPPTARGET = ttce2xdr
|
||||
CPPSRC = ttce2xdr.cpp
|
||||
|
||||
# FIXME - need solution here
|
||||
# include $(srcdir)/include/cppfile.tmpl
|
||||
include $(top_builddir)/include/cppfile.inc
|
||||
|
||||
@@ -6,7 +6,7 @@ bin_PROGRAMS = ttmv ttrm ttcp ttrmdir
|
||||
|
||||
AM_CXXFLAGS = -I../../lib $(TIRPCINC) $(TT_VERSION_DEFINE)
|
||||
|
||||
LDADD = $(LIBTT) $(X_LIBS)
|
||||
LDADD = @LIBTT@ $(X_LIBS)
|
||||
|
||||
if LINUX
|
||||
LDADD += $(TIRPCLIB) $(XTOOLLIB)
|
||||
|
||||
@@ -7,7 +7,7 @@ bin_PROGRAMS = tt_type_comp
|
||||
tt_type_comp_CXXFLAGS = $(TIRPCINC) -I../../lib -I../../slib \
|
||||
$(TT_VERSION_DEFINE)
|
||||
|
||||
tt_type_comp_LDADD = $(LIBTT) $(X_LIBS) ../../slib/libstt.a
|
||||
tt_type_comp_LDADD = @LIBTT@ $(X_LIBS) ../../slib/libstt.a
|
||||
|
||||
if LINUX
|
||||
tt_type_comp_LDADD += $(TIRPCLIB) $(XTOOLLIB)
|
||||
|
||||
@@ -4,7 +4,7 @@ bin_PROGRAMS = ttauth
|
||||
|
||||
ttauth_CFLAGS = -I../../slib -I../../lib -DSIGNALRETURNSINT
|
||||
|
||||
ttauth_LDADD = $(LIBTT) $(X_LIBS)
|
||||
ttauth_LDADD = @LIBTT@ $(X_LIBS)
|
||||
|
||||
if LINUX
|
||||
ttauth_LDADD += $(TIRPCLIB) $(XTOOLLIB)
|
||||
|
||||
@@ -5,7 +5,7 @@ bin_PROGRAMS = rpc.ttdbserver
|
||||
rpc_ttdbserver_CXXFLAGS = -I../../slib -I../../lib -I../../mini_isam \
|
||||
$(TIRPC_DEFINES) $(TIRPCINC) $(TT_VERSION_DEFINE)
|
||||
|
||||
rpc_ttdbserver_LDADD = $(LIBTT) $(X_LIBS) ../../slib/libstt.a \
|
||||
rpc_ttdbserver_LDADD = @LIBTT@ $(X_LIBS) ../../slib/libstt.a \
|
||||
../../mini_isam/libisam.a
|
||||
|
||||
if LINUX
|
||||
|
||||
@@ -6,7 +6,7 @@ bin_PROGRAMS = ttsession
|
||||
|
||||
ttsession_CXXFLAGS = -I../../slib -I../../lib $(TIRPCINC) $(TT_VERSION_DEFINE)
|
||||
|
||||
ttsession_LDADD = $(LIBTT) $(X_LIBS) ../../slib/libstt.a
|
||||
ttsession_LDADD = @LIBTT@ $(X_LIBS) ../../slib/libstt.a
|
||||
|
||||
if LINUX
|
||||
ttsession_LDADD += $(TIRPCLIB) $(XTOOLLIB)
|
||||
|
||||
@@ -4,7 +4,7 @@ bin_PROGRAMS = tttar
|
||||
|
||||
tttar_CXXFLAGS = $(TIRPCINC) -I../../lib $(TT_VERSION_DEFINE)
|
||||
|
||||
tttar_LDADD = $(LIBTT) $(X_LIBS) ../../slib/libstt.a ../../mini_isam/libisam.a
|
||||
tttar_LDADD = @LIBTT@ $(X_LIBS) ../../slib/libstt.a ../../mini_isam/libisam.a
|
||||
|
||||
if LINUX
|
||||
tttar_LDADD += $(TIRPCLIB) $(XTOOLLIB)
|
||||
|
||||
@@ -6,7 +6,7 @@ bin_PROGRAMS = tttrace
|
||||
|
||||
tttrace_CXXFLAGS = $(TIRPCINC) -I../../lib
|
||||
|
||||
tttrace_LDADD = $(LIBTT) $(X_LIBS)
|
||||
tttrace_LDADD = @LIBTT@ $(X_LIBS)
|
||||
|
||||
if LINUX
|
||||
tttrace_LDADD += $(TIRPCLIB) $(XTOOLLIB)
|
||||
|
||||
@@ -15,7 +15,7 @@ libtt_la_SOURCES =
|
||||
endif
|
||||
|
||||
libtt_la_LIBADD = api/c/libapi.la api/dnd/libdnd.la db/libdb.la mp/libmp.la \
|
||||
tttk/libtttk.la
|
||||
util/libutil.la tttk/libtttk.la
|
||||
|
||||
if SOLARIS
|
||||
libtt_la_LIBADD += -lnsl -lsocket -lintl -ldl -lc -lw
|
||||
|
||||
Reference in New Issue
Block a user