X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/90db641cb8c65c8292e7fe7b78dde29302693dd2..f4ed788cf4e6bf263a417eb8d7832c269b7a9db7:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a2ae4332..0f24bbcc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,13 +30,32 @@ ACLOCAL_AMFLAGS		 = -Im4
 SUBDIRS			 =
 
 ###--------------------------------------------------------------------------
-### The main library.
+### Top-level library.
 
 lib_LTLIBRARIES		 = libcatacomb.la
 libcatacomb_la_LDFLAGS	 = -version-info $(LIBTOOL_VERSION_INFO) \
 				-no-undefined
-libcatacomb_la_LIBADD	 = $(MATHLIBS) $(mLib_LIBS)
 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
@@ -75,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::