(no commit message)

[imagemagick] / MagickWand / Makefile.am

diff --git a/MagickWand/Makefile.am b/MagickWand/Makefile.am
index bb57316320573a134d96c395effc74aef093c3bf..fc765ea60729e806792edd658a89c817100f5702 100644 (file)
--- a/MagickWand/Makefile.am
+++ b/MagickWand/Makefile.am
@@ -1,4 +1,4 @@
-#  Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization
+#  Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization
 #  dedicated to making software imaging solutions freely available.
 #
 #  You may not use this file except in compliance with the License.  You may
@@ -55,6 +55,7 @@ MAGICKWAND_SOURCES = \
        MagickWand/montage.h \
        MagickWand/operation.c \
        MagickWand/operation.h \
+       MagickWand/operation-private.h \
        MagickWand/pixel-iterator.c \
        MagickWand/pixel-iterator.h \
        MagickWand/pixel-wand.c \
@@ -101,6 +102,7 @@ MAGICKWAND_INCLUDE_HDRS = \
 MAGICKWAND_NOINST_HDRS = \
        MagickWand/mogrify-private.h \
        MagickWand/magick-wand-private.h \
+       MagickWand/operation-private.h \
        MagickWand/pixel-wand-private.h \
        MagickWand/script-token.h \
        MagickWand/studio.h \
@@ -115,29 +117,29 @@ MAGICKWAND_BIN_SCRPTS = \
        MagickWand/MagickWand-config
 
 MAGICKWAND_PKGCONFIG = \
-       MagickWand/MagickWand.pc
+       MagickWand/MagickWand.pc \
+       MagickWand/MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc
 
 MAGICKWAND_MANS = \
        MagickWand/MagickWand-config.1
 
 MAGICKWAND_BUILT_SRCS = 
 
-MAGICKWAND_LIBS = MagickWand/libMagickWand.la
+MAGICKWAND_LIBS = MagickWand/libMagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.la
 
-MagickWand_libMagickWand_la_SOURCES = $(MAGICKWAND_SOURCES)
-MagickWand_libMagickWand_la_CPPFLAGS = $(LIBRARY_EXTRA_CPPFLAGS)
+MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES = $(MAGICKWAND_SOURCES)
+MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS = $(LIBRARY_EXTRA_CPPFLAGS)
 
 if HAVE_LD_VERSION_SCRIPT
-MagickWand_libMagickWand_la_LDFLAGS_VERSION =  -Wl,--version-script=$(top_srcdir)/wand/libMagickWand.map
+MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LDFLAGS_VERSION =  -Wl,--version-script=$(top_srcdir)/MagickWand/libMagickWand.map
 else
-MagickWand_libMagickWand_la_LDFLAGS_VERSION = -export-symbols-regex ".*"
+MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LDFLAGS_VERSION = -export-symbols-regex ".*"
 endif
 
-MagickWand_libMagickWand_la_LDFLAGS = -no-undefined \
-  $(MagickWand_libMagickWand_la_LDFLAGS_VERSION) \
-       $(MAGICK_LT_RELEASE_OPTS) -version-info \
+MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LDFLAGS = -no-undefined \
+  $(MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LDFLAGS_VERSION) $(MAGICK_LT_RELEASE_OPTS) \
        $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
-MagickWand_libMagickWand_la_LIBADD = $(MAGICKCORE_LIBS) $(X11_LIBS) $(GOMP_LIBS) $(MATH_LIBS)
+MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LIBADD = $(MAGICKCORE_LIBS) $(X11_LIBS) $(GOMP_LIBS) $(MATH_LIBS)
 
 MAGICKWAND_EXTRA_DIST = \
        MagickWand/ChangeLog \