summaryrefslogtreecommitdiffstats
path: root/package/cairo/cairo.mk
diff options
context:
space:
mode:
Diffstat (limited to 'package/cairo/cairo.mk')
-rw-r--r--package/cairo/cairo.mk50
1 files changed, 6 insertions, 44 deletions
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index e160bf92c..0ca99aa61 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -36,7 +36,7 @@ CAIRO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
ac_use_included_regex=no gl_cv_c_restrict=no
-CAIRO_DEPENDENCIES = host-pkgconfig fontconfig pixman
+CAIRO_DEPENDENCIES = host-pkg-config fontconfig pixman
ifeq ($(BR2_PACKAGE_DIRECTFB),y)
CAIRO_CONF_OPT += --enable-directfb
@@ -79,53 +79,15 @@ else
CAIRO_CONF_OPT += --disable-svg
endif
-$(eval $(call AUTOTARGETS,package,cairo))
-
-# cairo for the host
-CAIRO_HOST_DIR:=$(BUILD_DIR)/cairo-$(CAIRO_VERSION)-host
-
-$(DL_DIR)/$(CAIRO_SOURCE):
- $(call DOWNLOAD,$(CAIRO_SITE),$(CAIRO_SOURCE))
+HOST_CAIRO_DEPENDENCIES = host-pkg-config host-pixman host-fontconfig
-$(STAMP_DIR)/host_cairo_unpacked: $(DL_DIR)/$(CAIRO_SOURCE)
- mkdir -p $(CAIRO_HOST_DIR)
- $(INFLATE$(suffix $(CAIRO_SOURCE))) $< | \
- $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(CAIRO_HOST_DIR) $(TAR_OPTIONS) -
- touch $@
-
-$(STAMP_DIR)/host_cairo_configured: $(STAMP_DIR)/host_cairo_unpacked $(STAMP_DIR)/host_pkgconfig_installed $(STAMP_DIR)/host_fontconfig_installed $(STAMP_DIR)/host_pixman_installed
- (cd $(CAIRO_HOST_DIR); rm -rf config.cache; \
- $(HOST_CONFIGURE_OPTS) \
- CFLAGS="$(HOST_CFLAGS)" \
- LDFLAGS="$(HOST_LDFLAGS)" \
- ./configure $(QUIET) \
- --prefix="$(HOST_DIR)/usr" \
- --sysconfdir="$(HOST_DIR)/etc" \
+HOST_CAIRO_CONF_OPT = \
--enable-ps \
--enable-pdf \
--enable-xlib \
--with-x \
--disable-png \
- --disable-svg \
- )
- touch $@
-
-$(STAMP_DIR)/host_cairo_compiled: $(STAMP_DIR)/host_cairo_configured
- $(HOST_MAKE_ENV) $(MAKE) -C $(CAIRO_HOST_DIR)
- touch $@
+ --disable-svg
-$(STAMP_DIR)/host_cairo_installed: $(STAMP_DIR)/host_cairo_compiled
- $(HOST_MAKE_ENV) $(MAKE) -C $(CAIRO_HOST_DIR) install
- touch $@
-
-host-cairo: $(STAMP_DIR)/host_cairo_installed
-
-host-cairo-source: cairo-source
-
-host-cairo-clean:
- rm -f $(addprefix $(STAMP_DIR)/host_cairo_,unpacked configured compiled installed)
- -$(MAKE) -C $(CAIRO_HOST_DIR) uninstall
- -$(MAKE) -C $(CAIRO_HOST_DIR) clean
-
-host-cairo-dirclean:
- rm -rf $(CAIRO_HOST_DIR)
+$(eval $(call AUTOTARGETS,package,cairo))
+$(eval $(call AUTOTARGETS,package,cairo,host))