diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-10-03 23:03:05 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-10-03 23:03:05 +0200 |
| commit | 1e32e0700a0f7f2ffa42a943871d1b4428711bb2 (patch) | |
| tree | 3ca9eb73f0f5d599895e64d3831426847d120903 | |
| parent | 7c1c71f91913827bb8558e1ad9ba96ccad2837f1 (diff) | |
| download | buildroot-novena-1e32e0700a0f7f2ffa42a943871d1b4428711bb2.tar.gz buildroot-novena-1e32e0700a0f7f2ffa42a943871d1b4428711bb2.zip | |
zlib: remove dedicated target-headers option
Instead, simply only copy headers/static lib if BR2_HAVE_DEVFILES
is enabled.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | package/zlib/Config.in | 6 | ||||
| -rw-r--r-- | package/zlib/zlib.mk | 7 |
2 files changed, 1 insertions, 12 deletions
diff --git a/package/zlib/Config.in b/package/zlib/Config.in index eeda15e16..895421424 100644 --- a/package/zlib/Config.in +++ b/package/zlib/Config.in @@ -5,9 +5,3 @@ config BR2_PACKAGE_ZLIB gzip and libpng. http://www.gzip.org/zlib/ - -config BR2_PACKAGE_ZLIB_TARGET_HEADERS - bool "zlib headers in target" - depends on BR2_PACKAGE_ZLIB - help - Put headers files in the target. diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk index a67a5e830..9131832f9 100644 --- a/package/zlib/zlib.mk +++ b/package/zlib/zlib.mk @@ -68,9 +68,7 @@ $(TARGET_DIR)/usr/lib/libz.a: $(STAGING_DIR)/usr/lib/libz.a $(INSTALL) -D $(STAGING_DIR)/usr/lib/libz.a $(TARGET_DIR)/usr/lib/libz.a touch -c $@ -zlib-headers: $(TARGET_DIR)/usr/lib/libz.a - -zlib: $(ZLIB_TARGET) +zlib: $(ZLIB_TARGET) $(if $(BR2_HAVE_DEVFILES,$(TARGET_DIR)/usr/lib/libz.a) zlib-source: $(DL_DIR)/$(ZLIB_SOURCE) @@ -94,6 +92,3 @@ zlib-dirclean: ifeq ($(BR2_PACKAGE_ZLIB),y) TARGETS+=zlib endif -ifeq ($(BR2_PACKAGE_ZLIB_TARGET_HEADERS),y) -TARGETS+=zlib-headers -endif |