Merge branch 'master' of ssh://mjb@git.ethernal.org/~/git/altos

diff --git a/altosdroid/.classpath b/altosdroid/.classpath
index d260cafa9fa7daecc06482f74eba146785e19742..0ca188f976cb1ad5ecb928955d6393cf283d7a0d 100644 (file)
--- a/altosdroid/.classpath
+++ b/altosdroid/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-       <classpathentry kind="lib" path="lib/AltosLib.jar"/>
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="src" path="gen"/>
-       <classpathentry kind="output" path="bin"/>
+       <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+       <classpathentry kind="output" path="bin/classes"/>
 </classpath>

diff --git a/altosdroid/.gitignore b/altosdroid/.gitignore
index 44f249ee45e16c594a5674f9af38f4ec709c577a..c0bb8dd49fe499ffa29593dba371369e85d71f0d 100644 (file)
--- a/altosdroid/.gitignore
+++ b/altosdroid/.gitignore
@@ -1,4 +1,3 @@
 local.properties
 bin
 gen
-local.properties

diff --git a/altosdroid/Makefile.am b/altosdroid/Makefile.am
index 0732087b437cc32bbf281605658b963d8f030bd5..6ee984c2588f2aaa43956a16d803bff20fa9959a 100644 (file)
--- a/altosdroid/Makefile.am
+++ b/altosdroid/Makefile.am
@@ -15,6 +15,11 @@ APKBUILDER=$(SDK)/tools/apkbuilder
 ZIPALIGN=$(SDK)/tools/zipalign
 
 SRC_DIR=src/org/altusmetrum/AltosDroid
+EXT_LIBDIR=libs
+ALTOSLIB_SRCDIR=../altoslib
+ALTOSLIB_JAR=AltosLib.jar
+
+ALTOSLIB=$(EXT_LIBDIR)/$(ALTOSLIB_JAR)
 
 SRC=\
        $(SRC_DIR)/AltosDroid.java \
@@ -25,11 +30,9 @@ SRC=\
 
 all: $(all_target)
 
-ALTOSLIB=bin/classes/AltosLib.jar
-
-$(ALTOSLIB):
-       mkdir -p bin/classes
-       cd bin/classes && ln -s ../../../altoslib/AltosLib.jar .
+$(ALTOSLIB): $(ALTOSLIB_SRCDIR)/$(ALTOSLIB_JAR)
+       mkdir -p $(EXT_LIBDIR)
+       cd $(EXT_LIBDIR) && ln -s $(shell echo $(EXT_LIBDIR) | sed 's|[^/]\+|..|g')/$(ALTOSLIB_SRCDIR)/$(ALTOSLIB_JAR) .
 
 if ANDROID
 install-release: bin/AltosDroid-release.apk

diff --git a/altosdroid/build.properties b/altosdroid/build.properties
deleted file mode 100644 (file)
index 63d080c..0000000
--- a/altosdroid/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-jar.libs.dir=../altoslib
\ No newline at end of file

diff --git a/altosdroid/libs/.gitignore b/altosdroid/libs/.gitignore
new file mode 100644 (file)
index 0000000..b4e68f6
--- /dev/null
+++ b/altosdroid/libs/.gitignore
@@ -0,0 +1 @@
+AltosLib.jar

diff --git a/altosdroid/local.properties.in b/altosdroid/local.properties.in
index 543ce2081e565c9bbbcfb1f1c63bb21a569cb1c1..14df0494361de26fac8c85bb7f9815ae951443f6 100644 (file)
--- a/altosdroid/local.properties.in
+++ b/altosdroid/local.properties.in
@@ -8,4 +8,3 @@
 # For customization when using a Version Control System, please read the
 # header note.
 sdk.dir=@ANDROID_SDK@
-extensible.libs.classpath=../altoslib