X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/eea933cdf237601a44e13006cfcfd3aad7a08349..HEAD:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 777a39dd..7ffaa53c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,12 +30,32 @@ ACLOCAL_AMFLAGS		 = -Im4
 SUBDIRS			 =
 
 ###--------------------------------------------------------------------------
-### The main library.
+### Top-level library.
 
 lib_LTLIBRARIES		 = libcatacomb.la
-libcatacomb_la_LDFLAGS	 = -version-info $(LIBTOOL_VERSION_INFO)
-libcatacomb_la_LIBADD	 = $(MATHLIBS) $(mLib_LIBS)
+libcatacomb_la_LDFLAGS	 = -version-info $(LIBTOOL_VERSION_INFO) \
+				-no-undefined
 libcatacomb_la_SOURCES	 =
+libcatacomb_la_LIBADD	 = $(MATHLIBS) $(PIXIE_LIBS) $(CATACOMB_LIBS) \
+				$(mLib_LIBS)
+
+###--------------------------------------------------------------------------
+### Package-configuration file.
+
+pkgconfigdir		 = $(libdir)/pkgconfig
+pkgconfig_DATA		 = catacomb.pc
+EXTRA_DIST		+= catacomb.pc.in
+CLEANFILES		+= catacomb.pc
+
+catacomb.pc: catacomb.pc.in Makefile
+	$(SUBST) $(srcdir)/catacomb.pc.in >$@.new $(SUBSTITUTIONS) && \
+		mv $@.new $@
+
+###--------------------------------------------------------------------------
+### Subdirectories.
+###
+### Note: There are implicit dependencies between the subdirectories.  Be
+### careful about reordering them.
 
 ## Basic utilities.
 SUBDIRS			+= base
@@ -74,19 +94,7 @@ SUBDIRS			+= .
 SUBDIRS			+= progs
 
 ###--------------------------------------------------------------------------
-### The pkg-config file.
-
-pkgconfigdir		 = $(libdir)/pkgconfig
-pkgconfig_DATA		 = catacomb.pc
-EXTRA_DIST		+= catacomb.pc.in
-CLEANFILES		+= catacomb.pc
-
-catacomb.pc: catacomb.pc.in Makefile
-	$(SUBST) $(srcdir)/catacomb.pc.in >$@.new $(SUBSTITUTIONS) && \
-		mv $@.new $@
-
-###--------------------------------------------------------------------------
-### Release tweaking.
+### Distribution.
 
 ## Release number.
 dist-hook::
@@ -116,6 +124,7 @@ EXTRA_DIST		+= debian/source/format
 
 ## catacomb2
 EXTRA_DIST		+= debian/catacomb2.install
+EXTRA_DIST		+= debian/catacomb2.symbols
 
 ## catacomb-bin
 EXTRA_DIST		+= debian/catacomb-bin.install
@@ -124,6 +133,9 @@ EXTRA_DIST		+= debian/catacomb-bin.postinst
 EXTRA_DIST		+= debian/catacomb-bin.config
 EXTRA_DIST		+= debian/catacomb-bin.templates
 
+## catacomb-data
+EXTRA_DIST		+= debian/catacomb-data.install
+
 ## catacomb-dev
 EXTRA_DIST		+= debian/catacomb-dev.install