X-Git-Url: https://git.distorted.org.uk/~mdw/checkpath/blobdiff_plain/60538794f1efdac9d84632579e36b61ca58c925c..e0d83cefbc0d0fec6a9e59a97a2191da6d8e61b4:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 42e907d..f4fb2ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,11 +25,32 @@
 
 bin_PROGRAMS		 =
 lib_LTLIBRARIES		 =
+noinst_LIBRARIES	 =
 include_HEADERS		 =
 dist_man_MANS		 =
 
 CLEANFILES		 =
 EXTRA_DIST		 =
+LDADD			 =
+
+###--------------------------------------------------------------------------
+### Programs.
+
+## Common stuff.
+noinst_LIBRARIES	+= libutils.a
+libutils_a_SOURCES	 =
+LDADD			+= libutils.a
+
+libutils_a_SOURCES	+= utils.c
+libutils_a_SOURCES	+= utils.h
+
+## chkpath
+bin_PROGRAMS		+= chkpath
+dist_man_MANS		+= chkpath.1
+
+## tmpdir
+bin_PROGRAMS		+= tmpdir
+dist_man_MANS		+= tmpdir.1
 
 ###--------------------------------------------------------------------------
 ### Library.
@@ -40,6 +61,7 @@ libcheckpath_la_SOURCES	 =
 libcheckpath_la_LDFLAGS	 = -version-info $(LIBTOOL_VERSION_INFO)
 libcheckpath_la_LIBADD	 = $(mLib_LIBS)
 dist_man_MANS		+= checkpath.3
+LDADD			+= libcheckpath.la
 
 libcheckpath_la_SOURCES	+= checkpath.c
 include_HEADERS		+= checkpath.h
@@ -51,24 +73,11 @@ CLEANFILES		+= checkpath.pc
 EXTRA_DIST		+= checkpath.pc.in
 
 checkpath.pc: checkpath.pc.in Makefile
-	$(top_srcdir)/config/confsubst $(srcdir)/checkpath.pc.in >$@.new \
+	$(AM_V_GEN)$(top_srcdir)/config/confsubst \
+		$(srcdir)/checkpath.pc.in >$@.new \
 		prefix=$(prefix) exec_prefix=$(exec_prefix) \
 		libdir=$(libdir) includedir=$(includedir) \
-		VERSION=$(VERSION)
-	mv $@.new $@
-
-###--------------------------------------------------------------------------
-### Programs.
-
-LDADD			 = libcheckpath.la $(mLib_LIBS)
-
-## chkpath
-bin_PROGRAMS		+= chkpath
-dist_man_MANS		+= chkpath.1
-
-## tmpdir
-bin_PROGRAMS		+= tmpdir
-dist_man_MANS		+= tmpdir.1
+		VERSION=$(VERSION) && mv $@.new $@
 
 ###--------------------------------------------------------------------------
 ### Other finishing touches.
@@ -80,6 +89,9 @@ dist-hook::
 ## Build tools.
 EXTRA_DIST		+= config/confsubst
 
+## External libraries.
+LDADD			+= $(mLib_LIBS)
+
 ###--------------------------------------------------------------------------
 ### Debian.
 
@@ -88,6 +100,7 @@ EXTRA_DIST		+= debian/rules
 EXTRA_DIST		+= debian/copyright
 EXTRA_DIST		+= debian/control
 EXTRA_DIST		+= debian/changelog
+EXTRA_DIST		+= debian/compat
 
 ## Library.
 EXTRA_DIST		+= debian/libcheckpath1.install