Browse Source

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>
Peter Korsgaard 16 năm trước cách đây
mục cha
commit
1e32e0700a
2 tập tin đã thay đổi với 1 bổ sung12 xóa
  1. 0 6
      package/zlib/Config.in
  2. 1 6
      package/zlib/zlib.mk

+ 0 - 6
package/zlib/Config.in

@@ -5,9 +5,3 @@ config BR2_PACKAGE_ZLIB
 	  gzip and libpng.
 	  gzip and libpng.
 
 
 	  http://www.gzip.org/zlib/
 	  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.

+ 1 - 6
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
 	$(INSTALL) -D $(STAGING_DIR)/usr/lib/libz.a $(TARGET_DIR)/usr/lib/libz.a
 	touch -c $@
 	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)
 zlib-source: $(DL_DIR)/$(ZLIB_SOURCE)
 
 
@@ -94,6 +92,3 @@ zlib-dirclean:
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 TARGETS+=zlib
 TARGETS+=zlib
 endif
 endif
-ifeq ($(BR2_PACKAGE_ZLIB_TARGET_HEADERS),y)
-TARGETS+=zlib-headers
-endif