diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-09-20 07:19:52 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-09-20 07:19:52 +0000 |
| commit | fe40594afb13216ad90e54d6d78dbb31b34b9e7d (patch) | |
| tree | 6d0f72b4e2726b7960deb7d5774e54d341bab8c7 | |
| parent | d570c72361b430ed33a34ea0eaa5de0bae4fb103 (diff) | |
- cleanup and fix libid3tag (Hans-Christian Egtvedt)
- fix the make libid3tag-clean target to erase all installed files (me)
| -rw-r--r-- | package/libid3tag/libid3tag.mk | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/package/libid3tag/libid3tag.mk b/package/libid3tag/libid3tag.mk index 056e04628..7f2fd258a 100644 --- a/package/libid3tag/libid3tag.mk +++ b/package/libid3tag/libid3tag.mk @@ -6,7 +6,7 @@ LIBID3TAG_VERSION:=0.15.1b LIBID3TAG_SOURCE:=libid3tag-$(LIBID3TAG_VERSION).tar.gz -LIBID3TAG_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mad/ +LIBID3TAG_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mad LIBID3TAG_DIR:=$(BUILD_DIR)/libid3tag-$(LIBID3TAG_VERSION) LIBID3TAG_CAT:=$(ZCAT) LIBID3TAG_BIN:=libid3tag.so.0.3.0 @@ -35,11 +35,10 @@ $(LIBID3TAG_DIR)/.configured: $(LIBID3TAG_DIR)/.unpacked ) touch $@ -$(LIBID3TAG_DIR)/src/.libs/$(LIBID3TAG_BIN): $(LIBID3TAG_DIR)/.configured +$(LIBID3TAG_DIR)/.libs/$(LIBID3TAG_BIN): $(LIBID3TAG_DIR)/.configured $(MAKE) -C $(LIBID3TAG_DIR) - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBID3TAG_DIR) install -$(STAGING_DIR)/$(LIBID3TAG_TARGET_BIN): $(LIBID3TAG_DIR)/src/.libs/$(LIBID3TAG_BIN) +$(STAGING_DIR)/$(LIBID3TAG_TARGET_BIN): $(LIBID3TAG_DIR)/.libs/$(LIBID3TAG_BIN) $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBID3TAG_DIR) install $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libid3tag.la @@ -47,17 +46,15 @@ $(TARGET_DIR)/$(LIBID3TAG_TARGET_BIN): $(STAGING_DIR)/$(LIBID3TAG_TARGET_BIN) cp -dpf $(STAGING_DIR)/usr/lib/libid3tag.so* $(TARGET_DIR)/usr/lib/ -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libid3tag.so* -libid3tag: uclibc libmad $(TARGET_DIR)/$(LIBID3TAG_TARGET_BIN) +libid3tag: uclibc zlib libmad $(TARGET_DIR)/$(LIBID3TAG_TARGET_BIN) libid3tag-source: $(DL_DIR)/$(LIBID3TAG_SOURCE) libid3tag-clean: - @if [ -d $(LIBID3TAG_DIR)/Makefile ]; then \ - $(MAKE) -C $(LIBID3TAG_DIR) clean; \ - fi + -$(MAKE) -C $(LIBID3TAG_DIR) clean rm -f $(STAGING_DIR)/$(LIBID3TAG_TARGET_BIN) - rm -f $(TARGET_DIR)/$(LIBID3TAG_TARGET_BIN) - + rm -f $(TARGET_DIR)/$(LIBID3TAG_TARGET_BIN) \ + $(TARGET_DIR)/usr/lib/libid3tag* libid3tag-dirclean: rm -rf $(LIBID3TAG_DIR) |