diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-03-02 22:15:23 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-03-03 01:14:15 +0200 |
| commit | bd36b992cf2bf2c395ce6f6f0e89d517cc02d1dc (patch) | |
| tree | 48f053269a35d0d3bd095ed184c391b81c36c78f | |
| parent | 9e991e1852fa764e78d88b5d3aab17e45ac9213e (diff) | |
Support an ad-hoc (non-gbuild) Makefile workflow for the Android apps
For now, we want to keep being able to just say for instance "make run" in the
android app directories.
Change-Id: I1898d5466c0df6007fa32b202888bed644fa9489
| -rw-r--r-- | android/experimental/DocumentLoader/Makefile | 4 | ||||
| -rw-r--r-- | android/experimental/LibreOffice4Android/Makefile | 4 | ||||
| -rw-r--r-- | android/experimental/desktop/Makefile | 4 | ||||
| -rw-r--r-- | android/sdremote/Makefile | 4 |
4 files changed, 12 insertions, 4 deletions
diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 4f738c295f8d..40fd6dcb4113 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -1,4 +1,6 @@ -include $(BUILDDIR)/config_host.mk +ifeq ($(BUILDDIR),) +include ../../../config_host.mk +endif # The default target just builds. all: build-ant diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index f932235e2579..7984be4278e8 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -1,4 +1,6 @@ -include $(BUILDDIR)/config_host.mk +ifeq ($(BUILDDIR),) +include ../../../config_host.mk +endif # The default target just builds. diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile index eb4b029e70be..273aca614a3a 100644 --- a/android/experimental/desktop/Makefile +++ b/android/experimental/desktop/Makefile @@ -1,4 +1,6 @@ -include $(BUILDDIR)/config_host.mk +ifeq ($(BUILDDIR),) +include ../../../config_host.mk +endif # The default target just builds. all: build-ant diff --git a/android/sdremote/Makefile b/android/sdremote/Makefile index eb78e0de6d02..b8ea1e9088d3 100644 --- a/android/sdremote/Makefile +++ b/android/sdremote/Makefile @@ -6,7 +6,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -include $(BUILDDIR)/config_host.mk +ifeq ($(BUILDDIR),) +include ../../config_host.mk +endif all: properties translations.done mkdir -p ../abs-lib/libs |