split b44 patch, fix compile warning in b44.h

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

diff --git a/openwrt/package/libgcrypt/Makefile b/openwrt/package/libgcrypt/Makefile
index 8716448..4f9077d 100644 (file)
--- a/openwrt/package/libgcrypt/Makefile
+++ b/openwrt/package/libgcrypt/Makefile
@@ -18,12 +18,12 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,LIBGCRYPT,libgcrypt,$(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)" \
                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) \
@@ -47,11 +47,12 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
                --enable-shared \
                --enable-static \
                --disable-rpath \
+               --disable-asm \
                --with-gpg-error-prefix="$(STAGING_DIR)/usr" \
        );
        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) \
@@ -59,7 +60,7 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
                all install
        touch $@
 
-$(IPKG_LIBGCRYPT): $(STAGING_DIR)/usr/lib/libgcrypt.so
+$(IPKG_LIBGCRYPT):
        install -m0755 -d $(IDIR_LIBGCRYPT)/usr/lib
        cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgcrypt.so.* $(IDIR_LIBGCRYPT)/usr/lib/
        $(RSTRIP) $(IDIR_LIBGCRYPT)
@@ -86,4 +87,9 @@ uninstall-dev:
                $(STAGING_DIR)/usr/share/aclocal/libgcrypt.m4 \
 
 compile: install-dev
+
 clean: uninstall-dev
+
+mostlyclean:
+       make -C $(PKG_BUILD_DIR) clean
+       rm -f $(PKG_BUILD_DIR)/.built