From: cristy Date: Mon, 10 Dec 2012 13:47:49 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~4630 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f9c61559699c42ab9ef4cc92c79cf608ebd510e6;p=imagemagick --- diff --git a/MagickCore/version.h b/MagickCore/version.h index a2fce5dbe..ff4d31288 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,7 +27,7 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2013 ImageMagick Studio LLC" -#define MagickSVNRevision "10131M" +#define MagickSVNRevision "10131:10145M" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 8,0,0 diff --git a/Makefile.in b/Makefile.in index 85d6631bc..e6ba7ce62 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1781,7 +1781,7 @@ Magick___demo_analyze_OBJECTS = $(am_Magick___demo_analyze_OBJECTS) @WITH_MAGICK_PLUS_PLUS_TRUE@am__DEPENDENCIES_2 = Magick++/lib/libMagick++-@MAGICK_ABI_SUFFIX@.la @WITH_MAGICK_PLUS_PLUS_TRUE@am__DEPENDENCIES_3 = \ @WITH_MAGICK_PLUS_PLUS_TRUE@ $(am__DEPENDENCIES_2) \ -@WITH_MAGICK_PLUS_PLUS_TRUE@ $(top_builddir)/magick/libMagickCore-@MAGICK_ABI_SUFFIX@.la +@WITH_MAGICK_PLUS_PLUS_TRUE@ $(top_builddir)/MagickCore/libMagickCore-@MAGICK_ABI_SUFFIX@.la Magick___demo_analyze_DEPENDENCIES = $(am__DEPENDENCIES_3) am_Magick___demo_button_OBJECTS = Magick++/demo/button.$(OBJEXT) Magick___demo_button_OBJECTS = $(am_Magick___demo_button_OBJECTS) @@ -4550,7 +4550,7 @@ MAGICKWAND_CLEANFILES = @WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_LIBS = @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_LIBS = Magick++/lib/libMagick++-@MAGICK_ABI_SUFFIX@.la @WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_LDADD = -@WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_LDADD = $(MAGICKPP_LIBS) $(top_builddir)/magick/libMagickCore-@MAGICK_ABI_SUFFIX@.la +@WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_LDADD = $(MAGICKPP_LIBS) $(top_builddir)/MagickCore/libMagickCore-@MAGICK_ABI_SUFFIX@.la @WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_CHECK_PGRMS = @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_CHECK_PGRMS = $(MAGICKPP_CHECK_PGRMS_OPT) @WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_MANS = diff --git a/configure b/configure index 5d9e70727..42f8fbc24 100755 --- a/configure +++ b/configure @@ -3649,7 +3649,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE` MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE -MAGICK_SVN_REVISION=10131M +MAGICK_SVN_REVISION=10131:10145M