X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=Makefile.base;h=3304c83c802f47d4d5ede0e5cb33c5a252bd0552;hb=f1fb834c62f9d9a73edeeda3fed060e0dede8cef;hp=9901644035cee9e0610447751befe4b1e28cb7cc;hpb=a6395bef99a8e917f67341ef1906917b87df24a4;p=fanfix.git

diff --git a/Makefile.base b/Makefile.base
index 9901644..3304c83 100644
--- a/Makefile.base
+++ b/Makefile.base
@@ -64,14 +64,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
@@ -94,6 +96,7 @@ resources: libs
 			cp "$$ln" "../bin/$$ln" ; \
 		fi ; \
 	done
+	@cp VERSION bin/
 
 test-resources: resources
 	@echo Copying test resources into bin/...
@@ -107,9 +110,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