X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/18c831dcd0ae4d660c70ccac69d27ed2a97851be..776d2da28318443431563b68c2807eb0c29c49fa:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 66185ee..48f2317 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,9 +32,10 @@ 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	 =
+libmLib_la_LIBADD	 = $(MLIB_LIBS)
 
 ###--------------------------------------------------------------------------
 ### Package-configuration file.
@@ -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 $@
 
 ###--------------------------------------------------------------------------
@@ -98,9 +100,20 @@ libmLib_la_LIBADD	+= test/libtest.la
 SUBDIRS			+= trace
 libmLib_la_LIBADD	+= trace/libtrace.la
 
+###--------------------------------------------------------------------------
+### Testing.
+
+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
@@ -116,9 +129,21 @@ 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
+EXTRA_DIST		+= debian/common.symbols
+
+## mlib2
 EXTRA_DIST		+= debian/mlib2.install
-EXTRA_DIST		+= debian/mlib2-adns.install
-EXTRA_DIST		+= debian/mlib-dev.install
+EXTRA_DIST		+= debian/mlib2.symbols
+
+## mlib2-adns
+EXTRA_DIST		+= debian/mlib2-adns.install.in
+EXTRA_DIST		+= debian/mlib2-adns.symbols
+
+## mlib-bin
 EXTRA_DIST		+= debian/mlib-bin.install
 
+## mlib-dev
+EXTRA_DIST		+= debian/mlib-dev.install
+
 ###----- That's all, folks --------------------------------------------------