Search
lxdream.org :: lxdream/Makefile.in :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename Makefile.in
changeset 1249:a81130f57df6
prev1245:01e0020adf88
next1255:d63f73cc586f
author nkeynes
date Sat Mar 03 16:06:58 2012 +1000 (10 years ago)
permissions -rw-r--r--
last change Fully clean the android part before building it - dependencies don't seem to
work properly.
Add install-adb rule for convenience
file annotate diff log raw
1.1 --- a/Makefile.in Fri Mar 02 23:49:10 2012 +1000
1.2 +++ b/Makefile.in Sat Mar 03 16:06:58 2012 +1000
1.3 @@ -890,20 +890,25 @@
1.4
1.5 bundle: all
1.6
1.7 -@GUI_ANDROID_TRUE@apk: src/liblxdream.so
1.8 +@GUI_ANDROID_TRUE@all-local:
1.9 +@GUI_ANDROID_TRUE@ (TARGETDIR="`pwd`/android" && cd $(srcdir)/android && \
1.10 +@GUI_ANDROID_TRUE@ $(ANT) -buildfile build.xml -Dsdk.dir=$(ANDROID_SDK_HOME) \
1.11 +@GUI_ANDROID_TRUE@ -Dout.dir="$$TARGETDIR" -Dnative.libs.dir="$$TARGETDIR/libs" \
1.12 +@GUI_ANDROID_TRUE@ -Dnative.libs.absolute.dir="$$TARGETDIR/libs" \
1.13 +@GUI_ANDROID_TRUE@ -Dtarget=$(ANDROID_SDK_VERSION) clean )
1.14 @GUI_ANDROID_TRUE@ $(mkdir_p) android/libs/armeabi
1.15 @GUI_ANDROID_TRUE@ $(INSTALL) src/liblxdream.so android/libs/armeabi/liblxdream.so
1.16 @GUI_ANDROID_TRUE@ $(INSTALL) $(ANDROID_GDBSERVER) android/libs/armeabi/gdbserver
1.17 @GUI_ANDROID_TRUE@ $(STRIP) --strip-unneeded android/libs/armeabi/liblxdream.so
1.18 @GUI_ANDROID_TRUE@ (TARGETDIR="`pwd`/android" && cd $(srcdir)/android && \
1.19 @GUI_ANDROID_TRUE@ $(ANT) -buildfile build.xml -Dsdk.dir=$(ANDROID_SDK_HOME) \
1.20 -@GUI_ANDROID_TRUE@ -Dout.dir="$$TARGETDIR" \
1.21 -@GUI_ANDROID_TRUE@ -Dnative.libs.dir="$$TARGETDIR/libs" \
1.22 +@GUI_ANDROID_TRUE@ -Dout.dir="$$TARGETDIR" -Dnative.libs.dir="$$TARGETDIR/libs" \
1.23 @GUI_ANDROID_TRUE@ -Dnative.libs.absolute.dir="$$TARGETDIR/libs" \
1.24 @GUI_ANDROID_TRUE@ -Dtarget=$(ANDROID_SDK_VERSION) debug )
1.25 @GUI_ANDROID_TRUE@ cp android/Lxdream-debug.apk Lxdream-debug.apk
1.26
1.27 -@GUI_ANDROID_TRUE@all-local: apk
1.28 +@GUI_ANDROID_TRUE@install-adb:
1.29 +@GUI_ANDROID_TRUE@ $(ANDROID_SDK_HOME)/platform-tools/adb install -r Lxdream-debug.apk
1.30 # Tell versions [3.59,3.63) of GNU make to not export all variables.
1.31 # Otherwise a system limit (for SysV at least) may be exceeded.
1.32 .NOEXPORT:
.