move more extra packages from ./trunk to ./packages

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

diff --git a/libs/jpeg/Makefile b/libs/jpeg/Makefile
index 1ec7c6736fa16e72043be74a5bd3b3ec07a5cefa..64b39a979ee47fdfff4540ece472d2346f5931c4 100644 (file)
--- a/libs/jpeg/Makefile
+++ b/libs/jpeg/Makefile
@@ -17,10 +17,7 @@ PKG_SOURCE_URL:=http://www.ijg.org/files/ \
         ftp://ftp.uu.net/graphics/jpeg/
 PKG_MD5SUM:=dbd5f3b47ed13132f04c685d608a7547
 
-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)/package.mk
 
@@ -44,6 +41,8 @@ define Package/jpeg-tools
   TITLE+= manipulation tools
 endef
 
+TARGET_CFLAGS += $(FPIC)
+
 CONFIGURE_ARGS += \
        --enable-shared \
        --enable-static \
@@ -51,15 +50,13 @@ CONFIGURE_ARGS += \
 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}
@@ -79,12 +76,6 @@ define Build/InstallDev
        $(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/
@@ -92,7 +83,7 @@ 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 BuildPackage,libjpeg))