1.1 --- a/Makefile.in	Thu Feb 23 08:49:32 2012 +1000
     1.2 +++ b/Makefile.in	Tue Feb 28 17:25:26 2012 +1000
     1.3 @@ -40,13 +40,13 @@
     1.4  	$(srcdir)/Info.plist.in $(srcdir)/Makefile.am \
     1.5  	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
     1.6  	$(top_srcdir)/configure $(top_srcdir)/test/Makefile.in AUTHORS \
     1.7 -	COPYING ChangeLog INSTALL NEWS TODO acconfig.h compile \
     1.8 -	config.guess config.sub depcomp install-sh missing \
     1.9 -	mkinstalldirs
    1.10 +	COPYING ChangeLog INSTALL NEWS acconfig.h compile config.guess \
    1.11 +	config.sub depcomp install-sh missing mkinstalldirs
    1.12  subdir = .
    1.13  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    1.14  am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
    1.15 -	$(top_srcdir)/m4/ccforbuild.m4 $(top_srcdir)/configure.in
    1.16 +	$(top_srcdir)/m4/ccforbuild.m4 $(top_srcdir)/m4/android.m4 \
    1.17 +	$(top_srcdir)/configure.in
    1.18  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    1.19  	$(ACLOCAL_M4)
    1.20  am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
    1.21 @@ -94,6 +94,11 @@
    1.22  AMDEP_FALSE = @AMDEP_FALSE@
    1.23  AMDEP_TRUE = @AMDEP_TRUE@
    1.24  AMTAR = @AMTAR@
    1.25 +ANDROID_GDBSERVER = @ANDROID_GDBSERVER@
    1.26 +ANDROID_NDK_HOME = @ANDROID_NDK_HOME@
    1.27 +ANDROID_SDK_HOME = @ANDROID_SDK_HOME@
    1.28 +ANDROID_SDK_VERSION = @ANDROID_SDK_VERSION@
    1.29 +ANT = @ANT@
    1.30  ARMCC = @ARMCC@
    1.31  ARMLD = @ARMLD@
    1.32  ARMOBJCOPY = @ARMOBJCOPY@
    1.33 @@ -162,6 +167,8 @@
    1.34  GREP = @GREP@
    1.35  GTK_CFLAGS = @GTK_CFLAGS@
    1.36  GTK_LIBS = @GTK_LIBS@
    1.37 +GUI_ANDROID_FALSE = @GUI_ANDROID_FALSE@
    1.38 +GUI_ANDROID_TRUE = @GUI_ANDROID_TRUE@
    1.39  GUI_COCOA_FALSE = @GUI_COCOA_FALSE@
    1.40  GUI_COCOA_TRUE = @GUI_COCOA_TRUE@
    1.41  GUI_GTK_FALSE = @GUI_GTK_FALSE@
    1.42 @@ -697,7 +704,7 @@
    1.43  	       exit 1; } >&2
    1.44  check-am: all-am
    1.45  check: check-recursive
    1.46 -@GUI_COCOA_FALSE@all-local:
    1.47 +@GUI_ANDROID_FALSE@@GUI_COCOA_FALSE@all-local:
    1.48  all-am: Makefile $(MANS) $(DATA) config.h all-local
    1.49  installdirs: installdirs-recursive
    1.50  installdirs-am:
    1.51 @@ -881,6 +888,20 @@
    1.52  	@echo --- Done ---
    1.53  
    1.54  bundle: all
    1.55 +
    1.56 +@GUI_ANDROID_TRUE@Lxdream-debug.apk: src/liblxdream.so
    1.57 +@GUI_ANDROID_TRUE@	$(mkdir_p) android/libs/armeabi
    1.58 +@GUI_ANDROID_TRUE@	$(INSTALL) src/liblxdream.so android/libs/armeabi/liblxdream.so
    1.59 +@GUI_ANDROID_TRUE@	$(INSTALL) $(ANDROID_GDBSERVER) android/libs/armeabi/gdbserver
    1.60 +@GUI_ANDROID_TRUE@	$(STRIP) --strip-unneeded android/libs/armeabi/liblxdream.so
    1.61 +@GUI_ANDROID_TRUE@	(TARGETDIR="`pwd`/android" && cd $(srcdir)/android && \
    1.62 +@GUI_ANDROID_TRUE@	    $(ANT) -buildfile build.xml -Dsdk.dir=$(ANDROID_SDK_HOME) \
    1.63 +@GUI_ANDROID_TRUE@	       -Dout.dir="$$TARGETDIR" \
    1.64 +@GUI_ANDROID_TRUE@	       -Dnative.libs.dir="$$TARGETDIR/libs" \
    1.65 +@GUI_ANDROID_TRUE@	       -Dtarget=$(ANDROID_SDK_VERSION) debug )
    1.66 +@GUI_ANDROID_TRUE@	cp android/Lxdream-debug.apk Lxdream-debug.apk
    1.67 +
    1.68 +@GUI_ANDROID_TRUE@all-local: Lxdream-debug.apk
    1.69  # Tell versions [3.59,3.63) of GNU make to not export all variables.
    1.70  # Otherwise a system limit (for SysV at least) may be exceeded.
    1.71  .NOEXPORT: