Commit 1e32e070 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

zlib: remove dedicated target-headers option 



Instead, simply only copy headers/static lib if BR2_HAVE_DEVFILES
is enabled.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 7c1c71f9

package/zlib/Config.in

+0 −6
Original line number Diff line number Diff line
@@ -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.

package/zlib/zlib.mk

+1 −6
Original line number Diff line number Diff line
@@ -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