1.1 --- a/Makefile.am	Sat Mar 03 15:56:29 2012 +1000
     1.2 +++ b/Makefile.am	Sat Mar 03 16:06:58 2012 +1000
     1.3 @@ -100,18 +100,24 @@
     1.4  bundle: all
     1.5  
     1.6  if GUI_ANDROID
     1.7 -apk: src/liblxdream.so
     1.8 +all-local:
     1.9 +	(TARGETDIR="`pwd`/android" && cd $(srcdir)/android && \
    1.10 +	    $(ANT) -buildfile build.xml -Dsdk.dir=$(ANDROID_SDK_HOME) \
    1.11 +	       -Dout.dir="$$TARGETDIR" -Dnative.libs.dir="$$TARGETDIR/libs" \
    1.12 +	       -Dnative.libs.absolute.dir="$$TARGETDIR/libs" \
    1.13 +	       -Dtarget=$(ANDROID_SDK_VERSION) clean )
    1.14  	$(mkdir_p) android/libs/armeabi
    1.15  	$(INSTALL) src/liblxdream.so android/libs/armeabi/liblxdream.so
    1.16  	$(INSTALL) $(ANDROID_GDBSERVER) android/libs/armeabi/gdbserver
    1.17  	$(STRIP) --strip-unneeded android/libs/armeabi/liblxdream.so
    1.18  	(TARGETDIR="`pwd`/android" && cd $(srcdir)/android && \
    1.19  	    $(ANT) -buildfile build.xml -Dsdk.dir=$(ANDROID_SDK_HOME) \
    1.20 -	       -Dout.dir="$$TARGETDIR" \
    1.21 -	       -Dnative.libs.dir="$$TARGETDIR/libs" \
    1.22 +	       -Dout.dir="$$TARGETDIR" -Dnative.libs.dir="$$TARGETDIR/libs" \
    1.23  	       -Dnative.libs.absolute.dir="$$TARGETDIR/libs" \
    1.24  	       -Dtarget=$(ANDROID_SDK_VERSION) debug )
    1.25  	cp android/Lxdream-debug.apk Lxdream-debug.apk
    1.26  
    1.27 -all-local: apk
    1.28 +install-adb:
    1.29 +	$(ANDROID_SDK_HOME)/platform-tools/adb install -r Lxdream-debug.apk
    1.30 +
    1.31  endif

     2.1 --- a/Makefile.in	Sat Mar 03 15:56:29 2012 +1000
     2.2 +++ b/Makefile.in	Sat Mar 03 16:06:58 2012 +1000
     2.3 @@ -890,20 +890,25 @@
     2.4  
     2.5  bundle: all
     2.6  
     2.7 -@GUI_ANDROID_TRUE@apk: src/liblxdream.so
     2.8 +@GUI_ANDROID_TRUE@all-local:
     2.9 +@GUI_ANDROID_TRUE@	(TARGETDIR="`pwd`/android" && cd $(srcdir)/android && \
    2.10 +@GUI_ANDROID_TRUE@	    $(ANT) -buildfile build.xml -Dsdk.dir=$(ANDROID_SDK_HOME) \
    2.11 +@GUI_ANDROID_TRUE@	       -Dout.dir="$$TARGETDIR" -Dnative.libs.dir="$$TARGETDIR/libs" \
    2.12 +@GUI_ANDROID_TRUE@	       -Dnative.libs.absolute.dir="$$TARGETDIR/libs" \
    2.13 +@GUI_ANDROID_TRUE@	       -Dtarget=$(ANDROID_SDK_VERSION) clean )
    2.14  @GUI_ANDROID_TRUE@	$(mkdir_p) android/libs/armeabi
    2.15  @GUI_ANDROID_TRUE@	$(INSTALL) src/liblxdream.so android/libs/armeabi/liblxdream.so
    2.16  @GUI_ANDROID_TRUE@	$(INSTALL) $(ANDROID_GDBSERVER) android/libs/armeabi/gdbserver
    2.17  @GUI_ANDROID_TRUE@	$(STRIP) --strip-unneeded android/libs/armeabi/liblxdream.so
    2.18  @GUI_ANDROID_TRUE@	(TARGETDIR="`pwd`/android" && cd $(srcdir)/android && \
    2.19  @GUI_ANDROID_TRUE@	    $(ANT) -buildfile build.xml -Dsdk.dir=$(ANDROID_SDK_HOME) \
    2.20 -@GUI_ANDROID_TRUE@	       -Dout.dir="$$TARGETDIR" \
    2.21 -@GUI_ANDROID_TRUE@	       -Dnative.libs.dir="$$TARGETDIR/libs" \
    2.22 +@GUI_ANDROID_TRUE@	       -Dout.dir="$$TARGETDIR" -Dnative.libs.dir="$$TARGETDIR/libs" \
    2.23  @GUI_ANDROID_TRUE@	       -Dnative.libs.absolute.dir="$$TARGETDIR/libs" \
    2.24  @GUI_ANDROID_TRUE@	       -Dtarget=$(ANDROID_SDK_VERSION) debug )
    2.25  @GUI_ANDROID_TRUE@	cp android/Lxdream-debug.apk Lxdream-debug.apk
    2.26  
    2.27 -@GUI_ANDROID_TRUE@all-local: apk
    2.28 +@GUI_ANDROID_TRUE@install-adb:
    2.29 +@GUI_ANDROID_TRUE@	$(ANDROID_SDK_HOME)/platform-tools/adb install -r Lxdream-debug.apk
    2.30  # Tell versions [3.59,3.63) of GNU make to not export all variables.
    2.31  # Otherwise a system limit (for SysV at least) may be exceeded.
    2.32  .NOEXPORT: