X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=Makefile;h=83242cc2e6d4763f9db181b1a01d490cfb91c674;hb=bed9375363fbded799b41b7a09b120189592fb54;hp=b0ae19a799d6288ac25d1b05a457f640f1b17af3;hpb=203ace76e0d215885ccbc8dee597b44147a8247c;p=jvcard.git

diff --git a/Makefile b/Makefile
index b0ae19a..83242cc 100644
--- a/Makefile
+++ b/Makefile
@@ -27,17 +27,16 @@ mrproper: mrpropre
 
 mrpropre: clean
 	@echo Removing jar files...
-	@rm -f jvcard.jar jvcard-`grep "APPLICATION_VERSION" src/be/nikiroo/jvcard/launcher/Main.java | cut -d'"' -f2`.jar
+	@rm -f jvcard.jar jvcard-`grep "APPLICATION_VERSION" src/be/nikiroo/jvcard/launcher/Main.java | head -n1 | cut -d'"' -f2`.jar
 
 jvcard.jar: bin/be/nikiroo/jvcard/launcher/Main.class src/be/nikiroo/jvcard/*/* src/be/nikiroo/jvcard/*
-	@mkdir -p bin/
 	@echo 'Main-Class: be.nikiroo.jvcard.launcher.Main' > bin/manifest
 	@echo >> bin/manifest
-	@echo Creating jar file jvcard-`grep "APPLICATION_VERSION" src/be/nikiroo/jvcard/launcher/Main.java | cut -d'"' -f2`.jar...
-	jar cfm jvcard-`grep "APPLICATION_VERSION" src/be/nikiroo/jvcard/launcher/Main.java | cut -d'"' -f2`.jar bin/manifest -C bin/ be -C bin/ com
+	@echo Creating jar file jvcard-`grep "APPLICATION_VERSION" src/be/nikiroo/jvcard/launcher/Main.java | head -n1 | cut -d'"' -f2`.jar...
+	jar cfm jvcard-`grep "APPLICATION_VERSION" src/be/nikiroo/jvcard/launcher/Main.java | head -n1 | cut -d'"' -f2`.jar bin/manifest -C bin/ be -C bin/ com
 	@rm bin/manifest
 	@echo Copying to jvcard.jar...
-	@cp jvcard-`grep "APPLICATION_VERSION" src/be/nikiroo/jvcard/launcher/Main.java | cut -d'"' -f2`.jar jvcard.jar
+	@cp jvcard-`grep "APPLICATION_VERSION" src/be/nikiroo/jvcard/launcher/Main.java | head -n1 | cut -d'"' -f2`.jar jvcard.jar
 
 bin/5: bin/lanterna bin/files
 	@cp -r src/* bin/
@@ -71,7 +70,7 @@ bin/files: src/be/nikiroo/jvcard/*/* src/be/nikiroo/jvcard/*
 	@mkdir -p bin/
 	@find src/be/ -name '*.java' > bin/files
 
-bin/lanterna:
+bin/lanterna: src/com/googlecode/lanterna/* src/com/googlecode/lanterna/*/* src/com/googlecode/lanterna/*/*/*
 	@mkdir -p bin/
 	@find src/com/ -name '*.java' > bin/lanterna
 	javac -encoding UTF-8 -source 5 @bin/lanterna -d bin/ || rm bin/lanterna