From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 26 May 2016 08:26:09 +0000 (+0100)
Subject: Makefile.am: Some reformatting.
X-Git-Tag: 2.3.0.1~4
X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/commitdiff_plain/f4ed788cf4e6bf263a417eb8d7832c269b7a9db7

Makefile.am: Some reformatting.
---

diff --git a/Makefile.am b/Makefile.am
index f6fa9349..0f24bbcc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,14 +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_SOURCES	 =
 libcatacomb_la_LIBADD	 = $(MATHLIBS) $(PIXIE_LIBS) $(CATACOMB_LIBS) \
 				$(mLib_LIBS)
-libcatacomb_la_SOURCES	 =
+
+###--------------------------------------------------------------------------
+### 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
@@ -76,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::