diff options
Diffstat (limited to 'packages/graphics')
| -rw-r--r-- | packages/graphics/cairo/cairo.kconfig | 3 | ||||
| -rw-r--r-- | packages/graphics/cairo/cairo.mk | 19 |
2 files changed, 4 insertions, 18 deletions
diff --git a/packages/graphics/cairo/cairo.kconfig b/packages/graphics/cairo/cairo.kconfig index b58ecc9..237ea5f 100644 --- a/packages/graphics/cairo/cairo.kconfig +++ b/packages/graphics/cairo/cairo.kconfig @@ -53,6 +53,8 @@ choice help Here you can choose which version of cairo you want to use. + config EMBTK_CAIRO_VERSION_1_10_2 + bool "cairo-1.10.2" config EMBTK_CAIRO_VERSION_1_8_10 bool "cairo-1.8.10" config EMBTK_CAIRO_VERSION_1_8_9 @@ -63,6 +65,7 @@ endchoice config EMBTK_CAIRO_VERSION_STRING string + default "1.10.2" if EMBTK_CAIRO_VERSION_1_10_2 default "1.8.10" if EMBTK_CAIRO_VERSION_1_8_10 default "1.8.9" if EMBTK_CAIRO_VERSION_1_8_9 default "1.8.8" if EMBTK_CAIRO_VERSION_1_8_8 diff --git a/packages/graphics/cairo/cairo.mk b/packages/graphics/cairo/cairo.mk index 46cac69..25ccee2 100644 --- a/packages/graphics/cairo/cairo.mk +++ b/packages/graphics/cairo/cairo.mk @@ -60,27 +60,10 @@ endif CAIRO_CONFIGURE_OPTS := $(CAIRO_CONFIG_OPTS-n) $(CAIRO_CONFIG_OPTS-y) cairo_install: - @test -e $(CAIRO_BUILD_DIR)/.installed || \ - $(MAKE) $(CAIRO_BUILD_DIR)/.installed - -$(CAIRO_BUILD_DIR)/.installed: $(CAIRO_DEPS) download_cairo \ - $(CAIRO_BUILD_DIR)/.decompressed $(CAIRO_BUILD_DIR)/.configured - $(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \ - cairo-$(CAIRO_VERSION) in your root filesystem...") - $(Q)$(MAKE) -C $(CAIRO_BUILD_DIR) $(J) - $(Q)$(MAKE) -C $(CAIRO_BUILD_DIR) DESTDIR=$(SYSROOT) install - $(Q)$(MAKE) libtool_files_adapt - $(Q)$(MAKE) pkgconfig_files_adapt - @touch $@ + $(call EMBTK_INSTALL_PKG,CAIRO) download_cairo: $(call EMBTK_DOWNLOAD_PKG,CAIRO) -$(CAIRO_BUILD_DIR)/.decompressed: - $(call EMBTK_DECOMPRESS_PKG,CAIRO) - -$(CAIRO_BUILD_DIR)/.configured: - $(call EMBTK_CONFIGURE_PKG,CAIRO) - cairo_clean: $(call EMBTK_CLEANUP_PKG,CAIRO) |