fix dependencies in Makefile to solve strange bug with showing BlinkenLib version as Blimp version in about dialog
Stefan Schuermans commited on 2014-05-18 16:12:51
Showing 1 changed files, with 23 additions and 20 deletions.
- Makefile 2d175a9..7e8f981
| ... | ... |
@@ -3,29 +3,32 @@ |
| 3 | 3 |
# Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html |
| 4 | 4 |
# a blinkenarea.org project |
| 5 | 5 |
|
| 6 |
-BLINKENLIB=../BlinkenLibJava/BlinkenLib.jar |
|
| 7 |
-JFLEXIPIX=../JFlexiPix/JFlexiPix.jar |
|
| 8 |
- |
|
| 9 |
-VERSION_MAJOR=1 |
|
| 10 |
-VERSION_MINOR=4 |
|
| 11 |
-VERSION_REVISION=4 |
|
| 12 |
- |
|
| 13 |
-JAVAC=javac |
|
| 14 |
-JAR=jar |
|
| 15 |
-KEYTOOL=keytool |
|
| 16 |
-JARSIGNER=jarsigner |
|
| 17 |
-KEYPASS=BlinkenLightsInteractiveMovieProgram |
|
| 18 |
-JAVA=java |
|
| 19 |
-P=org/blinkenarea/Blimp |
|
| 20 |
-IMG=$(P)/images |
|
| 21 |
- |
|
| 22 |
-CLASSPATH=.:$(BLINKENLIB):$(JFLEXIPIX) |
|
| 23 |
-CLASS_FILES=$(P)/BlinkenFileFilter.class $(P)/BlinkenFrameDisplay.class \ |
|
| 6 |
+BLINKENLIB:=../BlinkenLibJava/BlinkenLib.jar |
|
| 7 |
+JFLEXIPIX:=../JFlexiPix/JFlexiPix.jar |
|
| 8 |
+ |
|
| 9 |
+VERSION_MAJOR:=1 |
|
| 10 |
+VERSION_MINOR:=4 |
|
| 11 |
+VERSION_REVISION:=4 |
|
| 12 |
+ |
|
| 13 |
+JAVAC:=javac |
|
| 14 |
+JAR:=jar |
|
| 15 |
+KEYTOOL:=keytool |
|
| 16 |
+JARSIGNER:=jarsigner |
|
| 17 |
+KEYPASS:=BlinkenLightsInteractiveMovieProgram |
|
| 18 |
+JAVA:=java |
|
| 19 |
+P:=org/blinkenarea/Blimp |
|
| 20 |
+IMG:=$(P)/images |
|
| 21 |
+ |
|
| 22 |
+GENJAVA:=$(P)/Version.java |
|
| 23 |
+ |
|
| 24 |
+CLASSPATH:=.:$(BLINKENLIB):$(JFLEXIPIX) |
|
| 25 |
+ |
|
| 26 |
+CLASS_FILES:=$(P)/BlinkenFileFilter.class $(P)/BlinkenFrameDisplay.class \ |
|
| 24 | 27 |
$(P)/BlinkenFrameDisplayListener.class $(P)/BlinkenFrameDisplayInterceptor.class \ |
| 25 | 28 |
$(P)/BlinkenFrameEditor.class $(P)/BlinkenFrameEditorListener.class \ |
| 26 | 29 |
$(P)/Blimp.class $(P)/Version.class |
| 27 | 30 |
|
| 28 |
-IMAGE_FILES=$(IMG)/ColorPicker.png $(IMG)/Dot.png $(IMG)/Line.png \ |
|
| 31 |
+IMAGE_FILES:=$(IMG)/ColorPicker.png $(IMG)/Dot.png $(IMG)/Line.png \ |
|
| 29 | 32 |
$(IMG)/Rectangle.png $(IMG)/FilledRectangle.png \ |
| 30 | 33 |
$(IMG)/Circle.png $(IMG)/FilledCircle.png \ |
| 31 | 34 |
$(IMG)/Copy.png $(IMG)/Paste.png \ |
| ... | ... |
@@ -56,7 +59,7 @@ $(P)/Version.java: Makefile |
| 56 | 59 |
echo " public static int Revision = $(VERSION_REVISION);" >>$@ |
| 57 | 60 |
echo "}" >>$@ |
| 58 | 61 |
|
| 59 |
-%.class: %.java |
|
| 62 |
+%.class: %.java $(GENJAVA) |
|
| 60 | 63 |
$(JAVAC) -classpath $(CLASSPATH) $< |
| 61 | 64 |
|
| 62 | 65 |
Blimp.keystore: |
| 63 | 66 |