X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=Makefile.base;h=86050e6d3e9e7db7da1bcc2015895c0da8364a75;hp=300db504c67c2f31c9fa6ffef42117d8a3617baa;hb=d3c15421430e85e3afeefef211b4f791753e17ba;hpb=361425558beb39232c122dbd4d0226f7f7049002 diff --git a/Makefile.base b/Makefile.base index 300db50..86050e6 100644 --- a/Makefile.base +++ b/Makefile.base @@ -62,7 +62,7 @@ test: clean: rm -rf bin/ @echo Removing sources taken from libs... - @for lib in libs/*.jar; do \ + @for lib in libs/*-sources.jar; do \ basename "$$lib"; \ jar tf "$$lib" | while read -r ln; do \ [ -f "src/$$ln" ] && rm "src/$$ln"; \ @@ -92,7 +92,7 @@ resources: libs 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/*.jar;do \ + @[ -e bin/libs -o ! -d libs ] || (cd src && for lib in ../libs/*-sources.jar; do \ basename "$$lib"; \ jar xf "$$lib"; \ done ) @@ -105,6 +105,8 @@ $(NAME).jar: resources @echo "Main-Class: `echo "$(MAIN)" | sed 's:/:.:g'`" > bin/manifest @echo >> bin/manifest $(JAR) cfm $(NAME).jar bin/manifest $(JAR_FLAGS) + @[ ! -e VERSION ] || echo Copying to "$(NAME)-`cat VERSION`.jar" + @[ ! -e VERSION ] || cp $(NAME).jar "$(NAME)-`cat VERSION`.jar" run: @[ -e bin/$(MAIN).class ] || echo You need to build the sources