From bb4a2c7694ec7dff8ffd1baf620b9dc5b5661ca0 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Thu, 24 Oct 2019 20:01:32 -0600 Subject: [PATCH] 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 | 42 ++++++++++--------------- cde/include/cppfile.inc | 7 +++++ cde/lib/tt/bin/dbck/Makefile.am | 2 +- cde/lib/tt/bin/scripts/Makefile.am | 7 ++--- cde/lib/tt/bin/shell/Makefile.am | 2 +- cde/lib/tt/bin/tt_type_comp/Makefile.am | 2 +- cde/lib/tt/bin/ttauth/Makefile.am | 2 +- cde/lib/tt/bin/ttdbserverd/Makefile.am | 2 +- cde/lib/tt/bin/ttsession/Makefile.am | 2 +- cde/lib/tt/bin/tttar/Makefile.am | 2 +- cde/lib/tt/bin/tttrace/Makefile.am | 2 +- cde/lib/tt/lib/Makefile.am | 2 +- 12 files changed, 34 insertions(+), 40 deletions(-) create mode 100644 cde/include/cppfile.inc diff --git a/cde/configure.ac b/cde/configure.ac index 7aecfa3c..9f5f25bd 100644 --- 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 index 00000000..cadbc855 --- /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 c1697211..25d831ae 100644 --- 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 59dafa72..c2b4eeb3 100644 --- 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 72525833..f4ba3886 100644 --- 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 8a05e735..5b0d6358 100644 --- 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 9a40adc1..48b17d3b 100644 --- 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 5b6507b0..1c54e77a 100644 --- 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 b5c24c89..96ba6520 100644 --- 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 40304e67..66bcdc15 100644 --- 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 3be8f31d..356ca95c 100644 --- 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 ef3985ff..f788cf9d 100644 --- 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 -- 2.25.1