summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHelio Chissini de Castro <helio@dhansak.collabora.co.uk>2012-09-06 19:04:59 (GMT)
committerHelio Chissini de Castro <helio@dhansak.collabora.co.uk>2012-09-06 19:04:59 (GMT)
commit538021a205deba79df24b5bf265286348c541d4f (patch)
tree3e7ee4e51cc7922e7b7be4840234a0ffe6f84236
parent657aecd477f18ca1bd9d1839b05d7e16539d4ce4 (diff)
downloadpixman-538021a205deba79df24b5bf265286348c541d4f.tar.gz
pixman-538021a205deba79df24b5bf265286348c541d4f.tar.xz
Modify to use new format of Android.mk
-rw-r--r--Android.mk16
1 files changed, 10 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk
index f94bd7a..1c17de2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,4 @@
LOCAL_PATH:= $(call my-dir)
-
include $(CLEAR_VARS)
PIXMAN_TOP := $(LOCAL_PATH)
@@ -7,7 +6,9 @@ PIXMAN_TOP := $(LOCAL_PATH)
PIXMAN_BUILT_MAKEFILES := \
$(PIXMAN_TOP)/pixman/Android.mk
-pixman-configure:
+PIXMAP_CONFIGURE_TARGET := $(PIXMAN_TOP)/pixman/Makefile
+
+$(PIXMAP_CONFIGURE_TARGET): $(CONFIGURE_DEPENDENCIES)
cd $(PIXMAN_TOP) ; \
autoreconf -fiv && \
CC="$(CONFIGURE_CC)" \
@@ -25,6 +26,11 @@ pixman-configure:
make -C $$(dirname $$file) $$(basename $$file) ; \
done
+$(PIXMAN_BUILT_MAKEFILES): $(PIXMAN_CONFIGURE_TARGET)
+ make -C $(dir $@) $(notdir $@)
+
+.PHONY: pixman-reset pixman-clean
+
pixman-reset:
cd $(PIXMAN_TOP) && \
git clean -qdxf && \
@@ -32,11 +38,9 @@ pixman-reset:
pixman-clean:
-.PHONY: pixman-configure pixman-clean pixman-reset
+contrib-reset: pixman-reset
+contrib-clean: pixman-clean
-CONFIGURE_TARGETS += pixman-configure
-CONFIGURE_RESET_TARGETS += pixman-reset
-AGGREGATE_CLEAN_TARGETS += pixman-clean
CONFIGURE_PKG_CONFIG_LIBDIR := $(CONFIGURE_PKG_CONFIG_LIBDIR):$(PIXMAN_TOP)
-include $(PIXMAN_BUILT_MAKEFILES)