X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=makefile;h=80dbcdac21897702062577ebc06bdd5a4d7a3977;hb=7c538be264da4cdd35827febfe3ed2cd43626963;hp=e0a1d30d862e552b2c8b5b0a0b1b52925365132a;hpb=bc2f79f652659843e448f56ab438c412263575b3;p=~andy%2Fspades

diff --git a/makefile b/makefile
index e0a1d30..80dbcda 100644
--- a/makefile
+++ b/makefile
@@ -1,7 +1,9 @@
+-include config.mk
+
 # Settings
-ANDROID := /opt/android-sdk-update-manager/platforms/android-10/android.jar
-PACKAGE := org.pileus.spades
-OUTPUT  := bin/Spades.apk
+ANDROID ?= /opt/android-sdk-update-manager/platforms/android-10/android.jar
+PACKAGE ?= org.pileus.spades
+OUTPUT  ?= bin/Spades.apk
 
 # Sources
 RES     := $(shell find res -name '*.xml')
@@ -14,15 +16,14 @@ OBJ     := $(subst .java,.class,   \
                 $(GEN:gen/%=obj/%))
 
 # Targets
-default: run
+all: $(OUTPUT)
 
 compile: $(OBJ)
 
-debug: $(OUTPUT)
-
 clean:
 	rm -rf bin gen obj
 
+# ADB targets
 logcat:
 	adb logcat Spades:D AndroidRuntime:E '*:S'
 
@@ -37,13 +38,20 @@ uninstall:
 	adb uninstall $(PACKAGE)
 	rm bin/install.stamp
 
-png-cards:
-	git checkout cards-png -- 'res/drawable/card_*.png'
-	git reset    HEAD      -- 'res/drawable/card_*.png'
-
-svg-cards:
-	git checkout cards-svg -- 'opt/drawable/card_*.svg'
-	git reset    HEAD      -- 'opt/drawable/card_*.svg'
+# Graphics targets
+graphics:
+	git checkout graphics  --    \
+	        'opt/drawable/*.svg' \
+	        'opt/drawable/*.xcf' \
+	        'res/drawable/*.png' \
+	        'res/drawable/*.jpg' \
+	        || true
+	git reset HEAD --            \
+	        'opt/drawable/*.svg' \
+	        'opt/drawable/*.xcf' \
+	        'res/drawable/*.png' \
+	        'res/drawable/*.jpg' \
+	        || true
 
 convert:
 	for svg in opt/drawable/*.svg; do        \
@@ -76,7 +84,7 @@ convert:
 
 $(OBJ): $(SRC) $(GEN) | obj
 	@echo "JAVAC  $@"
-	@javac -g                         \
+	@javac -g -Xlint:unchecked        \
 		-bootclasspath $(ANDROID) \
 		-encoding      UTF-8      \
 		-source        1.5        \
@@ -86,6 +94,11 @@ $(OBJ): $(SRC) $(GEN) | obj
 		$+
 
 $(GEN): AndroidManifest.xml $(RES) | gen
+	@if ! [ -d "res/drawable" ]; then \
+		echo Please run           \
+		     \'make graphics\';   \
+		exit 1;                   \
+	fi
 	@echo "GEN    $@"
 	@aapt package -f -m               \
 		-I $(ANDROID)             \
@@ -96,3 +109,6 @@ $(GEN): AndroidManifest.xml $(RES) | gen
 # Directories
 bin gen obj:
 	@mkdir -p $@
+
+# Use parallel javac instead
+.NOTPARALLEL: