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...

diff --git a/cde/configure.ac b/cde/configure.ac
index 3d2fe479d5e0dc702fa08d2dd7e6b004152df7d0..3554f829f9b6acd37dcc9598725f4e0ad38ae117 100644 (file)
--- 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 90ed9f7292fdd6fdd207d96b5f67976146193444..0adaaad45c9e4806d3c0ada44849c72924490003 100644 (file)
--- 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 3daa58ddc1d2104ceb87f91bd95389b0d4bfe0ff..a317107e51af82c7f76d948c00f090929d2a4765 100644 (file)
--- 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 75e78f721348b7c5f99557c088b74efcfd66a43d..39946f5ae101e7d5a35d6b9fbf86d2372b044d49 100644 (file)
--- 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 0f93e3e651db51dc133f2aa0da73c1e6179eb61f..d90aa1563de58922694b8c7af9c48fcd756d2f28 100644 (file)
--- 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 01fda6e3892bd1072c2b10bbbc0e09dbba6955ca..2b0f0ec121365d6c85d1522e94f0409f03b754e1 100644 (file)
--- 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)