autotools: many fixups, SUN->SOLARIS, typos, etc

This should allow an autoregen and ./confiure to work.  We only
generate Makefiles for lib/* and ./Makefile for now.  We'll ad more as
we go along.

Make still fails as we need to figure out TT - tirpc lib, rpcgen,
etc.  But it's a start!
This commit is contained in:
Jon Trulson
2019-10-23 17:34:55 -06:00
parent 8ed2ce2c26
commit 1d7ed3a17e
25 changed files with 115 additions and 47 deletions

View File

@@ -10,7 +10,7 @@ if LINUX
ttdbck_LDADD += $(TIRPCLIB) $(XTOOLLIB)
endif
if SUN
if SOLARIS
ttdbck_LDADD += $(XTOOLLIB)
endif
@@ -18,7 +18,7 @@ if OPENBSD
ttdbck_LDADD += $(XTOOLLIB)
endif
ttdbck_CXXFLAGS += $(TIRPCINC) -I../../slib -I../../lib -I../../mini_isam \
ttdbck_CXXFLAGS = $(TIRPCINC) -I../../slib -I../../lib -I../../mini_isam \
$(TT_VERSION_DEFINE)
ttdbck_SOURCES = binkey.C binkey_utils.C common.C \

View File

@@ -11,4 +11,5 @@ all:: ttce2xdr
CPPTARGET = ttce2xdr
CPPSRC = ttce2xdr.cpp
include $(srcdir)/include/cppfile.tmpl
# FIXME - need solution here
# include $(srcdir)/include/cppfile.tmpl

View File

@@ -12,7 +12,7 @@ if LINUX
AM_LDADD += $(TIRPCLIB) $(XTOOLLIB)
endif
if SUN
if SOLARIS
AM_LDADD += $(XTOOLLIB) -ldl -lintl -lsocket -lnsl
endif

View File

@@ -13,7 +13,7 @@ if LINUX
tt_type_comp_LDADD += $(TIRPCLIB) $(XTOOLLIB)
endif
if SUN
if SOLARIS
tt_type_comp_LDADD += $(XTOOLLIB) -ldl -lintl -lsocket -lnsl
endif

View File

@@ -10,7 +10,7 @@ if LINUX
ttauth_LDADD += $(TIRPCLIB) $(XTOOLLIB)
endif
if SUN
if SOLARIS
ttauth_LDADD += $(XTOOLLIB) -ldl -lintl -lsocket -lnsl
endif

View File

@@ -12,7 +12,7 @@ if LINUX
rpc_ttdbserver_LDADD += $(TIRPCLIB) $(XTOOLLIB)
endif
if SUN
if SOLARIS
rpc_ttdbserver_LDADD += $(XTOOLLIB) -ldl -lintl -lsocket -lnsl
endif

View File

@@ -12,7 +12,7 @@ if LINUX
ttsession_LDADD += $(TIRPCLIB) $(XTOOLLIB)
endif
if SUN
if SOLARIS
ttsession_LDADD += $(XTOOLLIB) -ldl -lintl -lsocket -lnsl
endif

View File

@@ -10,7 +10,7 @@ if LINUX
tttar_LDADD += $(TIRPCLIB) $(XTOOLLIB)
endif
if SUN
if SOLARIS
tttar_LDADD += $(XTOOLLIB) -ldl -lintl -lsocket -lnsl
endif

View File

@@ -12,7 +12,7 @@ if LINUX
tttrace_LDADD += $(TIRPCLIB) $(XTOOLLIB)
endif
if SUN
if SOLARIS
tttrace_LDADD += $(XTOOLLIB) -ldl -lintl -lsocket -lnsl
endif

View File

@@ -17,8 +17,8 @@ endif
libtt_la_LIBADD = api/c/libapi.la api/dnd/libdnd.la db/libdb.la mp/libmp.la \
tttk/libtttk.la
if SUN
if SOLARIS
libtt_la_LIBADD += -lnsl -lsocket -lintl -ldl -lc -lw
endif
libDtMrm_la_LDFLAGS = -version-info 2:1:0
libtt_la_LDFLAGS = -version-info 2:1:0

View File

@@ -6,7 +6,7 @@ noinst_LTLIBRARIES = libmp.la
libmp_la_CXXFLAGS = $(TIRPCINC) -I../../lib -I../../mini_isam
libmpa_la_SOURCES = mp_arg.C mp_arg_utils.C mp_auth.C \
libmp_la_SOURCES = mp_arg.C mp_arg_utils.C mp_auth.C \
mp_auth_functions.C mp_c_file.C \
mp_c_file_utils.C mp_c_message.C mp_c_message_utils.C \
mp_c_mp.C mp_c_msg_context.C mp_c_msg_context_utils.C \

View File

@@ -25,8 +25,6 @@ XCOMM Enable TIRPC for linux hosts with the option enabled
#ifdef LinuxArchitecture
# if HasTIRPCLib
TIRPC_DEFINES = -DOPT_TIRPC
# else
TIRPC_DEFINES =
# endif
#endif