Commit 9e6ff7bb2ad2757e6cfef16fbb144f36e3ee7a0c
2012-09-11T14:27:54
Update Android.mk Squashed from commits by Helio Chissini de Castro <helio.chissini.de.castro@collabora.co.uk> and Pekka Paalanen <ppaalanen@gmail.com>. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50
diff --git a/Android.mk b/Android.mk
index 75b4c9d..aad662c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,4 @@
LOCAL_PATH:= $(call my-dir)
-
include $(CLEAR_VARS)
LIBXKBCOMMON_TOP := $(LOCAL_PATH)
@@ -7,7 +6,9 @@ LIBXKBCOMMON_TOP := $(LOCAL_PATH)
LIBXKBCOMMON_BUILT_MAKEFILES := \
$(LIBXKBCOMMON_TOP)/Android_build.mk
-libxkbcommon-configure:
+LIBXKBCOMMON_CONFIGURE_TARGET := $(LIBXKBCOMMON_TOP)/Makefile
+
+$(LIBXKBCOMMON_CONFIGURE_TARGET): $(CONFIGURE_DEPENDENCIES)
cd $(LIBXKBCOMMON_TOP) && autoreconf -fiv
cd $(LIBXKBCOMMON_TOP) && \
CC="$(CONFIGURE_CC)" \
@@ -27,6 +28,11 @@ libxkbcommon-configure:
make -C $$(dirname $$file) $$(basename $$file) ; \
done
+$(LIBXKBCOMMON_BUILT_MAKEFILES): $(LIBXKBCOMMON_CONFIGURE_TARGET)
+ make -C $(dir $@) $(notdir $@)
+
+.PHONY: libxkbcommon-reset libxkbcommon-clean
+
libxkbcommon-reset:
cd $(LIBXKBCOMMON_TOP) && \
git clean -qdxf && \
@@ -34,12 +40,10 @@ libxkbcommon-reset:
libxkbcommon-clean:
-.PHONY: libxkbcommon-configure libxkbcommon-clean libxkbcommon-reset
+contrib-reset: libxkbcommon-reset
+contrib-clean: libxkbcommon-clean
-CONFIGURE_TARGETS += libxkbcommon-configure
-CONFIGURE_RESET_TARGETS += libxkbcommon-reset
-AGGREGATE_CLEAN_TARGETS += libxkbcommon-clean
-CONFIGURE_PKG_CONFIG_LIBDIR := $(CONFIGURE_PKG_CONFIG_LIBDIR):$(LIBXKBCOMMON_TOP)
+CONFIGURE_PKG_CONFIG_LIBDIR := $(CONFIGURE_PKG_CONFIG_LIBDIR):$(abspath $(LIBXKBCOMMON_TOP))
--include $(LIBXKBCOMMON_BUILT_MAKEFILES)
+include $(LIBXKBCOMMON_BUILT_MAKEFILES)