From 1079ffa24050b2cc2ae5ab0ddf62bc5b77fa4ca0 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Sat, 26 Oct 2019 14:30:36 -0600 Subject: [PATCH] configure: create some convenience AC_SUBST's for the global includes Modify the various makefiles that were doing $(top_builddir)/include/Dt to use them like @DT_INCDIR@, @TT_INCDIR@, etc... --- cde/configure.ac | 7 +++++++ cde/lib/DtSearch/Makefile.am | 2 +- cde/lib/DtSearch/raima/Makefile.am | 2 +- cde/lib/DtSvc/DtEncap/Makefile.am | 2 +- cde/lib/DtSvc/DtUtil1/Makefile.am | 2 +- cde/lib/DtSvc/DtUtil2/Makefile.am | 2 +- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/cde/configure.ac b/cde/configure.ac index 3d2fe479..3554f829 100644 --- a/cde/configure.ac +++ b/cde/configure.ac @@ -136,6 +136,8 @@ AM_CONDITIONAL([MIPS], [test "is_mips" = yes]) AM_CONDITIONAL([PPC], [test "is_ppc" = yes]) dnl our main libraries +dnl we use single quotes so that $top_builder is evaluated in the makfiles, +dnl not here. 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') @@ -148,6 +150,11 @@ 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 set up come convenience replacements for global include dirs +AC_SUBST(DT_INCDIR, '-I$(top_builddir)/include/Dt') +AC_SUBST(TT_INCDIR, '-I$(top_builddir)/include/Tt') +AC_SUBST(XM_INCDIR, '-I$(top_builddir)/include/Xm') + dnl JET FIXME/CHECKME AC_SUBST(XTOOLLIB, "-lICE -lSM -lXt") diff --git a/cde/lib/DtSearch/Makefile.am b/cde/lib/DtSearch/Makefile.am index 90ed9f72..0adaaad4 100644 --- a/cde/lib/DtSearch/Makefile.am +++ b/cde/lib/DtSearch/Makefile.am @@ -9,7 +9,7 @@ CLEANFILES = boolyac.h boolyac.c AM_YFLAGS = -d libDtSearch_la_CFLAGS = -DI18N_MSG -DMULTIBYTE -I./raima \ - -I$(top_builddir)/include/Dt + @DT_INCDIR@ libDtSearch_la_LIBADD = raima/libraima.la diff --git a/cde/lib/DtSearch/raima/Makefile.am b/cde/lib/DtSearch/raima/Makefile.am index 3daa58dd..a317107e 100644 --- a/cde/lib/DtSearch/raima/Makefile.am +++ b/cde/lib/DtSearch/raima/Makefile.am @@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libraima.la libraima_la_LIBADD = -lc -lm libraima_la_CFLAGS = -DCDE_INSTALLATION_TOP=\"${prefix}\" \ - -I$(top_builddir)/include/Dt \ + @DT_INCDIR@ \ -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \ -DNO_TRANS -DUNIX -D_POSIX_SOURCE -DMULTIBYTE diff --git a/cde/lib/DtSvc/DtEncap/Makefile.am b/cde/lib/DtSvc/DtEncap/Makefile.am index 75e78f72..39946f5a 100644 --- a/cde/lib/DtSvc/DtEncap/Makefile.am +++ b/cde/lib/DtSvc/DtEncap/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LTLIBRARIES = libDtEncap.la libDtEncap_la_CFLAGS = -DMULTIBYTE -I../include -I../DtUtil2 $(TIRPCINC) \ - -I$(top_builddir)/include/Dt \ + @DT_INCDIR@ \ -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \ -DCDE_INSTALLATION_TOP=\"${prefix}\" \ -DCDE_LOGFILES_TOP=\"$(CDE_LOGFILES_TOP)/tmp\" diff --git a/cde/lib/DtSvc/DtUtil1/Makefile.am b/cde/lib/DtSvc/DtUtil1/Makefile.am index 0f93e3e6..d90aa156 100644 --- a/cde/lib/DtSvc/DtUtil1/Makefile.am +++ b/cde/lib/DtSvc/DtUtil1/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LTLIBRARIES = libDtUtil1.la libDtUtil1_la_CFLAGS = -I../include $(TIRPCINC) -DMULTIBYTE \ - -I$(top_builddir)/include/Dt \ + @DT_INCDIR@ \ -DCDE_INSTALLATION_TOP=\"${prefix}\" \ -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" diff --git a/cde/lib/DtSvc/DtUtil2/Makefile.am b/cde/lib/DtSvc/DtUtil2/Makefile.am index 01fda6e3..2b0f0ec1 100644 --- a/cde/lib/DtSvc/DtUtil2/Makefile.am +++ b/cde/lib/DtSvc/DtUtil2/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LTLIBRARIES = libDtUtil2.la libDtUtil2_la_CFLAGS = -I../include $(TIRPCINC) -DMULTIBYTE \ - -I$(top_builddir)/include/Dt \ + @DT_INCDIR@ \ -DCDE_INSTALLATION_TOP=\"${prefix}\" \ -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \ -DMULTIBYTE -DUSE_XINERAMA $(TIRPCINC) -- 2.25.1