diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-03-04 11:41:01 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-03-04 11:41:01 +0100 |
| commit | f3f25581c895925549423bde2ca37926057cbe27 (patch) | |
| tree | 064d70b4602d6db0971ec8023b402144db35a7af /packages/compression | |
| parent | b13e5721bf7589ef63596a3d88ee89c9b0a5a71e (diff) | |
| download | embtoolkit-f3f25581c895925549423bde2ca37926057cbe27.tar.gz embtoolkit-f3f25581c895925549423bde2ca37926057cbe27.tar.bz2 embtoolkit-f3f25581c895925549423bde2ca37926057cbe27.tar.xz | |
Packages: zlib: use more generic macros
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'packages/compression')
| -rw-r--r-- | packages/compression/zlib/zlib.mk | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/packages/compression/zlib/zlib.mk b/packages/compression/zlib/zlib.mk index 0a982d2..49b5d3a 100644 --- a/packages/compression/zlib/zlib.mk +++ b/packages/compression/zlib/zlib.mk @@ -41,21 +41,9 @@ ZLIB_CONFIGURE_ENV := ZLIB_CONFIGURE_OPTS := --enable-shared zlib_install: - $(Q)test -e $(ZLIB_BUILD_DIR)/.installed || \ - $(MAKE) $(ZLIB_BUILD_DIR)/.installed + $(call embtk_makeinstall_pkg,zlib) -$(ZLIB_BUILD_DIR)/.installed: download_zlib \ - $(ZLIB_SRC_DIR)/.decompressed \ - $(ZLIB_BUILD_DIR)/.configured - $(call embtk_pinfo,"Compile/Install $(ZLIB_PACKAGE) for target") - $(Q)$(MAKE) -C $(ZLIB_BUILD_DIR) $(J) - $(Q)$(MAKE) -C $(ZLIB_BUILD_DIR) DESTDIR=$(SYSROOT) install - $(Q)touch $@ - -$(ZLIB_SRC_DIR)/.decompressed: - $(call embtk_decompress_pkg,zlib) - -$(ZLIB_BUILD_DIR)/.configured: +define embtk_configure_zlib $(Q)cd $(ZLIB_BUILD_DIR); \ CC=$(TARGETCC_CACHED) \ CXX=$(TARGETCXX_CACHED) \ @@ -75,6 +63,11 @@ $(ZLIB_BUILD_DIR)/.configured: PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \ $(ZLIB_CONFIGURE_ENV) \ $(CONFIG_SHELL) $(ZLIB_SRC_DIR)/configure \ - --libdir=/usr/$(LIBDIR) --prefix=/usr --sysconfdir=/etc \ - $(ZLIB_CONFIGURE_OPTS) - @touch $@ + --libdir=/usr/$(LIBDIR) --prefix=/usr --sysconfdir=/etc \ + $(ZLIB_CONFIGURE_OPTS) + $(Q)touch $(ZLIB_BUILD_DIR)/.configured +endef + +define embtk_beforeinstall_zlib + $(embtk_configure_zlib) +endef |