Commit e008caa0 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

libmad: 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 e6e0ab23

CHANGES

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


	Updated/fixed packages: autoconf, busybox, directfb, dnsmasq,

	festival, imagemagick, iptables, kernel-headers, kismet,

	libevent, libglib2, liblockfile, libuuid, ltrace, mdadm,

	libevent, libglib2, liblockfile, libmad, libuuid, ltrace, mdadm,

	ncftp, netkittelnet, openssl, python, quagga, radvd, samba,

	speech-tools, squashfs, syslinux, u-boot, valgrind, wipe,

	xdata_xcursor-themes

package/multimedia/libmad/Config.in

+0 −6
Original line number Diff line number Diff line
@@ -6,9 +6,3 @@ config BR2_PACKAGE_LIBMAD 
	  without a floating-point unit.



	  http://www.underbit.com/products/mad/
 


config BR2_PACKAGE_LIBMAD_TARGET_HEADERS

	bool "libmad headers in target"

	depends on BR2_PACKAGE_LIBMAD

	help

	  Put headers files in the target.

package/multimedia/libmad/libmad.mk

+4 −9
Original line number Diff line number Diff line
@@ -47,20 +47,18 @@ $(STAGING_DIR)/usr/lib/libmad.so.0: $(LIBMAD_DIR)/libmad.la 
	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libmad.la



$(TARGET_DIR)/usr/lib/libmad.so.0: $(STAGING_DIR)/usr/lib/libmad.so.0

	cp -dpf $(STAGING_DIR)/usr/lib/libmad.so.* $(TARGET_DIR)/usr/lib/

	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libmad.so.*



$(TARGET_DIR)/usr/lib/libmad.a: $(STAGING_DIR)/usr/lib/libmad.so.0

ifeq ($(BR2_HAVE_DEVFILES),y)

	mkdir -p $(TARGET_DIR)/usr/include

	cp -dpf $(STAGING_DIR)/usr/include/mad.h $(TARGET_DIR)/usr/include/

	cp -dpf $(STAGING_DIR)/usr/lib/libmad.la $(TARGET_DIR)/usr/lib/

	cp -dpf $(STAGING_DIR)/usr/lib/libmad.so $(TARGET_DIR)/usr/lib/

	cp -dpf $(STAGING_DIR)/usr/lib/libmad.a $(TARGET_DIR)/usr/lib/

endif

	cp -dpf $(STAGING_DIR)/usr/lib/libmad.so.* $(TARGET_DIR)/usr/lib/

	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libmad.so.*



libmad: $(TARGET_DIR)/usr/lib/libmad.so.0



libmad-headers: $(TARGET_DIR)/usr/lib/libmad.a



libmad-source: $(DL_DIR)/$(LIBMAD_SOURCE)



libmad-clean:
@@ -81,6 +79,3 @@ libmad-dirclean: 
ifeq ($(BR2_PACKAGE_LIBMAD),y)

TARGETS+=libmad

endif
 
ifeq ($(BR2_PACKAGE_LIBMAD_TARGET_HEADERS),y)

TARGETS+=libmad-headers

endif