X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=Makefile.in;h=eb162513118cb847dc678c4fa72ce6f2bcc668c7;hb=70d3947fb471e0e12ef89c35f915f6acec217f4a;hp=473e2fbcab8564aa060a5410539d8cdc08caf936;hpb=fb19916b0ba7dfefeb4886800b561a27623de9a6;p=userv.git

diff --git a/Makefile.in b/Makefile.in
index 473e2fb..eb16251 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,7 +46,7 @@ docdir=$(prefix)/userv
 
 TARGETS=	daemon client
 TARGETS_DOC_PS=	spec.ps overview.ps
-TARGETS_DOC=	spec.html/index.html $(TARGETS_DOC_PS)
+TARGETS_DOC=	spec.html $(TARGETS_DOC_PS)
 
 SOURCES=	Makefile.in configure.in acconfig.h			\
 		client.c common.h					\
@@ -54,6 +54,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
 
@@ -123,8 +126,6 @@ version.h:	Makefile
 
 tokens.h:	language.i4
 
-		rm -f *.o *~ core ./#*#
-
 autoconf configure:
 		autoheader
 		autoconf
@@ -133,23 +134,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 | \
@@ -164,7 +169,7 @@ linecount:	$(SOURCES)
 		wc -l $^
 
 %.html:		%.sgml
-		rm -rf $@; debiandoc2html $<
+		debiandoc2html $<
 
 %.ps:		%.sgml
 		debiandoc2ps -1 -O $< >$@.new && mv $@.new $@