regen

[userv.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 473e2fbcab8564aa060a5410539d8cdc08caf936..90972fd4717b2a74eb6277b0fc747d36e0a655af 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,6 +28,7 @@ LDLIBS=@DEBUGLIBS@ @LIBS@ $(XLDLIBS)
 M4=m4
 M4FLAGS=
 LEX=flex
+MD5SUM=@MD5SUM_SIMPLE@
 CWD=$(shell pwd)
 
 INSTALL_GROUP=root
@@ -39,6 +40,8 @@ INSTALL_DATA=@INSTALL_DATA@ $(INSTALL_FLAGS)
 prefix=@prefix@
 exec_prefix=$(prefix)
 bindir=$(exec_prefix)/bin
+mandir=$(prefix)/man
+man1dir=$(mandir)/man1
 sbindir=$(exec_prefix)/sbin
 etcdir=/etc
 etcsubdir=$(etcdir)/userv
@@ -46,7 +49,9 @@ docdir=$(prefix)/userv
 
 TARGETS=       daemon client
 TARGETS_DOC_PS=        spec.ps overview.ps
-TARGETS_DOC=   spec.html/index.html $(TARGETS_DOC_PS)
+TARGETS_DOC_RM=        $(TARGETS_DOC_PS) spec.html
+TARGETS_DOC=   $(TARGETS_DOC_PS) spec.html/index.html
+MAN1PAGES=     userv.1
 
 SOURCES=       Makefile.in configure.in acconfig.h                     \
                client.c common.h                                       \
@@ -54,6 +59,9 @@ SOURCES=      Makefile.in configure.in acconfig.h                     \
                daemon.h debug.c parser.c lib.c lib.h                   \
                language.i4 lexer.l.m4 tokens.h.m4
 
+CONFIG_RESULTS=        config.status config.log config.h config.cache \
+               Makefile pcsum.h
+
 GENSHIP_CLEAN= lexer.l lexer.c tokens.h config.h.in spec.sgml $(TARGETS_DOC)
 GENSHIP=       $(GENSHIP_CLEAN) configure
 
@@ -76,14 +84,16 @@ install-strip:
 
 install-doc:   $(TARGETS_DOC)
                $(INSTALL) -d -m 2755 $(docdir) $(docdir)/spec.html
+               $(INSTALL) -d -m 2755 $(mandir) $(man1dir)
                $(INSTALL_DATA) -m 644 $(TARGETS_DOC_PS) $(docdir)/.
                $(INSTALL_DATA) -m 644 spec.html/*.html $(docdir)/spec.html/.
+               $(INSTALL_DATA) -m 644 $(MAN1PAGES) $(man1dir)
 
 uninstall:
                rm -f $(bindir)/userv $(sbindir)/uservd
 
 uninstall-doc:
-               cd $docdir && rm -rf $(TARGETS_DOC)
+               cd $docdir && rm -rf $(TARGETS_DOC_RM)
 
 daemon:                overlord.o process.o servexec.o parserlexer.o debug.o lib.o both.o
                $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
@@ -114,7 +124,9 @@ parserlexer.o:      lexer.c parser.c config.h common.h pcsum.h daemon.h lib.h tokens.
                $(CC) -c $(CPPFLAGS) $(CFLAGS) lexer.c -o $@
 
 pcsum.h:       common.h config.h config.status Makefile
-               cat $^ | md5sum | sed -e 's/  -$$//; s/../0x&,/g; s/,$$//;' >pcsum.h.new
+               cat $^ | $(MD5SUM) \
+                       | sed -e 's/  -$$//; s/../0x&,/g; s/,$$//;' \
+                       >pcsum.h.new
                cmp pcsum.h.new pcsum.h || mv -f pcsum.h.new pcsum.h
                @rm -f pcsum.h.new
 
@@ -123,8 +135,6 @@ version.h:  Makefile
 
 tokens.h:      language.i4
 
-               rm -f *.o *~ core ./#*#
-
 autoconf configure:
                autoheader
                autoconf
@@ -133,23 +143,27 @@ clean:
                find -name '*.orig' -o -name '*~' -o -name '.*~' \
                        -o -name '*#' -o -name '.#*' -o -name '*.bak' \
                        | xargs -r rm
-               rm -rf $(TARGETS) *.o
+               rm -rf $(TARGETS) *.o core version.h
                rm -f overview.eps
                rm -f spec.lout* spec.text* spec.ps?* spec.sgml.new
                rm -f lout.li *.ld *.lix *.ldx
                rm -f userv-*.tar.gz vd/*
 
 distclean mostlyclean: clean
-               rm -f config.status config.log Makefile config.h config.cache pcsum.h
+               rm -f $(CONFIG_RESULTS)
 
 maintainer-clean:      distclean
                rm -rf $(GENSHIP_CLEAN) spec.html/*.html
 
-dist-prep:     $(GENSHIP) distclean
+dist-prep:     $(GENSHIP)
+
+pre-checkin:
+               ./configure
+               $(MAKE) dist-prep
 
 dist_tmp=dist_tmp/userv-$(VERSION)
 dist_prune=\( -name CVS -o -name 'dist_tmp*' -o -name slash-etc -o -name vd \)
-dist:                  dist-prep
+dist:                  dist-prep distclean
        rm -rf dist_tmp*
        mkdir dist_tmp $(dist_tmp)
        find $(dist_prune) -prune -o -type d -print | \
@@ -163,8 +177,8 @@ dist:                       dist-prep
 linecount:     $(SOURCES)
                wc -l $^
 
-%.html:                %.sgml
-               rm -rf $@; debiandoc2html $<
+%.html/index.html:     %.sgml
+                       debiandoc2html $<
 
 %.ps:          %.sgml
                debiandoc2ps -1 -O $< >$@.new && mv $@.new $@