[package] wide-dhcpv6: improve user DUID handling

[packages.git] / libs / jpeg / Makefile

diff --git a/libs/jpeg/Makefile b/libs/jpeg/Makefile
index 5f0ee13..9261bb0 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: Makefile 4153 2006-07-18 16:58:52Z florian $
 
 include $(TOPDIR)/rules.mk
 
@@ -12,56 +11,88 @@ PKG_NAME:=jpeg
 PKG_VERSION:=6b
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 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_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_FIXUP:=libtool
+PKG_BUILD_PARALLEL:=1
 
+include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 
+define Package/jpeg/Default
+  TITLE:=The Independent JPEG Group's JPEG
+  URL:=http://www.ijg.org/
+endef
+
 define Package/libjpeg
+  $(call Package/jpeg/Default)
   SECTION:=libs
   CATEGORY:=Libraries
-  TITLE:=The Independent JPEG Group's JPEG runtime library
-  DESCRIPTION:=The Independent JPEG Group's JPEG runtime library.
-  URL:=http://www.ijg.org/
+  TITLE+= runtime library
 endef
 
-define Build/Configure
-$(call Build/Configure/Default,--enable-shared --enable-static)
+define Package/jpeg-tools
+  $(call Package/jpeg/Default)
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+libjpeg
+  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)
+       (cd $(PKG_BUILD_DIR); \
+               rm -f ltconfig ltmain.sh libtool; \
+               ln -s `which true` ltconfig; \
+               ln -s $(STAGING_DIR)/host/bin/libtool libtool; \
+       )
 endef
 
 define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)/usr/{include,lib}
+       $(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/{include,lib,bin,man/man1}
+       $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+               LIBTOOL="./libtool --tag=CC" \
+               prefix="$(PKG_INSTALL_DIR)/usr" \
+               exec_prefix="$(PKG_INSTALL_DIR)/usr" \
+               all
        $(MAKE) -C $(PKG_BUILD_DIR) \
                prefix="$(PKG_INSTALL_DIR)/usr" \
                exec_prefix="$(PKG_INSTALL_DIR)/usr" \
-               install-headers install-lib
+               install install-headers install-lib
 endef
 
-define Package/libjpeg/install
-       install -m0755 -d $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjpeg.so.* $(1)/usr/lib/
+define Build/InstallDev
+       $(INSTALL_DIR) $(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/
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjpeg.{a,so*} $(1)/usr/lib/
 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/
+define Package/libjpeg/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjpeg.so.* $(1)/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*}
+define Package/jpeg-tools/install
+       $(INSTALL_DIR) $(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))