bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[package] imagemagick: fix missing dependencies, remove unused cxx support

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@33015 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2012-08-06 15:39:46 +00:00
parent 52fed63a5b
commit 95fa2129f3
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
multimedia/imagemagick/Makefile
View File

@ -19,6 +19,7 @@ PKG_MD5SUM:=11d5d5b3c6477077292183edcdf99da9
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
PKG_REMOVE_FILES:=aclocal.m4 m4/libtool.m4 PKG_REMOVE_FILES:=aclocal.m4 m4/libtool.m4
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -33,6 +34,7 @@ endef
define Package/imagemagick define Package/imagemagick
$(call Package/imagemagick/Default) $(call Package/imagemagick/Default)
DEPENDS:=+libpthread +libltdl +libjpeg +libtiff +zlib
endef endef
define Package/imagemagick/description define Package/imagemagick/description
@ -42,7 +44,7 @@ endef
define Package/imagemagick-jpeg define Package/imagemagick-jpeg
$(call Package/imagemagick/Default) $(call Package/imagemagick/Default)
TITLE+= (jpeg) TITLE+= (jpeg)
DEPENDS:=+imagemagick +libjpeg +zlib DEPENDS:=+imagemagick
endef endef
define Package/imagemagick-jpeg/description define Package/imagemagick-jpeg/description
@ -52,7 +54,7 @@ endef
define Package/imagemagick-png define Package/imagemagick-png
$(call Package/imagemagick/Default) $(call Package/imagemagick/Default)
TITLE+= (png) TITLE+= (png)
DEPENDS:=+imagemagick +libpng +zlib DEPENDS:=+imagemagick +libpng
endef endef
define Package/imagemagick-png/description define Package/imagemagick-png/description
@ -72,7 +74,7 @@ endef
define Package/imagemagick-tiff define Package/imagemagick-tiff
$(call Package/imagemagick/Default) $(call Package/imagemagick/Default)
TITLE+= (tiff) TITLE+= (tiff)
DEPENDS:=+imagemagick +libtiff +zlib DEPENDS:=+imagemagick
endef endef
define Package/imagemagick-tiff/description define Package/imagemagick-tiff/description
@ -85,7 +87,8 @@ CONFIGURE_ARGS += \
--enable-shared \ --enable-shared \
--enable-static \ --enable-static \
--without-xml \ --without-xml \
--without-x --without-x \
--without-magick-plus-plus
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
@ -95,7 +98,6 @@ endef
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include/magick $(INSTALL_DIR) $(1)/usr/include/magick
$(INSTALL_DIR) $(1)/usr/include/Magick++
$(INSTALL_DIR) $(1)/usr/include/wand $(INSTALL_DIR) $(1)/usr/include/wand
$(CP) \ $(CP) \
$(PKG_INSTALL_DIR)/usr/include/* \ $(PKG_INSTALL_DIR)/usr/include/* \