debian: Multi-Arch support.

[mLib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c50c505..5b3ddba 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,8 @@ SUBDIRS                        =
 ### Top-level library.
 
 lib_LTLIBRARIES                 = libmLib.la
-libmLib_la_LDFLAGS      = -version-info $(LIBTOOL_VERSION_INFO)
+libmLib_la_LDFLAGS      = -version-info $(LIBTOOL_VERSION_INFO) \
+                               -no-undefined
 libmLib_la_SOURCES      =
 libmLib_la_LIBADD       =
 
@@ -45,7 +46,8 @@ EXTRA_DIST            += mLib.pc.in
 CLEANFILES             += mLib.pc
 
 mLib.pc: mLib.pc.in Makefile
-       $(confsubst) $(srcdir)/mLib.pc.in >$@.new $(SUBSTITUTIONS) && \
+       $(SUBST) $(srcdir)/mLib.pc.in >$@.new \
+               $(SUBSTITUTIONS) && \
                mv $@.new $@
 
 ###--------------------------------------------------------------------------
@@ -106,6 +108,12 @@ SUBDIRS                    += t
 ###--------------------------------------------------------------------------
 ### Distribution.
 
+## Make sure the precomputed tables are available.  Hang this off of any
+## distributed file.
+mLib.pc.in: ensure-precomp-libs
+ensure-precomp-libs:
+       for d in ui utils; do (cd $$d && $(MAKE) all) || exit 1; done
+
 ## Release number.
 dist-hook::
        echo $(VERSION) >$(distdir)/RELEASE
@@ -121,9 +129,18 @@ EXTRA_DIST         += config/maninst
 ## General stuff.
 EXTRA_DIST             += debian/rules debian/copyright
 EXTRA_DIST             += debian/control debian/changelog
+EXTRA_DIST             += debian/compat debian/source/format
+
+## mlib2
 EXTRA_DIST             += debian/mlib2.install
-EXTRA_DIST             += debian/mlib2-adns.install
-EXTRA_DIST             += debian/mlib-dev.install
+
+## mlib2-adns
+EXTRA_DIST             += debian/mlib2-adns.install.in
+
+## mlib-bin
 EXTRA_DIST             += debian/mlib-bin.install
 
+## mlib-dev
+EXTRA_DIST             += debian/mlib-dev.install
+
 ###----- That's all, folks --------------------------------------------------