From c4809c8119d5fb6c7e3054b3e9be5229590163f5 Mon Sep 17 00:00:00 2001 From: cristy Date: Mon, 18 Mar 2013 16:59:24 +0000 Subject: [PATCH] --- Magick++/lib/Magick++.pc.in | 12 +++++++----- MagickCore/ImageMagick.pc.in | 6 ++++-- MagickCore/MagickCore.pc.in | 6 ++++-- MagickCore/version.h | 2 +- MagickWand/MagickWand.pc.in | 10 ++++++---- 5 files changed, 22 insertions(+), 14 deletions(-) diff --git a/Magick++/lib/Magick++.pc.in b/Magick++/lib/Magick++.pc.in index 0e55ba429..5892767dc 100644 --- a/Magick++/lib/Magick++.pc.in +++ b/Magick++/lib/Magick++.pc.in @@ -2,10 +2,12 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ - +libname=Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ + Name: Magick++ +Description: Magick++ - C++ API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) Version: @PACKAGE_VERSION@ -Description: Magick++ - C++ API for ImageMagick -Requires: ImageMagick -Libs: -L${libdir} -lMagick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ -Cflags: -I${includedir} +Requires: MagickWand +Libs: -L${libdir} -l${libname} +Libs.private: -L${libdir} -l${libname} @MATH_LIBS@ +Cflags: -I${includedir} @MAGICK_PCFLAGS@ diff --git a/MagickCore/ImageMagick.pc.in b/MagickCore/ImageMagick.pc.in index 3729664c4..c7abb05ab 100644 --- a/MagickCore/ImageMagick.pc.in +++ b/MagickCore/ImageMagick.pc.in @@ -2,9 +2,11 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ - +libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ + Name: ImageMagick Description: ImageMagick - Convert, Edit, and Compose Images (ABI @MAGICK_ABI_SUFFIX@) Version: @PACKAGE_VERSION@ -Libs: -L${libdir} @MATH_LIBS@ -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ +Libs: -L${libdir} -l${libname} +Libs.private: -L${libdir} -l${libname} @MATH_LIBS@ Cflags: -I${includedir} @MAGICK_PCFLAGS@ diff --git a/MagickCore/MagickCore.pc.in b/MagickCore/MagickCore.pc.in index 98adb6c4f..94db672c4 100644 --- a/MagickCore/MagickCore.pc.in +++ b/MagickCore/MagickCore.pc.in @@ -2,9 +2,11 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ - +libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ + Name: MagickCore Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) Version: @PACKAGE_VERSION@ -Libs: -L${libdir} @MATH_LIBS@ -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ +Libs: -L${libdir} -l${libname} +Libs.private: -L${libdir} -l${libname} @MATH_LIBS@ Cflags: -I${includedir} @MAGICK_PCFLAGS@ diff --git a/MagickCore/version.h b/MagickCore/version.h index e493da382..2dc944b61 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -34,7 +34,7 @@ extern "C" { #define MagickLibAddendum "-0" #define MagickLibInterface 1 #define MagickLibMinInterface 1 -#define MagickReleaseDate "2013-03-17" +#define MagickReleaseDate "2013-03-18" #define MagickChangeDate "20121005" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickFeatures "DPC HDRI OpenMP" diff --git a/MagickWand/MagickWand.pc.in b/MagickWand/MagickWand.pc.in index 9af847316..53be17fe9 100644 --- a/MagickWand/MagickWand.pc.in +++ b/MagickWand/MagickWand.pc.in @@ -2,10 +2,12 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ - +libname=MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ + Name: MagickWand +Description: MagickWand - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) Version: @PACKAGE_VERSION@ -Description: MagickWand - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) -Requires: ImageMagick -Libs: -L${libdir} -lMagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ +Requires: MagickCore +Libs: -L${libdir} -l${libname} +Libs.private: -L${libdir} -l${libname} @MATH_LIBS@ Cflags: -I${includedir} @MAGICK_PCFLAGS@ -- 2.50.1