[packages] libtiff: don't include dev shared lib symlinks in package, bump release...

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

diff --git a/libs/jpeg/Makefile b/libs/jpeg/Makefile
index 62fd576b73cb7c2f91be31bc20a44c2c6e2d17ee..547a90966d94cf14b2dc481e284bf193a32cd594 100644 (file)
--- a/libs/jpeg/Makefile
+++ b/libs/jpeg/Makefile
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -16,13 +15,10 @@ PKG_SOURCE:=$(PKG_NAME)src.v$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.ijg.org/files/ \
         ftp://ftp.uu.net/graphics/jpeg/
 PKG_MD5SUM:=dbd5f3b47ed13132f04c685d608a7547
-PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
-PKG_BUILD_DEPENDS:=libtool
+PKG_FIXUP = libtool
 
+include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/jpeg/Default
@@ -45,22 +41,26 @@ define Package/jpeg-tools
   TITLE+= manipulation tools
 endef
 
+TARGET_CFLAGS += $(FPIC)
+
 CONFIGURE_ARGS += \
        --enable-shared \
        --enable-static \
 
+HOST_CONFIGURE_ARGS += \
+       --enable-shared \
+       --enable-static \
+
 define Build/Prepare
        $(call Build/Prepare/Default)
        # replace the old upstream libtool stuff with our own
-       ln -sf $(STAGING_DIR)/usr/bin/libtool $(PKG_BUILD_DIR)/
-       ln -sf $(STAGING_DIR)/usr/share/libtool/config.guess $(PKG_BUILD_DIR)/
+       ln -sf $(STAGING_DIR)/host/bin/libtool $(PKG_BUILD_DIR)/
+       ln -sf $(STAGING_DIR)/host/share/libtool/config.sub $(PKG_BUILD_DIR)/
+       ln -sf $(STAGING_DIR)/host/share/libtool/config.guess $(PKG_BUILD_DIR)/
+       ln -sf $(STAGING_DIR)/host/share/libtool/ltmain.sh $(PKG_BUILD_DIR)/
        ln -sf /bin/true $(PKG_BUILD_DIR)/ltconfig
 endef
 
-define Build/Configure
-       $(call Build/Configure/Default,)
-endef
-
 define Build/Compile
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)/usr/{include,lib,bin,man/man1}
@@ -72,18 +72,12 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/jpeglib.h $(STAGING_DIR)/usr/include/
-       $(CP) $(PKG_BUILD_DIR)/jpegint.h $(STAGING_DIR)/usr/include/
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/j{config,error,morecfg}.h $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjpeg.{a,so*} $(STAGING_DIR)/usr/lib/
-endef
-
-define Build/UninstallDev
-       rm -rf  $(STAGING_DIR)/usr/include/jpeg{int,lib}.h \
-               $(STAGING_DIR)/usr/include/j{config,error,morecfg}.h \
-               $(STAGING_DIR)/usr/lib/libjpeg.{a,so*}
+       mkdir -p $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/jpeglib.h $(1)/usr/include/
+       $(CP) $(PKG_BUILD_DIR)/jpegint.h $(1)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/j{config,error,morecfg}.h $(1)/usr/include/
+       mkdir -p $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjpeg.{a,so*} $(1)/usr/lib/
 endef
 
 define Package/libjpeg/install
@@ -93,8 +87,9 @@ endef
 
 define Package/jpeg-tools/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/*jpeg* $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/*jpeg* $(1)/usr/bin/
 endef
 
+$(eval $(call HostBuild))
 $(eval $(call BuildPackage,libjpeg))
 $(eval $(call BuildPackage,jpeg-tools))