* Remove older *.properties methods of locating lib dir
* clean up Eclipse classpath file
* adjust Makefile.am to link AltosLib.jar into libs/
Signed-off-by: Mike Beattie <mike@ethernal.org>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<?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="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"/>
ZIPALIGN=$(SDK)/tools/zipalign
SRC_DIR=src/org/altusmetrum/AltosDroid
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 \
SRC=\
$(SRC_DIR)/AltosDroid.java \
-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
if ANDROID
install-release: bin/AltosDroid-release.apk
+++ /dev/null
-jar.libs.dir=../altoslib
\ No newline at end of file
# For customization when using a Version Control System, please read the
# header note.
sdk.dir=@ANDROID_SDK@
# For customization when using a Version Control System, please read the
# header note.
sdk.dir=@ANDROID_SDK@
-extensible.libs.classpath=../altoslib