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.

diff --git a/cde/configure.ac b/cde/configure.ac
index 7aecfa3c49839fd6f52208dc36fbb22add2dc9d9..9f5f25bd3f41dc57af2e80bb8b87fa9b7bbafda6 100644 (file)
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -110,32 +110,21 @@ AM_CONDITIONAL([SPARC], [test "$is_sparc" = yes])
 AM_CONDITIONAL([MIPS], [test "is_mips" = yes])
 AM_CONDITIONAL([PPC], [test "is_ppc" = yes])
 
-LIBTT="$srcdir/lib/tt/lib/libtt.so.2.1"
-LIBXIN="$srcdir/lib/DtXinerama/libDtXinerama.a"
-LIBWIDGET="$srcdir/lib/DtWidget/libDtWidget.so.2.1"
-LIBTERM="$srcdir/lib/DtTerm/libDtTerm.so.2.1"
-LIBSVC="$srcdir/lib/DtSvc/libDtSvc.so.2.1"
-LIBSEARCH="$srcdir/lib/DtSearch/lbiDtSearch.so.2.1"
-LIBPRINT="$srcdir/lib/DtPrint/libDtPrint.so.2.1"
-LIBMRM="$srcdir/lib/DtMrm/libDtMrm.so.2.1"
-LIBMMDB="$srcdir/lib/DtMmdb/libDtMmdb.so.2.1"
-LIBHELP="$srcdir/lib/DtHelp/libDtHelp.so.2.1"
-LIBCSA="$srcdir/lib/csa/libcsa.so.2.1"
-dnl JET FIXME
-XTOOLLIB="-lICE -lSM -lXt"
-
-AC_SUBST(LIBTT)
-AC_SUBST(LIBXIN)
-AC_SUBST(LIBWIDGET)
-AC_SUBST(LIBTERM)
-AC_SUBST(LIBSVC)
-AC_SUBST(LIBSEARCH)
-AC_SUBST(LIBPRINT)
-AC_SUBST(LIBMRM)
-AC_SUBST(LIBMMDB)
-AC_SUBST(LIBHELP)
-AC_SUBST(LIBCSA)
-AC_SUBST(XTOOLLIB)
+dnl our main libraries
+AC_SUBST(LIBTT, '$(top_builddir)/lib/tt/lib/libtt.la')
+AC_SUBST(LIBXIN, '$(top_builddir)/lib/DtXinerama/libDtXinerama.a')
+AC_SUBST(LIBWIDGET, '$(top_builddir)/lib/DtWidget/libDtWidget.la')
+AC_SUBST(LIBTERM, '$(top_builddir)/lib/DtTerm/libDtTerm.la')
+AC_SUBST(LIBSVC, '$(top_builddir)/lib/DtSvc/libDtSvc.la')
+AC_SUBST(LIBSEARCH, '$(top_builddir)/lib/DtSearch/lbiDtSearch.la')
+AC_SUBST(LIBPRINT, '$(top_builddir)/lib/DtPrint/libDtPrint.la')
+AC_SUBST(LIBMRM, '$(top_builddir)/lib/DtMrm/libDtMrm.la')
+AC_SUBST(LIBMMDB, '$(top_builddir)/lib/DtMmdb/libDtMmdb.la')
+AC_SUBST(LIBHELP, '$(top_builddir)/lib/DtHelp/libDtHelp.la')
+AC_SUBST(LIBCSA, '$(top_builddir)/lib/csa/libcsa.la')
+
+dnl JET FIXME/CHECKME
+AC_SUBST(XTOOLLIB, "-lICE -lSM -lXt")
 
 AC_ARG_ENABLE(japanese, [--build-japanese    Build Japanese (default=no)])
 AM_CONDITIONAL([JAPANESE], [test "build_japanese" = "yes"])
@@ -178,6 +167,7 @@ AC_PROG_AWK
 AC_PROG_GREP
 
 AC_C_CONST
+AC_SYS_POSIX_TERMIOS
 
 AC_PATH_X
 AC_PATH_XTRA

diff --git a/cde/include/cppfile.inc b/cde/include/cppfile.inc
new file mode 100644 (file)
index 0000000..cadbc85
--- /dev/null
+++ b/cde/include/cppfile.inc
@@ -0,0 +1,7 @@
+BUILT_SOURCES = $(CPPTARGET)
+CLEANFILES += $(CPPTARGET)
+
+
+$(CPPTARGET): Makefile $(CPPSRC)
+       $(RM) $@
+       $(CPP) -P -DXCOMM=# $(AM_CPPFLAGS) $(CPPSRC) -o $@

