From: cristy Date: Tue, 15 Oct 2013 10:33:45 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~3223 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ed434b8fc26486c6fbd903ed2a052dcc9131d69;p=imagemagick --- diff --git a/Makefile.in b/Makefile.in index 997457fc0..a3087f57b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1064,7 +1064,8 @@ coders_fits_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_CFLAGS) $(CFLAGS) $(coders_fits_la_LDFLAGS) $(LDFLAGS) -o \ $@ @WITH_MODULES_TRUE@am_coders_fits_la_rpath = -rpath $(codersdir) -coders_fpx_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) +coders_fpx_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_coders_fpx_la_OBJECTS = coders/coders_fpx_la-fpx.lo coders_fpx_la_OBJECTS = $(am_coders_fpx_la_OBJECTS) coders_fpx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -3536,7 +3537,7 @@ coders_fits_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS) coders_fpx_la_SOURCES = coders/fpx.c coders_fpx_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_fpx_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_fpx_la_LIBADD = $(MAGICKCORE_LIBS) $(FPX_LIBS) -lstdc++ +coders_fpx_la_LIBADD = $(MAGICKCORE_LIBS) $(FPX_LIBS) $(MATH_LIBS) -lstdc++ # GIF coder module coders_gif_la_SOURCES = coders/gif.c diff --git a/coders/Makefile.am b/coders/Makefile.am index a28f194b7..7a6a79746 100644 --- a/coders/Makefile.am +++ b/coders/Makefile.am @@ -506,7 +506,7 @@ coders_fits_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS) coders_fpx_la_SOURCES = coders/fpx.c coders_fpx_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_fpx_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_fpx_la_LIBADD = $(MAGICKCORE_LIBS) $(FPX_LIBS) -lstdc++ +coders_fpx_la_LIBADD = $(MAGICKCORE_LIBS) $(FPX_LIBS) $(MATH_LIBS) -lstdc++ # GIF coder module coders_gif_la_SOURCES = coders/gif.c diff --git a/configure b/configure index 54102a9ea..dc58bcb4d 100755 --- a/configure +++ b/configure @@ -3691,7 +3691,7 @@ MAGICK_PATCHLEVEL_VERSION=0 MAGICK_VERSION=7.0.0-0 -MAGICK_SVN_REVISION=13449M +MAGICK_SVN_REVISION=13449:13452M # Substitute library versioning