Manpages: Move manpages (back?) into the top-level directory.

I missed man/Makefile.am in the build-system cleanup.  Rather than clean
it up separately, it seemed much better to group manpages with their
source files in the top-level Makefile.  So: mLib now has a completely
flat directory structure, except for config/.

diff --git a/Makefile.am b/Makefile.am
index 8b79b3ea3be78ff90ccdf9867ada58aafe0a7a97..6518677b93b1c20a124097addcf4251cee55ca66 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,6 +37,8 @@ pkginclude_HEADERS     =
 EXTRA_DIST              =
 CLEANFILES              =
 DISTCLEANFILES          =
+PROGMANS                =
+LIBMANS                         =
 
 confsubst               = $(top_srcdir)/config/confsubst
 
@@ -83,12 +85,14 @@ libmLib_la_LIBADD   += libutils.la
 
 ## Utility macros.
 pkginclude_HEADERS     += macros.h
+LIBMANS                        += macros.3
 
 ## Alignment.
 pkginclude_HEADERS     += align.h
 
 ## Bit manipulation.
 pkginclude_HEADERS     += bits.h
+LIBMANS                        += bits.3
 
 EXTRA_DIST             += bits.in bits-testgen.c
 tests:: bits.t bits.in
@@ -102,14 +106,17 @@ 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
@@ -126,10 +133,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 +146,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 +166,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
@@ -185,14 +198,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
@@ -218,10 +234,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
@@ -247,10 +265,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
@@ -272,14 +292,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 +310,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
@@ -309,6 +334,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
@@ -327,6 +353,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
@@ -348,30 +375,37 @@ 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
 
 ## Time arithmetic.
 pkginclude_HEADERS     += tv.h
 libmLib_la_SOURCES     += tv.c
+LIBMANS                        += tv.3
 
 ###--------------------------------------------------------------------------
 ### Buffering.
@@ -379,10 +413,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 +426,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 +468,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 +477,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)
+       $(mkinstalldirs) $(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.

diff --git a/man/alloc.3 b/alloc.3
similarity index 100%
rename from man/alloc.3
rename to alloc.3

diff --git a/man/arena.3 b/arena.3
similarity index 100%
rename from man/arena.3
rename to arena.3

diff --git a/man/assoc.3 b/assoc.3
similarity index 100%
rename from man/assoc.3
rename to assoc.3

diff --git a/man/atom.3 b/atom.3
similarity index 100%
rename from man/atom.3
rename to atom.3

diff --git a/man/base32.3 b/base32.3
similarity index 100%
rename from man/base32.3
rename to base32.3

diff --git a/man/base64.3 b/base64.3
similarity index 100%
rename from man/base64.3
rename to base64.3

diff --git a/man/bits.3 b/bits.3
similarity index 100%
rename from man/bits.3
rename to bits.3

diff --git a/man/bres.3 b/bres.3
similarity index 100%
rename from man/bres.3
rename to bres.3

diff --git a/man/buf.3 b/buf.3
similarity index 100%
rename from man/buf.3
rename to buf.3

diff --git a/configure.ac b/configure.ac
index 52db7c77f98dc9e4cf7e56d4bed051d8dbf78f48..27f21f5b424ff035ff9623a23366636e36e7910a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -99,8 +99,7 @@ dnl Output.
 AC_CONFIG_HEADER([config/config.h])
 
 AC_CONFIG_FILES(
-  [Makefile]
-  [man/Makefile])
+  [Makefile])
 AC_OUTPUT
 
 dnl ----- That's all, folks -------------------------------------------------

diff --git a/man/conn.3 b/conn.3
similarity index 100%
rename from man/conn.3
rename to conn.3

diff --git a/man/crc-mktab.1 b/crc-mktab.1
similarity index 100%
rename from man/crc-mktab.1
rename to crc-mktab.1

diff --git a/man/crc32.3 b/crc32.3
similarity index 100%
rename from man/crc32.3
rename to crc32.3

diff --git a/man/daemonize.3 b/daemonize.3
similarity index 100%
rename from man/daemonize.3
rename to daemonize.3

diff --git a/man/darray.3 b/darray.3
similarity index 100%
rename from man/darray.3
rename to darray.3

diff --git a/man/dspool.3 b/dspool.3
similarity index 100%
rename from man/dspool.3
rename to dspool.3

diff --git a/man/dstr.3 b/dstr.3
similarity index 100%
rename from man/dstr.3
rename to dstr.3

diff --git a/man/env.3 b/env.3
similarity index 100%
rename from man/env.3
rename to env.3

diff --git a/man/exc.3 b/exc.3
similarity index 100%
rename from man/exc.3
rename to exc.3

diff --git a/man/fdflags.3 b/fdflags.3
similarity index 100%
rename from man/fdflags.3
rename to fdflags.3

diff --git a/man/fdpass.3 b/fdpass.3
similarity index 100%
rename from man/fdpass.3
rename to fdpass.3

diff --git a/man/fwatch.3 b/fwatch.3
similarity index 100%
rename from man/fwatch.3
rename to fwatch.3

diff --git a/man/hash.3 b/hash.3
similarity index 100%
rename from man/hash.3
rename to hash.3

diff --git a/man/hex.3 b/hex.3
similarity index 100%
rename from man/hex.3
rename to hex.3

diff --git a/man/ident.3 b/ident.3
similarity index 100%
rename from man/ident.3
rename to ident.3

diff --git a/man/lbuf.3 b/lbuf.3
similarity index 100%
rename from man/lbuf.3
rename to lbuf.3

diff --git a/man/lock.3 b/lock.3
similarity index 100%
rename from man/lock.3
rename to lock.3

