[packages] imagemagick: remove carriage returns

git-svn-id: svn://svn.openwrt.org/openwrt/packages@25252 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/multimedia/imagemagick/Makefile b/multimedia/imagemagick/Makefile
index 8cd427b..dff750c 100644 (file)
--- a/multimedia/imagemagick/Makefile
+++ b/multimedia/imagemagick/Makefile
@@ -1,115 +1,115 @@
-#\r
-# Copyright (C) 2010 OpenWrt.org\r
-#\r
-# This is free software, licensed under the GNU General Public License v2.\r
-# See /LICENSE for more information.\r
-#\r
-\r
-include $(TOPDIR)/rules.mk\r
-\r
-PKG_NAME:=imagemagick\r
-PKG_VERSION:=6.6.7\r
-PKG_REVISION:=3\r
-PKG_RELEASE:=1\r
-\r
-PKG_BUILD_DIR:=$(BUILD_DIR)/ImageMagick-$(PKG_VERSION)-$(PKG_REVISION)\r
-PKG_SOURCE:=ImageMagick-$(PKG_VERSION)-$(PKG_REVISION).tar.bz2\r
-PKG_SOURCE_URL:=ftp://ftp.fifi.org/pub/ImageMagick/\r
-PKG_MD5SUM:=\r
-\r
-PKG_FIXUP:=libtool\r
-PKG_REMOVE_FILES:=aclocal.m4 m4/libtool.m4\r
-\r
-include $(INCLUDE_DIR)/package.mk\r
-\r
-PKG_INSTALL=1\r
-\r
-define Package/imagemagick/Default\r
-  SECTION:=multimedia\r
-  CATEGORY:=Multimedia\r
-  TITLE:=imagemagick\r
-  URL:=http://image_magick.veidrodis.com/\r
-endef\r
-\r
-define Package/imagemagick\r
-  $(call Package/imagemagick/Default)\r
-endef\r
-\r
-define Package/imagemagick/description\r
-  An image manipulation library.\r
-endef\r
-\r
-define Package/imagemagick-jpeg\r
-  $(call Package/imagemagick/Default)\r
-  TITLE+= (jpeg)\r
-  DEPENDS:=+imagemagick +libjpeg +zlib\r
-endef\r
-\r
-define Package/imagemagick-jpeg/description\r
-  imagemagick JPEG module\r
-endef\r
-\r
-define Package/imagemagick-png\r
-  $(call Package/imagemagick/Default)\r
-  TITLE+= (png)\r
-  DEPENDS:=+imagemagick +libpng +zlib\r
-endef\r
-\r
-define Package/imagemagick-png/description\r
-  imagemagick PNG module\r
-endef\r
-\r
-\r
-CONFIGURE_ARGS += \\r
-         --with-modules \\r
-         --enable-shared \\r
-         --enable-static \\r
-         --without-xml \\r
-         --without-x\r
-\r
-define Build/Compile\r
-       $(MAKE) -C $(PKG_BUILD_DIR) \\r
-               CC="$(TARGET_CC)" \\r
-               CFLAGS="$(TARGET_CFLAGS) -Wall -I$(PKG_BUILD_DIR)/include/linux -I$(PKG_BUILD_DIR)/include"\r
-endef\r
-\r
-define Build/InstallDev\r
-       $(INSTALL_DIR) $(1)/usr/include/magick\r
-       $(INSTALL_DIR) $(1)/usr/include/Magick++\r
-       $(INSTALL_DIR) $(1)/usr/include/wand\r
-       $(CP) \\r
-               $(PKG_INSTALL_DIR)/usr/include/* \\r
-               $(1)/usr/include/\r
-\r
-       $(INSTALL_DIR) $(1)/usr/lib/\r
-       $(CP) \\r
-               $(PKG_INSTALL_DIR)/usr/lib/*.so* \\r
-               $(1)/usr/lib/\r
-\r
-       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/\r
-       $(INSTALL_DATA) \\r
-               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \\r
-               $(1)/usr/lib/pkgconfig/\r
-endef\r
-\r
-define Package/imagemagick/install\r
-       $(INSTALL_DIR) $(1)/usr/lib/\r
-       $(CP) \\r
-               $(PKG_INSTALL_DIR)/usr/lib/*.so* \\r
-               $(1)/usr/lib/\r
-endef\r
-\r
-define BuildPlugin\r
-  define Package/imagemagick-$(1)/install\r
-       $(INSTALL_DIR) $$(1)/usr/lib/ImageMagick-$(PKG_VERSION)/modules-Q16/coders\r
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/ImageMagick-$(PKG_VERSION)/modules-Q16/coders/$(1).so \\r
-               $$(1)/usr/lib/ImageMagick-$(PKG_VERSION)/modules-Q16/coders\r
-  endef\r
-\r
-  $$(eval $$(call BuildPackage,imagemagick-$(1)))\r
-endef\r
-\r
-$(eval $(call BuildPackage,imagemagick))\r
-$(eval $(call BuildPlugin,jpeg))\r
-$(eval $(call BuildPlugin,png))\r
-\r
+#
+# Copyright (C) 2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=imagemagick
+PKG_VERSION:=6.6.7
+PKG_REVISION:=3
+PKG_RELEASE:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/ImageMagick-$(PKG_VERSION)-$(PKG_REVISION)
+PKG_SOURCE:=ImageMagick-$(PKG_VERSION)-$(PKG_REVISION).tar.bz2
+PKG_SOURCE_URL:=ftp://ftp.fifi.org/pub/ImageMagick/
+PKG_MD5SUM:=
+
+PKG_FIXUP:=libtool
+PKG_REMOVE_FILES:=aclocal.m4 m4/libtool.m4
+
+include $(INCLUDE_DIR)/package.mk
+
+PKG_INSTALL=1
+
+define Package/imagemagick/Default
+  SECTION:=multimedia
+  CATEGORY:=Multimedia
+  TITLE:=imagemagick
+  URL:=http://image_magick.veidrodis.com/
+endef
+
+define Package/imagemagick
+  $(call Package/imagemagick/Default)
+endef
+
+define Package/imagemagick/description
+  An image manipulation library.
+endef
+
+define Package/imagemagick-jpeg
+  $(call Package/imagemagick/Default)
+  TITLE+= (jpeg)
+  DEPENDS:=+imagemagick +libjpeg +zlib
+endef
+
+define Package/imagemagick-jpeg/description
+  imagemagick JPEG module
+endef
+
+define Package/imagemagick-png
+  $(call Package/imagemagick/Default)
+  TITLE+= (png)
+  DEPENDS:=+imagemagick +libpng +zlib
+endef
+
+define Package/imagemagick-png/description
+  imagemagick PNG module
+endef
+
+
+CONFIGURE_ARGS += \
+         --with-modules \
+         --enable-shared \
+         --enable-static \
+         --without-xml \
+         --without-x
+
+define Build/Compile
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               CC="$(TARGET_CC)" \
+               CFLAGS="$(TARGET_CFLAGS) -Wall -I$(PKG_BUILD_DIR)/include/linux -I$(PKG_BUILD_DIR)/include"
+endef
+
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/include/magick
+       $(INSTALL_DIR) $(1)/usr/include/Magick++
+       $(INSTALL_DIR) $(1)/usr/include/wand
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/include/* \
+               $(1)/usr/include/
+
+       $(INSTALL_DIR) $(1)/usr/lib/
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
+
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
+endef
+
+define Package/imagemagick/install
+       $(INSTALL_DIR) $(1)/usr/lib/
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
+endef
+
+define BuildPlugin
+  define Package/imagemagick-$(1)/install
+       $(INSTALL_DIR) $$(1)/usr/lib/ImageMagick-$(PKG_VERSION)/modules-Q16/coders
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/ImageMagick-$(PKG_VERSION)/modules-Q16/coders/$(1).so \
+               $$(1)/usr/lib/ImageMagick-$(PKG_VERSION)/modules-Q16/coders
+  endef
+
+  $$(eval $$(call BuildPackage,imagemagick-$(1)))
+endef
+
+$(eval $(call BuildPackage,imagemagick))
+$(eval $(call BuildPlugin,jpeg))
+$(eval $(call BuildPlugin,png))
+