summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Beattie <mike@ethernal.org>2012-01-02 22:12:04 +1300
committerMike Beattie <mike@ethernal.org>2012-01-02 22:12:04 +1300
commit9a40427eab1a127d853303eb1e349eb0ca37181e (patch)
tree0b04501b3452c880d0214df2d752ba12a69dc307
parent6992abccb8f748e54384ed6c70299420a7c02ea1 (diff)
Adjust Makefile and .gitignoreHEADmaster
* Add classes/ to .gitignore * Adjust SDK variable in Makefile to read SDK path from local.properties Signed-off-by: Mike Beattie <mike@ethernal.org>
-rw-r--r--.gitignore1
-rw-r--r--Makefile4
2 files changed, 3 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index e614fbb..e600500 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
bin
gen
+classes
diff --git a/Makefile b/Makefile
index f8f86ef..ae46d67 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-SDK=../android-sdk-linux
+SDK=$(shell sed -ne 's/sdk.dir=//p' local.properties)
DX=$(SDK)/platform-tools/dx
ADB=$(SDK)/platform-tools/adb
@@ -28,4 +28,4 @@ bin/AltosDroid-release.apk: $(SRC)
ant release
clean:
- ant clean \ No newline at end of file
+ ant clean