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

diff --git a/Makefile.am b/Makefile.am
index 4cacfbea..7ffaa53c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,16 +25,37 @@
 ### MA 02111-1307, USA.
 
 include $(top_srcdir)/vars.am
+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	 = $(CATACOMB_LIBS) $(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
@@ -73,28 +94,23 @@ 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::
 	echo $(VERSION) >$(distdir)/RELEASE
 
 ## Additional build tools.
+EXTRA_DIST		+= build-setup
 EXTRA_DIST		+= config/auto-version
 EXTRA_DIST		+= config/confsubst
 
+## Documentation files.
+EXTRA_DIST		+= README.cipher
+EXTRA_DIST		+= README.hash
+EXTRA_DIST		+= README.mp
+EXTRA_DIST		+= README.random
+
 ###--------------------------------------------------------------------------
 ### Debian.
 
@@ -103,11 +119,24 @@ EXTRA_DIST		+= debian/rules
 EXTRA_DIST		+= debian/control
 EXTRA_DIST		+= debian/changelog
 EXTRA_DIST		+= debian/copyright
+EXTRA_DIST		+= debian/compat
+EXTRA_DIST		+= debian/source/format
+
+## catacomb2
+EXTRA_DIST		+= debian/catacomb2.install
+EXTRA_DIST		+= debian/catacomb2.symbols
 
 ## catacomb-bin
+EXTRA_DIST		+= debian/catacomb-bin.install
 EXTRA_DIST		+= debian/catacomb-bin.prerm
 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
+
 ###----- That's all, folks --------------------------------------------------