Makefile: fix error at first "make"

diff --git a/Makefile b/Makefile
index 30dbb4a56d62f60a11039cd0500e61b9189f88a8..b0ae19a799d6288ac25d1b05a457f640f1b17af3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,10 @@
 ### -  make clean: will clean temporary files
 ### -  make mrpropre: will clean temporary files and remove the JAR file
 
-ALL: bin/5 jvcard.jar
+ALL: jvcard.jar
+
+# Default: Java 1.5
+bin/be/nikiroo/jvcard/launcher/Main.class: bin/5
 
 .PHONY: ALL clean mrproper mrpropre love
 
@@ -26,7 +29,7 @@ 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
 
-jvcard.jar: bin/be/nikiroo/jvcard/*/* bin/be/nikiroo/jvcard/*
+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
@@ -36,25 +39,29 @@ jvcard.jar: bin/be/nikiroo/jvcard/*/* bin/be/nikiroo/jvcard/*
        @echo Copying to jvcard.jar...
        @cp jvcard-`grep "APPLICATION_VERSION" src/be/nikiroo/jvcard/launcher/Main.java | cut -d'"' -f2`.jar jvcard.jar
 
-bin/5: lanterna bin/files
+bin/5: bin/lanterna bin/files
+       @cp -r src/* bin/
        @echo Compiling in Java 1.5 mode "('make bin/5')"...
        javac -cp bin/ -encoding UTF-8 -Xlint -Xlint:-options -source 5 -target 5 @bin/files -d bin/
        @rm -f bin/[0-9]
        @touch bin/5
 
-bin/6: lanterna bin/files
+bin/6: bin/lanterna bin/files
+       @cp -r src/* bin/
        @echo Compiling in Java 1.6 mode "('make bin/6')"...
        javac -cp bin/ -encoding UTF-8 -Xlint -Xlint:-options -source 6 -target 6 @bin/files -d bin/
        @rm -f bin/[0-9]
        @touch bin/6
 
-bin/7: lanterna bin/files
+bin/7: bin/lanterna bin/files
+       @cp -r src/* bin/
        @echo Compiling in Java 1.7 mode "('make bin/7')"...
        javac -cp bin/ -encoding UTF-8 -Xlint -Xlint:-options -source 7 -target 7 @bin/files -d bin/
        @rm -f bin/[0-9]
        @touch bin/7
 
-bin/8: lanterna bin/files
+bin/8: bin/lanterna bin/files
+       @cp -r src/* bin/
        @echo Compiling in Java 1.8 mode "('make bin/8')"...
        javac -cp bin/ -encoding UTF-8 -Xlint -Xlint:-options -source 8 -target 8 @bin/files -d bin/
        @rm -f bin/[0-9]
@@ -67,6 +74,6 @@ bin/files: src/be/nikiroo/jvcard/*/* src/be/nikiroo/jvcard/*
 bin/lanterna:
        @mkdir -p bin/
        @find src/com/ -name '*.java' > bin/lanterna
-       javac -encoding UTF-8 -source 5 @lanterna -d bin/ || rm bin/lanterna
+       javac -encoding UTF-8 -source 5 @bin/lanterna -d bin/ || rm bin/lanterna
        @test -e bin/lanterna