enable jpeg support, add dependency on libpng, standardize.

[openwrt.git] / package / libgpg-error / Makefile

diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile
index adb1447..eb127d3 100644 (file)
--- a/package/libgpg-error/Makefile
+++ b/package/libgpg-error/Makefile
@@ -7,7 +7,10 @@ PKG_VERSION:=1.0
 PKG_RELEASE:=0
 PKG_MD5SUM:=ff409db977e4a4897aa09ea420a28a2f
 
 PKG_RELEASE:=0
 PKG_MD5SUM:=ff409db977e4a4897aa09ea420a28a2f
 

-PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
+PKG_SOURCE_URL:=ftp://ftp.gnupg.org/gcrypt/libgpg-error/ \
+       http://mirrors.rootmode.com/ftp.gnupg.org/libgpg-error/ \
+       http://gulus.usherbrooke.ca/pub/appl/GnuPG/libgpg-error/ \
+       http://gnupg.unixmexico.org/ftp/libgpg-error/

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 


@@ -23,7 +26,7 @@ $(PKG_BUILD_DIR)/.configured:
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
                $(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) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --host=$(GNU_TARGET_NAME) \


@@ -60,19 +63,19 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_LIBGPG_ERROR):
        install -m0755 -d $(IDIR_LIBGPG_ERROR)/usr/lib
 
 $(IPKG_LIBGPG_ERROR):
        install -m0755 -d $(IDIR_LIBGPG_ERROR)/usr/lib

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgpg-error.so.* $(IDIR_LIBGPG_ERROR)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgpg-error.so.* $(IDIR_LIBGPG_ERROR)/usr/lib/

        $(RSTRIP) $(IDIR_LIBGPG_ERROR)
        $(IPKG_BUILD) $(IDIR_LIBGPG_ERROR) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libgpg-error.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/bin
        $(RSTRIP) $(IDIR_LIBGPG_ERROR)
        $(IPKG_BUILD) $(IDIR_LIBGPG_ERROR) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libgpg-error.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/bin

-       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/gpg-error-config $(STAGING_DIR)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/gpg-error-config $(STAGING_DIR)/usr/bin/

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

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

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

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgpg-error.{a,so*} $(STAGING_DIR)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgpg-error.{a,so*} $(STAGING_DIR)/usr/lib/

        mkdir -p $(STAGING_DIR)/usr/share/aclocal
        mkdir -p $(STAGING_DIR)/usr/share/aclocal

-       cp -fpR $(PKG_INSTALL_DIR)/usr/share/aclocal/gpg-error.m4 $(STAGING_DIR)/usr/share/aclocal/
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/aclocal/gpg-error.m4 $(STAGING_DIR)/usr/share/aclocal/

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


@@ -84,9 +87,8 @@ uninstall-dev:
                $(STAGING_DIR)/usr/lib/libgpg-error.{a,so*} \
                $(STAGING_DIR)/usr/share/aclocal/gpg-error.m4 \
 
                $(STAGING_DIR)/usr/lib/libgpg-error.{a,so*} \
                $(STAGING_DIR)/usr/share/aclocal/gpg-error.m4 \
 

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

 
 mostlyclean:
        make -C $(PKG_BUILD_DIR) clean
 
 mostlyclean:
        make -C $(PKG_BUILD_DIR) clean