X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/a0150d8deebfda4b52190738dd65c3d0f27d5756..e11cc637d79ffc9117d637489da7f75db7193bc4:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5c0fd2b..5e7f7fd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,7 @@ pkglibexecdir		 = $(libexecdir)/$(PACKAGE)
 SUBDIRS			 =
 BUILT_SOURCES		 =
 bin_PROGRAMS		 =
-noinst_PROGRAMS		 =
+check_PROGRAMS		 =
 lib_LTLIBRARIES		 =
 noinst_LTLIBRARIES	 =
 pkglibexec_PROGRAMS	 =
@@ -37,6 +37,8 @@ pkginclude_HEADERS	 =
 EXTRA_DIST		 =
 CLEANFILES		 =
 DISTCLEANFILES		 =
+PROGMANS		 =
+LIBMANS			 =
 
 confsubst		 = $(top_srcdir)/config/confsubst
 
@@ -83,18 +85,21 @@ libmLib_la_LIBADD	+= libutils.la
 
 ## Utility macros.
 pkginclude_HEADERS	+= macros.h
+LIBMANS			+= macros.3
 
 ## Alignment.
 pkginclude_HEADERS	+= align.h
+LIBMANS			+= align.3
 
 ## Bit manipulation.
 pkginclude_HEADERS	+= bits.h
+LIBMANS			+= bits.3
 
 EXTRA_DIST		+= bits.in bits-testgen.c
 tests:: bits.t bits.in
 	./bits.t -f $(srcdir)/bits.in
 
-noinst_PROGRAMS		+= bits.t
+check_PROGRAMS		+= bits.t
 bits_t_SOURCES		 = bits.c
 bits_t_CPPFLAGS		 = $(TEST_CPPFLAGS)
 bits_t_LDFLAGS		 = -static
@@ -102,20 +107,23 @@ bits_t_LDFLAGS		 = -static
 ## Exceptions.
 pkginclude_HEADERS	+= exc.h
 libmLib_la_SOURCES	+= exc.c
+LIBMANS			+= exc.3
 
 ## String handling.
 pkginclude_HEADERS	+= str.h
 libutils_la_SOURCES	+= str.c
+LIBMANS			+= str.3
 
 ## Version comparison.
 pkginclude_HEADERS	+= versioncmp.h
 libmLib_la_SOURCES	+= versioncmp.c
+LIBMANS			+= versioncmp.3
 
 EXTRA_DIST		+= versioncmp.in
 tests:: versioncmp.t versioncmp.in
 	./versioncmp.t -f $(srcdir)/versioncmp.in
 
-noinst_PROGRAMS		+= versioncmp.t
+check_PROGRAMS		+= versioncmp.t
 versioncmp_t_SOURCES	 = versioncmp-test.c
 versioncmp_t_CPPFLAGS	 = $(TEST_CPPFLAGS)
 versioncmp_t_LDFLAGS	 = -static
@@ -126,10 +134,12 @@ versioncmp_t_LDFLAGS	 = -static
 ## Memory allocation.
 pkginclude_HEADERS	+= alloc.h arena.h sub.h
 libmLib_la_SOURCES	+= alloc.c arena.c sub.c
+LIBMANS			+= alloc.3 arena.3 sub.3
 
 ## Pool allocator.
 pkginclude_HEADERS	+= pool.h
 libmLib_la_SOURCES	+= pool.c pool-file.c pool-sub.c
+LIBMANS			+= pool.3
 
 ###--------------------------------------------------------------------------
 ### Hashing.
@@ -137,10 +147,12 @@ libmLib_la_SOURCES	+= pool.c pool-file.c pool-sub.c
 ## CRC32.
 pkginclude_HEADERS	+= crc32.h
 libmLib_la_SOURCES	+= crc32.c crc32-tab.c
+LIBMANS			+= crc32.3
 
 bin_PROGRAMS		+= crc-mktab
 crc_mktab_SOURCES	 = crc-mktab.c $(UTIL_SOURCES)
 crc_mktab_LDADD		 = libutils.la
+PROGMANS		+= crc-mktab.1
 
 BUILT_SOURCES		+= crc32-tab.c
 CLEANFILES		+= crc32-tab.c
@@ -155,10 +167,12 @@ pkginclude_HEADERS	+= unihash.h
 libutils_la_SOURCES	+= unihash.c
 libmLib_la_SOURCES	+= unihash-global.c
 BUILT_SOURCES		+= unihash-global.c
+LIBMANS			+= unihash.3
 
 bin_PROGRAMS		+= unihash-mkstatic
 unihash_mkstatic_SOURCES = unihash-mkstatic.c
 unihash_mkstatic_LDADD	 = libutils.la
+PROGMANS		+= unihash-mkstatic.1
 
 BUILT_SOURCES		+= unihash-global.c
 CLEANFILES		+= unihash-global.c
@@ -166,7 +180,7 @@ unihash-global.c: unihash-mkstatic$(EXEEXT)
 	./unihash-mkstatic -c -sunihash_global -iunihash.h -o$@.new && \
 		mv $@.new $@
 
-noinst_PROGRAMS		+= unihash.t
+check_PROGRAMS		+= unihash.t
 unihash_t_SOURCES	 = unihash.c
 unihash_t_CPPFLAGS	 = $(TEST_CPPFLAGS)
 unihash_t_LDFLAGS	 = -static
@@ -185,14 +199,17 @@ unihash.in: unihash-check.pl
 ## Dynamic strings.
 pkginclude_HEADERS	+= dstr.h dspool.h
 libmLib_la_SOURCES	+= dstr.c dputf.c dspool.c
+LIBMANS			+= dstr.3 dspool.3
 
 ## Buffers.
 pkginclude_HEADERS	+= buf.h
 libmLib_la_SOURCES	+= buf.c buf-dstr.c
+LIBMANS			+= buf.3
 
 ## Dynamic arrays.
 pkginclude_HEADERS	+= darray.h
 libmLib_la_SOURCES	+= darray.c
+LIBMANS			+= darray.3
 
 CLEANFILES		+= da.out
 tests:: darray.t da.in da.ref
@@ -200,7 +217,7 @@ tests:: darray.t da.in da.ref
 	cmp da.out da.ref
 	@echo "darray OK"
 
-noinst_PROGRAMS		+= darray.t
+check_PROGRAMS		+= darray.t
 darray_t_SOURCES	 = da-test.c
 darray_t_CPPFLAGS	 = $(TEST_CPPFLAGS)
 darray_t_LDFLAGS	 = -static
@@ -218,10 +235,12 @@ da.ref: da-ref da.in
 ## Hash tables.
 pkginclude_HEADERS	+= hash.h
 libmLib_la_SOURCES	+= hash.c
+LIBMANS			+= hash.3
 
 ## Symbol tables.
 pkginclude_HEADERS	+= sym.h
 libmLib_la_SOURCES	+= sym.c
+LIBMANS			+= sym.3
 
 CLEANFILES		+= sym.out
 tests:: sym.t sym.in sym.ref
@@ -229,7 +248,7 @@ tests:: sym.t sym.in sym.ref
 	cmp sym.out sym.ref
 	@echo "sym OK"
 
-noinst_PROGRAMS		+= sym.t
+check_PROGRAMS		+= sym.t
 sym_t_SOURCES		 = sym-test.c
 sym_t_CPPFLAGS		 = $(TEST_CPPFLAGS)
 sym_t_LDFLAGS		 = -static
@@ -247,10 +266,12 @@ sym.ref: sym-ref sym.in
 ## Atoms.
 pkginclude_HEADERS	+= atom.h
 libmLib_la_SOURCES	+= atom.c
+LIBMANS			+= atom.3
 
 ## Association tables.
 pkginclude_HEADERS	+= assoc.h
 libmLib_la_SOURCES	+= assoc.c
+LIBMANS			+= assoc.3
 
 CLEANFILES		+= assoc.out
 tests:: assoc.t sym.in sym.ref
@@ -258,7 +279,7 @@ tests:: assoc.t sym.in sym.ref
 	cmp assoc.out sym.ref
 	@echo "sym OK"
 
-noinst_PROGRAMS		+= assoc.t
+check_PROGRAMS		+= assoc.t
 assoc_t_SOURCES		 = assoc-test.c
 assoc_t_CPPFLAGS	 = $(TEST_CPPFLAGS)
 assoc_t_LDFLAGS		 = -static
@@ -272,14 +293,17 @@ pkginclude_HEADERS	+= mdwopt.h
 libmdwopt_la_SOURCES	 = mdwopt.c
 libmdwopt_la_CPPFLAGS	 = $(AM_CPPFLAGS) -DBUILDING_MLIB
 libutils_la_LIBADD	+= libmdwopt.la
+LIBMANS			+= mdwopt.3
 
 ## Program naming.
 pkginclude_HEADERS	+= quis.h
 libutils_la_SOURCES	+= quis.c pquis.c
+LIBMANS			+= quis.3
 
 ## Error reporting.
 pkginclude_HEADERS	+= report.h
 libutils_la_SOURCES	+= report.c
+LIBMANS			+= report.3
 
 ###--------------------------------------------------------------------------
 ### Encoding and decoding.
@@ -287,10 +311,12 @@ libutils_la_SOURCES	+= report.c
 ## form-urlencoded
 pkginclude_HEADERS	+= url.h
 libmLib_la_SOURCES	+= url.c
+LIBMANS			+= url.3
 
 ## base64
 pkginclude_HEADERS	+= base64.h
 libmLib_la_SOURCES	+= base64.c
+LIBMANS			+= base64.3
 
 EXTRA_DIST		+= base64.in base64.ref
 CLEANFILES		+= base64.out
@@ -301,7 +327,7 @@ tests:: base64.t base64.in base64.ref
 	cmp base64.out $(srcdir)/base64.in
 	@echo "base64 OK"
 
-noinst_PROGRAMS		+= base64.t
+check_PROGRAMS		+= base64.t
 base64_t_SOURCES	 = base64.c
 base64_t_CPPFLAGS	 = $(TEST_CPPFLAGS)
 base64_t_LDFLAGS	 = -static
@@ -309,6 +335,7 @@ base64_t_LDFLAGS	 = -static
 ## base32
 pkginclude_HEADERS	+= base32.h
 libmLib_la_SOURCES	+= base32.c
+LIBMANS			+= base32.3
 
 EXTRA_DIST		+= base32.in base32.ref
 CLEANFILES		+= base32.out
@@ -319,7 +346,7 @@ tests:: base32.t base32.in base32.ref
 	cmp base32.out $(srcdir)/base32.in
 	@echo "base32 OK"
 
-noinst_PROGRAMS		+= base32.t
+check_PROGRAMS		+= base32.t
 base32_t_SOURCES	 = base32.c
 base32_t_CPPFLAGS	 = $(TEST_CPPFLAGS)
 base32_t_LDFLAGS	 = -static
@@ -327,6 +354,7 @@ base32_t_LDFLAGS	 = -static
 ## hex
 pkginclude_HEADERS	+= hex.h
 libmLib_la_SOURCES	+= hex.c
+LIBMANS			+= hex.3
 
 EXTRA_DIST		+= hex.in hex.ref
 CLEANFILES		+= hex.out
@@ -337,7 +365,7 @@ tests:: hex.t hex.in hex.ref
 	cmp hex.out $(srcdir)/hex.in
 	@echo "hex OK"
 
-noinst_PROGRAMS		+= hex.t
+check_PROGRAMS		+= hex.t
 hex_t_SOURCES		 = hex.c
 hex_t_CPPFLAGS		 = $(TEST_CPPFLAGS)
 hex_t_LDFLAGS		 = -static
@@ -348,30 +376,52 @@ hex_t_LDFLAGS		 = -static
 ## Daemons.
 pkginclude_HEADERS	+= daemonize.h
 libmLib_la_SOURCES	+= daemonize.c
+LIBMANS			+= daemonize.3
 
 ## Environment variables.
 pkginclude_HEADERS	+= env.h
 libmLib_la_SOURCES	+= env.c
+LIBMANS			+= env.3
 
 ## File and descriptor flags.
 pkginclude_HEADERS	+= fdflags.h
 libmLib_la_SOURCES	+= fdflags.c
+LIBMANS			+= fdflags.3
 
 ## File descriptor passing.
 pkginclude_HEADERS	+= fdpass.h
 libmLib_la_SOURCES	+= fdpass.c
+LIBMANS			+= fdpass.3
 
 ## Watching files for modification.
 pkginclude_HEADERS	+= fwatch.h
 libmLib_la_SOURCES	+= fwatch.c
+LIBMANS			+= fwatch.3
 
 ## File locking.
 pkginclude_HEADERS	+= lock.h
 libmLib_la_SOURCES	+= lock.c
+LIBMANS			+= lock.3
+
+## File descriptor juggling.
+pkginclude_HEADERS	+= mdup.h
+libmLib_la_SOURCES	+= mdup.c
+LIBMANS			+= mdup.3
+
+check_PROGRAMS		+= mdup.t
+mdup_t_SOURCES		 = mdup-test.c
+mdup_t_CPPFLAGS		 = $(TEST_CPPFLAGS)
+mdup_t_LDFLAGS		 = -static
+
+EXTRA_DIST		+= mdup-test.sh
+CLEANFILES		+= mdup.[0-9]*.out mdup.[0-9]*.err
+tests:: mdup.t mdup-test.sh
+	$(srcdir)/mdup-test.sh
 
 ## Time arithmetic.
 pkginclude_HEADERS	+= tv.h
 libmLib_la_SOURCES	+= tv.c
+LIBMANS			+= tv.3
 
 ###--------------------------------------------------------------------------
 ### Buffering.
@@ -379,10 +429,12 @@ libmLib_la_SOURCES	+= tv.c
 ## Line buffering.
 pkginclude_HEADERS	+= lbuf.h
 libmLib_la_SOURCES	+= lbuf.c
+LIBMANS			+= lbuf.3
 
 ## Packet buffering.
 pkginclude_HEADERS	+= pkbuf.h
 libmLib_la_SOURCES	+= pkbuf.c
+LIBMANS			+= pkbuf.3
 
 ###--------------------------------------------------------------------------
 ### Network utilities.
@@ -390,25 +442,31 @@ libmLib_la_SOURCES	+= pkbuf.c
 ## Core event selection.
 pkginclude_HEADERS	+= sel.h
 libmLib_la_SOURCES	+= sel.c
+LIBMANS			+= sel.3
 
 ## Waiting for buffers to fill.
 pkginclude_HEADERS	+= selbuf.h selpk.h
 libmLib_la_SOURCES	+= selbuf.c selpk.c
+LIBMANS			+= selbuf.3 selpk.3
 
 ## RFC931 identification.
 pkginclude_HEADERS	+= ident.h
 libmLib_la_SOURCES	+= ident.c
+LIBMANS			+= ident.3
 
 ## Nonblocking connections.
 pkginclude_HEADERS	+= conn.h
 libmLib_la_SOURCES	+= conn.c
+LIBMANS			+= conn.3
 
 ## Signal handling
 pkginclude_HEADERS	+= sig.h
 libmLib_la_SOURCES	+= sig.c
+LIBMANS			+= sig.3
 
 ## Name resolution.
 pkginclude_HEADERS	+= bres.h
+LIBMANS			+= bres.3
 
 if WITH_ADNS
 libmLib_la_SOURCES	+= bres-adns.c
@@ -426,6 +484,7 @@ endif
 ## Tracing.
 pkginclude_HEADERS	+= trace.h
 libmLib_la_SOURCES	+= trace.c traceopt.c
+LIBMANS			+= trace.3
 
 ## Memory tracking.
 pkginclude_HEADERS	+= track.h
@@ -434,18 +493,37 @@ libmLib_la_SOURCES	+= track.c
 ## Testing.
 pkginclude_HEADERS	+= testrig.h
 libmLib_la_SOURCES	+= testrig.c
+LIBMANS			+= testrig.3
 
 ###--------------------------------------------------------------------------
 ### Manual.
 
-SUBDIRS			+= man
-
-install-man:
-	(cd man && $(MAKE) install-man)
+EXTRA_DIST		+= $(LIBMANS) $(PROGMANS)
+
+install-data-local: install-man
+install-man: $(LIBMANS) $(PROGMANS)
+	@$(NORMAL_INSTALL)
+	$(mkdir_p) $(DESTDIR)$(mandir)
+	$(top_srcdir)/config/maninst \
+		-d $(DESTDIR)$(mandir) -s $(srcdir) \
+		-i "$(INSTALL)" \
+		install $(PROGMANS)
+	$(top_srcdir)/config/maninst \
+		-d $(DESTDIR)$(mandir) -s $(srcdir) \
+		-i "$(INSTALL)" -e $(manext) \
+		install $(LIBMANS)
+.PHONY: install-man
+
+uninstall-local: uninstall-man
 uninstall-man:
-	(cd man && $(MAKE) uninstall-man)
-.PHONY: install-man uninstall-man
-
+	@$(NORMAL_UNINSTALL)
+	$(top_srcdir)/config/maninst \
+		-d $(DESTDIR)$(mandir) -s $(srcdir) \
+		uninstall $(PROGMANS)
+	$(top_srcdir)/config/maninst \
+		-d $(DESTDIR)$(mandir) -s $(srcdir) -e $(manext) \
+		uninstall $(LIBMANS)
+.PHONY: uninstall-man
 
 ###--------------------------------------------------------------------------
 ### Distribution.