diff --git a/man/mLib.3 b/mLib.3
similarity index 100%
rename from man/mLib.3
rename to mLib.3

diff --git a/man/macros.3 b/macros.3
similarity index 100%
rename from man/macros.3
rename to macros.3

diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644 (file)
index 70845e0..0000000
--- a/man/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile.in

diff --git a/man/Makefile.am b/man/Makefile.am
deleted file mode 100644 (file)
index 3c33ffb..0000000
--- a/man/Makefile.am
+++ /dev/null
@@ -1,72 +0,0 @@
-## -*-makefile-*-
-##
-## $Id$
-##
-## Makefile for mLib's manual pages
-##
-## (c) 1999 Straylight/Edgeware
-##
-
-##----- Licensing notice ----------------------------------------------------
-##
-## This file is part of the mLib utilities library.
-##
-## mLib is free software; you can redistribute it and/or modify
-## it under the terms of the GNU Library General Public License as
-## published by the Free Software Foundation; either version 2 of the
-## License, or (at your option) any later version.
-##
-## mLib is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU Library General Public License for more details.
-##
-## You should have received a copy of the GNU Library General Public
-## License along with mLib; if not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-## MA 02111-1307, USA.
-
-AUTOMAKE_OPTIONS = foreign
-
-manext = @manext@
-
-## --- Manual pages ---
-
-MANPAGES = \
-       crc-mktab.1 unihash-mkstatic.1
-
-MANPAGESEXT = \
-       alloc.3 arena.3 assoc.3 atom.3 base32.3 base64.3 bits.3 bres.3 \
-       buf.3 conn.3 crc32.3 darray.3 daemonize.3 dspool.3 dstr.3 env.3 \
-       exc.3 fdflags.3 fwatch.3 hash.3 ident.3 lbuf.3 lock.3 mLib.3 \
-       mdwopt.3 pkbuf.3 pool.3 quis.3 report.3 sel.3 selbuf.3 selpk.3 \
-       sig.3 str.3 sub.3 sym.3 testrig.3 trace.3 tv.3 url.3 hex.3 fdpass.3 \
-       macros.3 unihash.3 versioncmp.3
-
-install-man: $(MANPAGES)
-       @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(mandir)
-       $(top_srcdir)/config/maninst \
-               -d $(DESTDIR)$(mandir) -s $(srcdir) \
-               -i "$(INSTALL)" \
-               install $(MANPAGES)
-       $(top_srcdir)/config/maninst \
-               -d $(DESTDIR)$(mandir) -s $(srcdir) \
-               -i "$(INSTALL)" -e $(manext) \
-               install $(MANPAGESEXT)
-
-uninstall-man: $(MANPAGS)
-       @$(NORMAL_UNINSTALL)
-       $(top_srcdir)/config/maninst \
-               -d $(DESTDIR)$(mandir) -s $(srcdir) \
-               uninstall $(MANPAGES)
-       $(top_srcdir)/config/maninst \
-               -d $(DESTDIR)$(mandir) -s $(srcdir) -e $(manext) \
-               uninstall $(MANPAGESEXT)
-
-install-data-local: install-man
-uninstall-local: uninstall-man
-
-EXTRA_DIST = $(MANPAGES) $(MANPAGESEXT)
-
-##----- That's all, folks ---------------------------------------------------

diff --git a/man/mdwopt.3 b/mdwopt.3
similarity index 100%
rename from man/mdwopt.3
rename to mdwopt.3

diff --git a/man/pkbuf.3 b/pkbuf.3
similarity index 100%
rename from man/pkbuf.3
rename to pkbuf.3

diff --git a/man/pool.3 b/pool.3
similarity index 100%
rename from man/pool.3
rename to pool.3

diff --git a/man/quis.3 b/quis.3
similarity index 100%
rename from man/quis.3
rename to quis.3

diff --git a/man/report.3 b/report.3
similarity index 100%
rename from man/report.3
rename to report.3

diff --git a/man/sel.3 b/sel.3
similarity index 100%
rename from man/sel.3
rename to sel.3

diff --git a/man/selbuf.3 b/selbuf.3
similarity index 100%
rename from man/selbuf.3
rename to selbuf.3

diff --git a/man/selpk.3 b/selpk.3
similarity index 100%
rename from man/selpk.3
rename to selpk.3

diff --git a/man/sig.3 b/sig.3
similarity index 100%
rename from man/sig.3
rename to sig.3

diff --git a/man/str.3 b/str.3
similarity index 100%
rename from man/str.3
rename to str.3

diff --git a/man/sub.3 b/sub.3
similarity index 100%
rename from man/sub.3
rename to sub.3

diff --git a/man/sym.3 b/sym.3
similarity index 100%
rename from man/sym.3
rename to sym.3

diff --git a/man/testrig.3 b/testrig.3
similarity index 100%
rename from man/testrig.3
rename to testrig.3

diff --git a/man/trace.3 b/trace.3
similarity index 100%
rename from man/trace.3
rename to trace.3

diff --git a/man/tv.3 b/tv.3
similarity index 100%
rename from man/tv.3
rename to tv.3

diff --git a/man/unihash-mkstatic.1 b/unihash-mkstatic.1
similarity index 100%
rename from man/unihash-mkstatic.1
rename to unihash-mkstatic.1

diff --git a/man/unihash.3 b/unihash.3
similarity index 100%
rename from man/unihash.3
rename to unihash.3

diff --git a/man/url.3 b/url.3
similarity index 100%
rename from man/url.3
rename to url.3

diff --git a/man/versioncmp.3 b/versioncmp.3
similarity index 100%
rename from man/versioncmp.3
rename to versioncmp.3