X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=Makefile.base;h=3143778872e7de4e4f0e25d5afb82443dd860bc4;hp=54dbf1aa548f6a1b9e8e1ee81e2ea1fde4bc03aa;hb=632cc690ac07130a51a947ee0f0b2bfae10b6595;hpb=56566c7bf571dd5c70b2855f82f676bc6f714368

diff --git a/Makefile.base b/Makefile.base
index 54dbf1a..3143778 100644
--- a/Makefile.base
+++ b/Makefile.base
@@ -1,3 +1,8 @@
+# Makefile base template
+# 
+# Version:
+# - 1.0.0: add a version comment
+
 # Required parameters (the commented out ones are supposed to change per project):
 
 #MAIN = path to main java source to compile
@@ -64,14 +69,16 @@ test: test-resources
 clean:
 	rm -rf bin/
 	@echo Removing sources taken from libs...
-	@for lib in libs/*-sources.jar; do \
-		basename "$$lib"; \
-		jar tf "$$lib" | while read -r ln; do \
-			[ -f "src/$$ln" ] && rm "src/$$ln"; \
-		done; \
-		jar tf "$$lib" | tac | while read -r ln; do \
-			[ -d "src/$$ln" ] && rmdir "src/$$ln" 2>/dev/null || true; \
-		done; \
+	@for lib in libs/*-sources.jar libs/*-sources.patch.jar; do \
+		if [ "$$lib" != 'libs/*-sources.jar' -a "$$lib" != 'libs/*-sources.patch.jar' ]; then \
+			basename "$$lib"; \
+			jar tf "$$lib" | while read -r ln; do \
+				[ -f "src/$$ln" ] && rm "src/$$ln"; \
+			done; \
+			jar tf "$$lib" | tac | while read -r ln; do \
+				[ -d "src/$$ln" ] && rmdir "src/$$ln" 2>/dev/null || true; \
+			done; \
+		fi \
 	done
 
 mrproper: mrpropre
@@ -108,9 +115,11 @@ test-resources: resources
 
 libs: bin
 	@[ -e bin/libs -o ! -d libs ] || echo Extracting sources from libs...
-	@[ -e bin/libs -o ! -d libs ] || (cd src && for lib in ../libs/*-sources.jar; do \
-		basename "$$lib"; \
-		jar xf "$$lib"; \
+	@[ -e bin/libs -o ! -d libs ] || (cd src && for lib in ../libs/*-sources.jar ../libs/*-sources.patch.jar; do \
+		if [ "$$lib" != '../libs/*-sources.jar' -a "$$lib" != '../libs/*-sources.patch.jar' ]; then \
+			basename "$$lib"; \
+			jar xf "$$lib"; \
+		fi \
 	done )
 	@[ ! -d libs ] || touch bin/libs