Merge aruba support

[openwrt.git] / openwrt / package / libosip2 / Makefile

diff --git a/openwrt/package/libosip2/Makefile b/openwrt/package/libosip2/Makefile
index 2e7bb93..6fbb733 100644 (file)
--- a/openwrt/package/libosip2/Makefile
+++ b/openwrt/package/libosip2/Makefile
@@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libosip2
-PKG_VERSION:=2.0.9
+PKG_VERSION:=2.2.0
 PKG_RELEASE:=1
-PKG_MD5SUM:=dba6d47332f4842f70694792939fec2d
+PKG_MD5SUM:=f1237af0250c59b318bd64a59f5750ea
 
-PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/osip/
+PKG_SOURCE_URL:=@GNU/osip
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
@@ -18,12 +18,12 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,LIBOSIP2,libosip2,$(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="$(strip $(TARGET_CFLAGS))" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+               LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
                ./configure \
                  --target=$(GNU_TARGET_NAME) \
                  --host=$(GNU_TARGET_NAME) \
@@ -53,15 +53,15 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
                  --enable-semaphore \
                  --enable-ntimer \
        );
-       touch $(PKG_BUILD_DIR)/.configured
+       touch $@
 
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
-       $(MAKE) -C $(PKG_BUILD_DIR)
+$(PKG_BUILD_DIR)/.built:
+       rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
-               install
-       touch $(PKG_BUILD_DIR)/.built
+               all install
+       touch $@
 
 $(IPKG_LIBOSIP2):
        install -m0755 -d $(IDIR_LIBOSIP2)/usr/lib
@@ -74,13 +74,17 @@ $(STAGING_DIR)/usr/lib/libosip2.so: $(PKG_BUILD_DIR)/.built
        cp -fpR $(PKG_INSTALL_DIR)/usr/include/osip{,parser}2 $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib
        cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.{a,so*} $(STAGING_DIR)/usr/lib/
-       touch $(STAGING_DIR)/usr/lib/libosip2.so
+       mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
+       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libosip2.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+       touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libosip2.so
 
 uninstall-dev:
-       rm -rf $(STAGING_DIR)/usr/include/osip{,parser}2
-       rm -rf $(STAGING_DIR)/usr/lib/libosip{,parser}2.{a,so*}
+       rm -rf \
+               $(STAGING_DIR)/usr/include/osip{,parser}2 \
+               $(STAGING_DIR)/usr/lib/libosip{,parser}2.{a,so*} \
+               $(STAGING_DIR)/usr/lib/pkgconfig/libosip2.pc \
 
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev