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.

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"
+dnl our main libraries
-LIBXIN="$srcdir/lib/DtXinerama/libDtXinerama.a"
+AC_SUBST(LIBTT, '$(top_builddir)/lib/tt/lib/libtt.la')
-LIBWIDGET="$srcdir/lib/DtWidget/libDtWidget.so.2.1"
+AC_SUBST(LIBXIN, '$(top_builddir)/lib/DtXinerama/libDtXinerama.a')
-LIBTERM="$srcdir/lib/DtTerm/libDtTerm.so.2.1"
+AC_SUBST(LIBWIDGET, '$(top_builddir)/lib/DtWidget/libDtWidget.la')
-LIBSVC="$srcdir/lib/DtSvc/libDtSvc.so.2.1"
+AC_SUBST(LIBTERM, '$(top_builddir)/lib/DtTerm/libDtTerm.la')
-LIBSEARCH="$srcdir/lib/DtSearch/lbiDtSearch.so.2.1"
+AC_SUBST(LIBSVC, '$(top_builddir)/lib/DtSvc/libDtSvc.la')
-LIBPRINT="$srcdir/lib/DtPrint/libDtPrint.so.2.1"
+AC_SUBST(LIBSEARCH, '$(top_builddir)/lib/DtSearch/lbiDtSearch.la')
-LIBMRM="$srcdir/lib/DtMrm/libDtMrm.so.2.1"
+AC_SUBST(LIBPRINT, '$(top_builddir)/lib/DtPrint/libDtPrint.la')
-LIBMMDB="$srcdir/lib/DtMmdb/libDtMmdb.so.2.1"
+AC_SUBST(LIBMRM, '$(top_builddir)/lib/DtMrm/libDtMrm.la')
-LIBHELP="$srcdir/lib/DtHelp/libDtHelp.so.2.1"
+AC_SUBST(LIBMMDB, '$(top_builddir)/lib/DtMmdb/libDtMmdb.la')
-LIBCSA="$srcdir/lib/csa/libcsa.so.2.1"
+AC_SUBST(LIBHELP, '$(top_builddir)/lib/DtHelp/libDtHelp.la')
-dnl JET FIXME
+AC_SUBST(LIBCSA, '$(top_builddir)/lib/csa/libcsa.la')
-XTOOLLIB="-lICE -lSM -lXt"
 
-AC_SUBST(LIBTT)
+dnl JET FIXME/CHECKME
-AC_SUBST(LIBXIN)
+AC_SUBST(XTOOLLIB, "-lICE -lSM -lXt")
-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)
 
 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

cde/include/cppfile.inc

@@ -0,0 +1,7 @@
+BUILT_SOURCES = $(CPPTARGET)
+CLEANFILES += $(CPPTARGET)
+
+
+$(CPPTARGET): Makefile $(CPPSRC)
+	$(RM) $@
+	$(CPP) -P -DXCOMM=# $(AM_CPPFLAGS) $(CPPSRC) -o $@

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)

cde/lib/tt/bin/scripts/Makefile.am

@@ -4,12 +4,9 @@ include ../../tooltalk.inc
 
 noinst_SCRIPTS = ttce2xdr
 
-ttce2xdr_CPPFLAGS = $(TIRPCINC) $(TT_VERSION_DEFINE)
+AM_CPPFLAGS = $(TIRPCINC) $(TT_VERSION_DEFINE)
-
-all:: ttce2xdr
 
 CPPTARGET = ttce2xdr
 CPPSRC = ttce2xdr.cpp
 
-# FIXME - need solution here
+include $(top_builddir)/include/cppfile.inc
-# include $(srcdir)/include/cppfile.tmpl

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)

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)

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)

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

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)

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)

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)

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