From 4104c8c94ccf3598bc5c46c946098050b093d7e8 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 1 Jan 2012 10:42:06 -0800
Subject: Get closer to building with make

---
 Makefile | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index ac07661..5468095 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 SDK=/home/keithp/src/android/android-sdk-linux
+PWD=/home/keithp/src/android/AltosDroid
 
 DX=$(SDK)/platform-tools/dx
 ADB=$(SDK)/platform-tools/adb
@@ -11,7 +12,7 @@ PLATFORM_JAR=$(PLATFORM)/android.jar
 ADDONS=$(SDK)/add-ons/addon-google_apis-google_inc_-10/libs
 TOOLS_LIB=$(SDK)/tools/lib
 CLASSPATH=".:$(PLATFORM)/*:$(TOOLS_LIB)/*"
-CLASSES=classes
+CLASSES=bin/classes
 SRC_DIR=src/org/altusmetrum/AltosDroid
 GEN_DIR=gen/org/altusmetrum/AltosDroid
 JAVAC=javac
@@ -33,16 +34,7 @@ SRC=\
 	$(SRC_DIR)/DeviceListActivity.java \
 	$(GEN_DIR)/R.java
 
-all: class.stamp AltosDroid.apk
-
-class.stamp: $(SRC)
-	$(JAVAC) $(JAVACFLAGS) $(SRC) && touch $@
-
-AltosDroid.dex: class.stamp
-	$(DX) --dex --verbose --output=$@ $(CLASSES)
-
-AltosDroid.apk: AltosDroid.dex
-	$(APKBUILDER) "$@" -u -f AltosDroid.dex
+all: align.stamp
 
 install: AltosDroid.apk
 	$(ADB) -e install -r AltosDroid.apk
@@ -50,8 +42,11 @@ install: AltosDroid.apk
 $(GEN_DIR)/R.java: resources.stamp
 
 resources.stamp: Makefile
-	mkdir -p bin/res
-	$(AAPT) package -f -m -M AndroidManifest.xml -S bin/res -S res -I $(PLATFORM_JAR) -J gen --generate-dependencies && touch $@
+	mkdir -p res libs bin bin/res bin/classes gen assets
+	$(AAPT) package -f -m -M $(PWD)/AndroidManifest.xml -S $(PWD)/bin/res -S $(PWD)/res -I $(PLATFORM_JAR) -J $(PWD)/gen --generate-dependencies && touch $@
+
+class.stamp: $(SRC)
+	$(JAVAC) $(JAVACFLAGS) $(SRC) && touch $@
 
 dex.stamp: Makefile class.stamp
 	$(DX) --dex --output bin/classes.dex bin/classes && touch $@
@@ -60,7 +55,7 @@ crunch.stamp: Makefile dex.stamp
 	$(AAPT) crunch -v -S res -C bin/res
 
 package.stamp: Makefile crunch.stamp
-	$(AAPT) package --no-crunch -f --debug-mode -M AndroidManifest.xml -S bin/res -S res -A assets -I $(PLATFORM_JAR) -F bin/activity.ap_ --generate-dependencies && touch $@
+	$(AAPT) package --no-crunch -f --debug-mode -M $(PWD)/AndroidManifest.xml -S $(PWD)/bin/res -S $(PWD)/res -A $(PWD)/assets -I $(PLATFORM_JAR) -F $(PWD)/bin/activity.ap_ --generate-dependencies && touch $@
 
 align.stamp: Makefile package.stamp
-	$(ZIPALIGN) -f 4 bin/activity-debug-unaligned.apk bin/activity-debug.apk
\ No newline at end of file
+	$(ZIPALIGN) -f 4 bin/activity-debug-unaligned.apk bin/activity-debug.apk && touch $@
\ No newline at end of file
-- 
cgit v1.2.3