diff --git a/cde/lib/tt/bin/dbck/Makefile.am b/cde/lib/tt/bin/dbck/Makefile.am
index c1697211c4882cbdd22ad341c80ccd315da768c8..25d831aeb045556c682a03ed9668ca5128658f03 100644 (file)
--- a/cde/lib/tt/bin/dbck/Makefile.am
+++ b/cde/lib/tt/bin/dbck/Makefile.am
@@ -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)

diff --git a/cde/lib/tt/bin/scripts/Makefile.am b/cde/lib/tt/bin/scripts/Makefile.am
index 59dafa7291f97cc6197c4876b390d5ed3a1c0c70..c2b4eeb37ae38e7810819f404a35e339601fad1e 100644 (file)
--- a/cde/lib/tt/bin/scripts/Makefile.am
+++ b/cde/lib/tt/bin/scripts/Makefile.am
@@ -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

diff --git a/cde/lib/tt/bin/shell/Makefile.am b/cde/lib/tt/bin/shell/Makefile.am
index 725258336f1d102b0222c2938ee294ec3e4e668f..f4ba388663d73512311d47a01c1dc0de07f35917 100644 (file)
--- a/cde/lib/tt/bin/shell/Makefile.am
+++ b/cde/lib/tt/bin/shell/Makefile.am
@@ -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)

diff --git a/cde/lib/tt/bin/tt_type_comp/Makefile.am b/cde/lib/tt/bin/tt_type_comp/Makefile.am
index 8a05e735513aaa0ff7a9ca6687d775a26f7f1a60..5b0d635842994824207095e88cb56b6cc68b31ff 100644 (file)
--- a/cde/lib/tt/bin/tt_type_comp/Makefile.am
+++ b/cde/lib/tt/bin/tt_type_comp/Makefile.am
@@ -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)

diff --git a/cde/lib/tt/bin/ttauth/Makefile.am b/cde/lib/tt/bin/ttauth/Makefile.am
index 9a40adc19c257850a8ec466742c3c7295253581e..48b17d3b8e8a5e2a75576d38d99d4ed3580d37e5 100644 (file)
--- a/cde/lib/tt/bin/ttauth/Makefile.am
+++ b/cde/lib/tt/bin/ttauth/Makefile.am
@@ -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)

diff --git a/cde/lib/tt/bin/ttdbserverd/Makefile.am b/cde/lib/tt/bin/ttdbserverd/Makefile.am
index 5b6507b033d5bb7c83c06e049097e1f01c2d3858..1c54e77af5a7bf01ba66084b2de4ab8838abcba5 100644 (file)
--- a/cde/lib/tt/bin/ttdbserverd/Makefile.am
+++ b/cde/lib/tt/bin/ttdbserverd/Makefile.am
@@ -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

diff --git a/cde/lib/tt/bin/ttsession/Makefile.am b/cde/lib/tt/bin/ttsession/Makefile.am
index b5c24c89561bc5b0b20d0d00dac89c41e0f1118e..96ba65208897f28ab4319346699042422d218322 100644 (file)
--- a/cde/lib/tt/bin/ttsession/Makefile.am
+++ b/cde/lib/tt/bin/ttsession/Makefile.am
@@ -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)

diff --git a/cde/lib/tt/bin/tttar/Makefile.am b/cde/lib/tt/bin/tttar/Makefile.am
index 40304e67d26243744b63e8a7353f9594ff1573e2..66bcdc1596767dece7ac18166a85b22ccf049864 100644 (file)
--- a/cde/lib/tt/bin/tttar/Makefile.am
+++ b/cde/lib/tt/bin/tttar/Makefile.am
@@ -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)

diff --git a/cde/lib/tt/bin/tttrace/Makefile.am b/cde/lib/tt/bin/tttrace/Makefile.am
index 3be8f31d19d6aeb9fda141ff16d0b988654f977a..356ca95ca518a688e95c3be6c75cbd28defd58a5 100644 (file)
--- a/cde/lib/tt/bin/tttrace/Makefile.am
+++ b/cde/lib/tt/bin/tttrace/Makefile.am
@@ -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)

diff --git a/cde/lib/tt/lib/Makefile.am b/cde/lib/tt/lib/Makefile.am
index ef3985ff5cfb790445cd78bc8692bf6eb8a451aa..f788cf9d57ee55d3bc6f9dd17681a42ef38421b2 100644 (file)
--- a/cde/lib/tt/lib/Makefile.am
+++ b/cde/lib/tt/lib/Makefile.am
@@ -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