Update makefile for version 20

- Change build tools folder to version 20
- Change .dbg extension to -dbg.apk because ADB refuses
  to install packages with different extensions

diff --git a/makefile b/makefile
index 94988d6bf5fe5f05561e2472160574419f3ea729..3df37e276f8b31ed922e44254548ac8d91cd72ac 100644 (file)
--- a/makefile
+++ b/makefile
@@ -8,7 +8,7 @@ KEYTYPE ?= pkcs12
 KEYNAME ?= android
 ANDROID ?= /opt/android-sdk-update-manager/platforms/android-18/android.jar
 SDKLIB  ?= /opt/android-sdk-update-manager/tools/lib/sdklib.jar
-TOOLS   ?= /opt/android-sdk-update-manager/build-tools/19.0.1
+TOOLS   ?= /opt/android-sdk-update-manager/build-tools/20.0.0
 
 # Variables
 PATH    := $(PATH):$(TOOLS)
@@ -21,7 +21,7 @@ APK     := java -classpath $(SDKLIB) \
                 com.android.sdklib.build.ApkBuilderMain
 
 # Targets
-debug: bin/$(PROGRAM).dbg
+debug: bin/$(PROGRAM)-dbg.apk
 
 release: bin/$(PROGRAM).apk
 
@@ -39,7 +39,7 @@ run: bin/install.stamp
                -a android.intent.action.MAIN \
                -n $(PACKAGE)/.Main
 
-install bin/install.stamp: bin/$(PROGRAM).dbg
+install bin/install.stamp: bin/$(PROGRAM)-dbg.apk
        adb install -r $+
        touch bin/install.stamp
 
@@ -76,7 +76,7 @@ convert:
        done
 
 # Rules
-%.dbg: %.dex %.res | bin
+%-dbg.apk: %.dex %.res | bin
        @echo "APK    $@.in"
        @$(APK) $@.in -f $*.dex -z $*.res
        @echo "ALIGN  $@"