X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=libs%2Fjpeg%2FMakefile;h=62c8c86326e264f3e6e2be99006c7d2a11e18457;hb=ca74ca9b86f4b2b5813b3f5812f66c22a240b959;hp=8cb964c19bcf1efceba94dc1b6de9746fad784a6;hpb=1120328d156b1dac991b04bb0a4dbda56257d2c9;p=packages.git

diff --git a/libs/jpeg/Makefile b/libs/jpeg/Makefile
index 8cb964c19..62c8c8632 100644
--- a/libs/jpeg/Makefile
+++ b/libs/jpeg/Makefile
@@ -1,10 +1,9 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # 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,11 @@ 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_BUILD_PARALLEL:=1
+PKG_BUILD_DEPENDS:=libltdl
 
+include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/jpeg/Default
@@ -45,47 +42,47 @@ 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 /bin/true $(PKG_BUILD_DIR)/ltconfig
-endef
-
-define Build/Configure
-	$(call Build/Configure/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,bin,man/man1}
-	$(MAKE) -C $(PKG_BUILD_DIR) \
+	$(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 install install-headers install-lib
+		all
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		prefix="$(PKG_INSTALL_DIR)/usr" \
+		exec_prefix="$(PKG_INSTALL_DIR)/usr" \
+		install install-headers install-lib
 endef
 
 define Build/InstallDev
-	mkdir -p $(1)/usr/include
+	$(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/
-	mkdir -p $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libjpeg.{a,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*}
-endef
-
 define Package/libjpeg/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libjpeg.so.* $(1)/usr/lib/
@@ -93,8 +90,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))