X-Git-Url: http://pileus.org/git/?p=~andy%2FiBeaconNav;a=blobdiff_plain;f=makefile;h=7eaf6844b3e3dc938ee17ad40cc7c09683ae922f;hp=5ad3fd541a4d33cf689b6dd03fce9d8050ce60ea;hb=HEAD;hpb=fdda051052f9cf05e48ce1ee1bcabaab2e1bbb2c

diff --git a/makefile b/makefile
index 5ad3fd5..7eaf684 100644
--- a/makefile
+++ b/makefile
@@ -9,6 +9,7 @@ KEYNAME ?= android
 ANDROID ?= /opt/android-sdk-update-manager/platforms/android-18/android.jar
 SDKLIB  ?= /opt/android-sdk-update-manager/tools/lib/sdklib.jar
 MAPLIB  ?= /opt/android-sdk-update-manager/extras/google/google_play_services/libproject/google-play-services_lib/libs/google-play-services.jar
+IBEACON ?= /home/andy/class/AndroidIBeaconLibrary/libs/classes.jar
 TOOLS   ?= /opt/android-sdk-update-manager/build-tools/19.0.1
 
 # Variables
@@ -33,19 +34,19 @@ clean:
 
 # ADB targets
 logcat:
-	adb logcat $(PROGRAM):D AndroidRuntime:E '*:S'
+	adb $(ADBFLAGS) logcat $(PROGRAM):D IBeaconManager:D AndroidRuntime:E '*:S'
 
 run: bin/install.stamp
-	adb shell am start -W                 \
+	adb $(ADBFLAGS) shell am start -W                 \
 		-a android.intent.action.MAIN \
 		-n $(PACKAGE)/.Main
 
-install bin/install.stamp: bin/$(PROGRAM).apk
-	adb install -r $+
+install bin/install.stamp: bin/$(PROGRAM).dbg
+	adb $(ADBFLAGS) install -r $+
 	touch bin/install.stamp
 
 uninstall:
-	adb uninstall $(PACKAGE)
+	adb $(ADBFLAGS) uninstall $(PACKAGE)
 	rm -f bin/install.stamp
 
 # Rules
@@ -66,8 +67,8 @@ uninstall:
 	@zipalign -f 4 $@.in $@
 
 %.dex: $(OBJ) makefile | bin
-	@echo "DEX    $@ obj $(notdir $(MAPLIB))"
-	@dx --dex --output $@ obj $(MAPLIB)
+	@echo "DEX    $@ obj $(notdir $(MAPLIB)) $(notdir $(IBEACON))"
+	@dx --dex --output $@ obj $(MAPLIB) $(IBEACON)
 
 %.res: AndroidManifest.xml $(RES) | bin
 	@echo "RES    $@"
@@ -77,11 +78,12 @@ uninstall:
 		-M AndroidManifest.xml    \
 		-S res                    \
 		-S /opt/android-sdk-update-manager/extras/google/google_play_services/libproject/google-play-services_lib/res \
+		-S /home/andy/class/AndroidIBeaconLibrary/res \
 		-F $*.res
 
 $(OBJ): $(SRC) $(GEN) makefile | obj
 	@echo "JAVAC  obj/*.class $+"
-	@JARS=$(ANDROID):$(MAPLIB);       \
+	@JARS=$(ANDROID):$(MAPLIB):$(IBEACON); \
 	 javac -g                         \
 		-Xlint:unchecked          \
 		-Xlint:deprecation        \
@@ -95,6 +97,11 @@ $(OBJ): $(SRC) $(GEN) makefile | obj
 
 $(GEN): AndroidManifest.xml $(RES) | gen
 	@echo "GEN    $@"
+	@aapt package -f -m               \
+		-I $(ANDROID)             \
+		-M /home/andy/class/AndroidIBeaconLibrary/AndroidManifest.xml \
+		-S /home/andy/class/AndroidIBeaconLibrary/res \
+		-J gen
 	@aapt package -f -m               \
 		-I $(ANDROID)             \
 		-M /opt/android-sdk-update-manager/extras/google/google_play_services/libproject/google-play-services_lib/AndroidManifest.xml \
@@ -106,6 +113,7 @@ $(GEN): AndroidManifest.xml $(RES) | gen
 		-M AndroidManifest.xml    \
 		-S res                    \
 		-S /opt/android-sdk-update-manager/extras/google/google_play_services/libproject/google-play-services_lib/res \
+		-S /home/andy/class/AndroidIBeaconLibrary/res \
 		-J gen
 
 # Directories