From be7ca62384930e0215aba3e7957bdf4d3dd39bac Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@ncsa.illinois.edu>
Date: Tue, 18 Oct 2011 22:06:26 -0500
Subject: [PATCH] New make dist/distclean targets

---
 Makefile | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 0e0b41554b..0993daf391 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,9 @@
 #
 
 BUILD=build
+VERSION_FULL=`basename \`pwd\``-`cat VERSION`
+VERSION_MIN=`basename \`pwd\``-`cat VERSION`-minimal
+HAVE_MODULES=git submodule | grep -v cmake >/dev/null
 
 all: configured
 	( cd $(BUILD) && make )
@@ -26,14 +29,21 @@ docclean: configured
 	( cd $(BUILD) && make docclean )
 
 dist:
-	@./pkg/make-src-packages
+	@rm -rf $(VERSION_FULL) $(VERSION_FULL).tgz
+	@rm -rf $(VERSION_MIN) $(VERSION_MIN).tgz
+	@mkdir $(VERSION_FULL)
+	@tar --exclude=$(VERSION_FULL)* --exclude=$(VERSION_MIN)* --exclude=.git -cf - . | ( cd $(VERSION_FULL) && tar -xpf - )
+	@tar -czf $(VERSION_FULL).tgz $(VERSION_FULL) && echo Package: $(VERSION_FULL).tgz && rm -rf $(VERSION_FULL)
+	@$(HAVE_MODULES) && mkdir $(VERSION_MIN) || exit 0
+	@$(HAVE_MODULES) && tar --exclude=$(VERSION_FULL)* --exclude=$(VERSION_MIN)* --exclude=.git `git submodule | awk '{print "--exclude="$$2}' | grep -v cmake | tr '\n' ' '` -cf - . | ( cd $(VERSION_MIN) && tar -xpf - ) || exit 0
+	@$(HAVE_MODULES) && tar -czf $(VERSION_MIN).tgz $(VERSION_MIN) && echo Package: $(VERSION_MIN).tgz && rm -rf $(VERSION_MIN) || exit 0
 
 bindist:
 	@( cd pkg && ( ./make-deb-packages || ./make-mac-packages || \
 	               ./make-rpm-packages ) )
 
 distclean:
-	rm -rf $(BUILD)
+	git reset --hard HEAD && git clean -xdf
 
 configured:
 	@test -d $(BUILD) || ( echo "Error: No build/ directory found. Did you run configure?" && exit 1 )