diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2009-08-11 20:25:28 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2009-08-11 20:25:28 +0000 |
| commit | 66b0fda8d8130252169e7761c5a80c5edd7affcb (patch) | |
| tree | 744c733a15c1505f3796b45325e434c2c66efb3d /navit/graphics | |
| parent | a662f77b51120f165a3ba7b5945a31912a4b90f3 (diff) | |
| download | navit-66b0fda8d8130252169e7761c5a80c5edd7affcb.tar.gz | |
Add:Core:More android work
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@2458 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/graphics')
| -rw-r--r-- | navit/graphics/Makefile.am | 3 | ||||
| -rw-r--r-- | navit/graphics/android/Makefile.am | 9 | ||||
| -rw-r--r-- | navit/graphics/null/Makefile.am | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/navit/graphics/Makefile.am b/navit/graphics/Makefile.am index af999d007..4b18d2255 100644 --- a/navit/graphics/Makefile.am +++ b/navit/graphics/Makefile.am @@ -1,4 +1,7 @@ SUBDIRS=null +if GRAPHICS_ANDROID + SUBDIRS+=android +endif if GRAPHICS_GTK_DRAWING_AREA SUBDIRS+=gtk_drawing_area endif diff --git a/navit/graphics/android/Makefile.am b/navit/graphics/android/Makefile.am index 9f1d09390..7106b389c 100644 --- a/navit/graphics/android/Makefile.am +++ b/navit/graphics/android/Makefile.am @@ -6,11 +6,4 @@ else noinst_LTLIBRARIES = libgraphics_android.la endif libgraphics_android_la_SOURCES = graphics_android.c -libgraphics_android_la_LDFLAGS = -module -avoid-version -Xcompiler -nostdlib - -android: libgraphics_android.la - mkdir -p ../../android/libs/armeabi/navit/graphics - cp .libs/libgraphics_android.so ../../android/libs/armeabi - -push: libgraphics_android.la - adb push .libs/libgraphics_android.so /data/data/org.navitproject.navit/lib +libgraphics_android_la_LDFLAGS = -module -avoid-version @MODULE_LDFLAGS@ diff --git a/navit/graphics/null/Makefile.am b/navit/graphics/null/Makefile.am index 9fe6ffc1e..15d1a0840 100644 --- a/navit/graphics/null/Makefile.am +++ b/navit/graphics/null/Makefile.am @@ -6,4 +6,4 @@ else noinst_LTLIBRARIES = libgraphics_null.la endif libgraphics_null_la_SOURCES = graphics_null.c -libgraphics_null_la_LDFLAGS = -module -avoid-version +libgraphics_null_la_LDFLAGS = -module -avoid-version @MODULE_LDFLAGS@ |