* Cleanup 'make distrib'

svn: 3863

Makefile.in

@@ -13,14 +13,13 @@ VERSION = @VERSION@
 DISTRIB = wraith-@VERSION@
 CCDEPMODE = @CCDEPMODE@
 BINEXEC = wraith@EXEEXT@
-DISTROFILES = config.h.in doc/ misc/ scripts/ ChangeLog Makefile.in build configure pack/ src/
-EXCLUDES = pack/pack.cfg misc/ind doc/DEVEL src/Makefile src/compat/Makefile src/mod/Makefile src/buildinfo.h \
-           src/crypto/Makefile src/crypto/.deps src/crypto/.cvsignore \
-           src/mod/dns.mod/Makefile src/mod/*.mod/.deps/ src/mod/*.mod/.cvsignore \
-           src/.deps src/compat/.deps misc/commit misc/grep autotools/ \
-           config.cache config.log config.status config.h stamp.* misc/.cvsignore src/compat/.cvsignore \
-           src/mod/.cvsignore src/.cvsignore .cvsignore misc/commit misc/fstrings \
-           misc/plainh misc/grep misc/cp.sh
+
+STATICMAKEFILES = lib/Makefile src/mod/Makefile src/crypto/Makefile src/compat/Makefile src/Makefile Makefile
+CONFIGFILES = config.cache config.log config.status config.h src/buildinfo.h
+
+DISTROFILES = README LICENSE config.h.in autotools/ doc/ scripts/ lib/ Makefile.in build.sh configure pack/ src/
+EXCLUDES = pack/pack.cfg $(CONFIGFILES) $(STATICMAKEFILES)
+
 REVISION 	:= $(shell misc/getrev.sh)
 BUILDTS 	:= $(shell misc/getts.sh)
 
@@ -92,31 +91,26 @@ clean:  cleanutils
 	@rm -f src/help.h src/response.h src/responses.h utctime@EXEEXT@ ts@EXEEXT@
 
 distclean: clean
-	@rm -f Makefile src/Makefile src/compat/Makefile src/mod/Makefile src/crypto/Makefile src/buildinfo.h
-	@rm -f config.cache config.log config.status config.h 
 	@rm -rf *-$(VERSION)/ autom4te.cache/ autoscan.log configure.scan
 	@rm -rf src/.deps/ src/compat/.deps/ src/strucutres/.deps/ src/mod/*.mod/.deps/ src/crypto/.deps
 	-+@cd lib && $(MAKE) distclean
+	@rm -f $(STATICMAKEFILES) $(CONFIGFILES)
 
 
 distrib: clean
 	@rm -rf $(DISTRIB)/
 	@mkdir $(DISTRIB) && cp -r $(DISTROFILES) $(DISTRIB)
-	@rm -f `find $(DISTRIB)/ \( -name '*~' -o -name '*#' -o -name '*.orig' -o -name '*.rej' -o -name '*.bak' \) -print`
-	@rm -rf `find $(DISTRIB)/ \( -name 'CVS' \) -print`
-	@for s in $(EXCLUDES); \
-	do \
+	@rm -rf `find $(DISTRIB)/ \( -name '*~' -o -name '*#' -o -name '*.orig' -o -name '*.rej' -o -name '*.bak' -o -name '.cvsignore' -o -name '.*.swp' \) -type f -print`
+	@rm -rf `find $(DISTRIB)/ \( -name '.svn' -o -name '.deps' \) -type d -print`
+	@for s in $(EXCLUDES); do \
 	 rm -rf $(DISTRIB)/$$s; \
 	done;
-	@mfiles="`find $(DISTRIB)/src/ -name '*.h' -or -name '*.c'`"; \
-	for s in $$mfiles; \
-	do \
-	 mangle -rnw $$s > /dev/null 2>&1;\
-	done
+	@sed -e 's/^REVISION .*/REVISION = $(REVISION)/' -e 's/^BUILDTS .*/BUILDTS = $(BUILDTS)/' $(DISTRIB)/Makefile.in > Makefile.in.tmp && mv Makefile.in.tmp $(DISTRIB)/Makefile.in
+#	@for s in `find $(DISTRIB)/src/ -name '*.h' -or -name '*.c'`; do mangle -rnw $$s > /dev/null 2>&1; done
 
 tar: distrib
-	tar -czvf $(DISTRIB).tgz $(DISTRIB)/
-	ls -al $(DISTRIB).tgz
+	tar -czvf $(DISTRIB).tar.gz $(DISTRIB)/
+	ls -al $(DISTRIB).tar.gz
 #	rm -rf $(DISTRIB)/
 #	cd ../ && rm -rf distrib/