Updates for Android SDK 23.

[~andy/spades] / makefile

diff --git a/makefile b/makefile
index c58c3c2c99f7938b7f60fc582c4b185c37628b1f..6a8082dbcc97373d09af78245945b85eff8aedb4 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,78 +1,8 @@
 # Settings
-ANDROID := /opt/android-sdk-update-manager/platforms/android-10/android.jar
-PACKAGE := org.pileus.spades
-OUTPUT  := bin/Spades.apk
+PROGRAM  ?= Spades
+ACTIVITY ?= Main
+PACKAGE  ?= org.pileus.spades
 
-# Sources
-RES     := $(shell find res -name '*.xml')
-SRC     := $(shell find src -name '*.java')
-
-# Objects
-GEN     := gen/$(subst .,/,$(PACKAGE))/R.java
-OBJ     := $(subst .java,.class,   \
-                $(SRC:src/%=obj/%) \
-                $(GEN:gen/%=obj/%))
-
-# Targets
-default: run
-
-compile: $(OBJ)
-
-debug: $(OUTPUT)
-
-clean:
-       rm -rf bin gen obj
-
-logcat:
-       adb logcat Spades:D AndroidRuntime:E '*:S'
-
-run: bin/install.stamp
-       adb shell am start -W -a android.intent.action.MAIN -n $(PACKAGE)/.Main
-       
-
-install bin/install.stamp: $(OUTPUT)
-       adb uninstall $(PACKAGE)
-       adb install -r $+
-       touch bin/install.stamp
-
-# Rules
-%.apk: %.dex %.res | bin
-       @echo "APK    $@.in"
-       @apkbuilder $@.in -f $*.dex -z $*.res
-       @echo ALIGN $@
-       @zipalign -f 4 $@.in $@
-
-%.dex: $(OBJ) | bin
-       @echo "DEX    $@ "
-       @dx --dex --output $@ obj
-
-%.res: AndroidManifest.xml $(RES) | bin
-       @echo "RES    $@"
-       @aapt package -f -m               \
-               -I $(ANDROID)             \
-               -M AndroidManifest.xml    \
-               -S res                    \
-               -F $*.res
-
-$(OBJ): $(SRC) $(GEN) | obj
-       @echo "JAVAC  $@"
-       @javac -g                         \
-               -bootclasspath $(ANDROID) \
-               -encoding      UTF-8      \
-               -source        1.5        \
-               -target        1.5        \
-               -classpath     obj        \
-               -d             obj        \
-               $+
-
-$(GEN): AndroidManifest.xml $(RES) | gen
-       @echo "GEN    $@"
-       @aapt package -f -m               \
-               -I $(ANDROID)             \
-               -M AndroidManifest.xml    \
-               -S res                    \
-               -J gen
-
-# Directories
-bin gen obj:
-       @mkdir -p $@
+# Include common files
+-include config.mk
+-include common.mk