use Build/Configure/Default macro, Makefile cleanup

[openwrt/svn-archive/archive.git] / libs / id3lib / Makefile

diff --git a/libs/id3lib/Makefile b/libs/id3lib/Makefile
index 8faa62e0a7b62ae7e98cf5f2d8b80cf29a2d050e..81246d4da574179b687b50e9c1f8868ccac3266a 100644 (file)
--- a/libs/id3lib/Makefile
+++ b/libs/id3lib/Makefile
@@ -12,12 +12,12 @@ PKG_NAME:=id3lib
 PKG_VERSION:=3.8.3
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/id3lib
 PKG_MD5SUM:=19f27ddd2dda4b2d26a559a4f0f402a7
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -27,58 +27,28 @@ define Package/id3lib
   CATEGORY:=Libraries
   DEPENDS:=+zlib +uclibcxx
   TITLE:=An ID3v1/ID3v2 tag manipulation library
-  DESCRIPTION:=An ID3v1/ID3v2 tag manipulation library.\\\
   URL:=http://www.id3lib.org/
 endef
 
+# commas are interpreted by the $(call ...) macro, so define a intermediate variable holding our settings
+PKG_CONFIGURE_LIBS:=-Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic,-lz,-lm,-lc
+
 define Build/Configure
-       (cd $(PKG_BUILD_DIR); rm -f config.cache; \
-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)"  \
-               CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti"  \
-               CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(LINUX_DIR)/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-               LIBS="-Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic,-lz,-lm,-lc" \
-               ./configure \
-                       --target=$(GNU_TARGET_NAME) \
-                       --host=$(GNU_TARGET_NAME) \
-                       --build=$(GNU_HOST_NAME) \
-                       --program-prefix="" \
-                       --program-suffix="" \
-                       --prefix=/usr \
-                       --exec-prefix=/usr \
-                       --bindir=/usr/bin \
-                       --datadir=/usr/share \
-                       --includedir=/usr/include \
-                       --infodir=/usr/share/info \
-                       --libdir=/usr/lib \
-                       --libexecdir=/usr/lib \
-                       --localstatedir=/var \
-                       --mandir=/usr/share/man \
-                       --sbindir=/usr/sbin \
-                       --sysconfdir=/etc \
-                       $(DISABLE_LARGEFILE) \
-                       $(DISABLE_NLS) \
-                       --enable-shared \
-                       --enable-static \
-                       --disable-rpath \
-                       --with-gnu-ld \
-       );
+       $(call Build/Configure/Default, \
+               --enable-shared \
+               --enable-static \
+               , \
+               CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti"  \
+               LIBS="$(PKG_CONFIGURE_LIBS)" \
+       )
 endef
 
 define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
 endef
 
-define Package/id3lib/install
-       install -d -m0755 $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3-*.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
        mkdir -p $(STAGING_DIR)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/id3 $(STAGING_DIR)/usr/include/
@@ -96,4 +66,9 @@ define Build/UninstallDev
                $(STAGING_DIR)/usr/lib/libid3-*.so.*
 endef
 
+define Package/id3lib/install
+       install -d -m0755 $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3-*.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,id3lib))