use Build/Configure/Default macro, Makefile cleanup

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

diff --git a/libs/libosip2/Makefile b/libs/libosip2/Makefile
index 032de1e345af4903cd3d80c93917a7cebadcbc89..49ce802e11a1b33d31123a647c443bc758ab82b0 100644 (file)
--- a/libs/libosip2/Makefile
+++ b/libs/libosip2/Makefile
@@ -12,12 +12,12 @@ PKG_NAME:=libosip2
 PKG_VERSION:=2.2.0
 PKG_RELEASE:=1
 
 PKG_VERSION:=2.2.0
 PKG_RELEASE:=1
 

-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/osip
 PKG_MD5SUM:=f1237af0250c59b318bd64a59f5750ea
 PKG_CAT:=zcat
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/osip
 PKG_MD5SUM:=f1237af0250c59b318bd64a59f5750ea
 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
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk


@@ -27,61 +27,29 @@ define Package/libosip2
   CATEGORY:=Libraries
   DEPENDS:=+libpthread
   TITLE:=The GNU oSIP library
   CATEGORY:=Libraries
   DEPENDS:=+libpthread
   TITLE:=The GNU oSIP library

-  DESCRIPTION:=The GNU oSIP library.\\\
-    GNU oSIP library, a Session Initiation Protocol (SIP) implementation.
+  DESCRIPTION:=\
+       GNU oSIP library, a Session Initiation Protocol (SIP) implementation.

   URL:=http://www.gnu.org/software/osip/
 endef
 
 define Build/Configure
   URL:=http://www.gnu.org/software/osip/
 endef
 
 define Build/Configure

-       (cd $(PKG_BUILD_DIR); rm -f config.cache; \
-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(strip $(TARGET_CFLAGS))" \
-               CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-               LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
-               ./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 \
-                       --with-gnu-ld \
-                       --disable-debug \
-                       --disable-trace \
-                       --enable-pthread \
-                       --enable-semaphore \
-                       --enable-ntimer \
-       );
+       $(call Build/Configure/Default, \
+               --enable-shared \
+               --enable-static \
+               --disable-debug \
+               --disable-trace \
+               --enable-pthread \
+               --enable-semaphore \
+               --enable-ntimer \
+       )

 endef
 
 define Build/Compile
 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
 
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
 endef
 

-define Package/libosip2/install
-       install -m0755 -d $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.so.* $(1)/usr/lib/
-endef
-

 define Build/InstallDev
        mkdir -p $(STAGING_DIR)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/osip{,parser}2 $(STAGING_DIR)/usr/include/
 define Build/InstallDev
        mkdir -p $(STAGING_DIR)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/osip{,parser}2 $(STAGING_DIR)/usr/include/


@@ -98,4 +66,9 @@ define Build/UninstallDev
                $(STAGING_DIR)/usr/lib/pkgconfig/libosip2.pc
 endef
 
                $(STAGING_DIR)/usr/lib/pkgconfig/libosip2.pc
 endef
 

+define Package/libosip2/install
+       install -d -m0755 $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.so.* $(1)/usr/lib/
+endef
+

 $(eval $(call BuildPackage,libosip2))
 $(eval $(call BuildPackage,libosip2))