copy trunk to buildroot-ng branch

[openwrt.git] / package / libid3tag / Makefile

diff --git a/package/libid3tag/Makefile b/package/libid3tag/Makefile
index 51e458b..b428165 100644 (file)
--- a/package/libid3tag/Makefile
+++ b/package/libid3tag/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,LIBID3TAG,libid3tag,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 
 $(eval $(call PKG_template,LIBID3TAG,libid3tag,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 

-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:

        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \


@@ -53,7 +53,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
        );
        touch $@
 
        );
        touch $@
 

-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:

        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \


@@ -61,18 +61,18 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
                all install
        touch $@
 
                all install
        touch $@
 

-$(IPKG_LIBID3TAG): $(STAGING_DIR)/usr/lib/libid3tag.so
+$(IPKG_LIBID3TAG):

        install -m0755 -d $(IDIR_LIBID3TAG)/usr/lib
        install -m0755 -d $(IDIR_LIBID3TAG)/usr/lib

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libid3tag.so.* $(IDIR_LIBID3TAG)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3tag.so.* $(IDIR_LIBID3TAG)/usr/lib/

        $(RSTRIP) $(IDIR_LIBID3TAG)
        $(IPKG_BUILD) $(IDIR_LIBID3TAG) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libid3tag.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include
        $(RSTRIP) $(IDIR_LIBID3TAG)
        $(IPKG_BUILD) $(IDIR_LIBID3TAG) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libid3tag.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include

-       cp -fpR $(PKG_INSTALL_DIR)/usr/include/id3tag.h $(STAGING_DIR)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/id3tag.h $(STAGING_DIR)/usr/include/

        mkdir -p $(STAGING_DIR)/usr/lib
        mkdir -p $(STAGING_DIR)/usr/lib

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libid3tag.a $(STAGING_DIR)/usr/lib/
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libid3tag.so* $(STAGING_DIR)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3tag.a $(STAGING_DIR)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3tag.so* $(STAGING_DIR)/usr/lib/

        touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libid3tag.so
        touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libid3tag.so


@@ -83,5 +83,5 @@ uninstall-dev:
                $(STAGING_DIR)/usr/lib/libid3tag.a \
                $(STAGING_DIR)/usr/lib/libid3tag.so* \
 
                $(STAGING_DIR)/usr/lib/libid3tag.a \
                $(STAGING_DIR)/usr/lib/libid3tag.so* \
 

-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev