(no commit message)

[imagemagick] / MagickWand / Makefile.am

diff --git a/MagickWand/Makefile.am b/MagickWand/Makefile.am
index ce476b8e4d5ed8a57d4d6ab15fdbad9d040e7c68..fc765ea60729e806792edd658a89c817100f5702 100644 (file)
--- a/MagickWand/Makefile.am
+++ b/MagickWand/Makefile.am
@@ -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 \
@@ -116,28 +118,28 @@ MAGICKWAND_BIN_SCRPTS = \
 
 MAGICKWAND_PKGCONFIG = \
        MagickWand/MagickWand.pc \
-       MagickWand/MagickWand-@MAGICK_ABI_SUFFIX@.pc
+       MagickWand/MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc
 
 MAGICKWAND_MANS = \
        MagickWand/MagickWand-config.1
 
 MAGICKWAND_BUILT_SRCS = 
 
-MAGICKWAND_LIBS = MagickWand/libMagickWand-@MAGICK_ABI_SUFFIX@.la
+MAGICKWAND_LIBS = MagickWand/libMagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.la
 
-MagickWand_libMagickWand_@MAGICK_ABI_SUFFIX@_la_SOURCES = $(MAGICKWAND_SOURCES)
-MagickWand_libMagickWand_@MAGICK_ABI_SUFFIX@_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_@MAGICK_ABI_SUFFIX@_la_LDFLAGS_VERSION =  -Wl,--version-script=$(top_srcdir)/MagickWand/libMagickWand.map
+MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LDFLAGS_VERSION =  -Wl,--version-script=$(top_srcdir)/MagickWand/libMagickWand.map
 else
-MagickWand_libMagickWand_@MAGICK_ABI_SUFFIX@_la_LDFLAGS_VERSION = -export-symbols-regex ".*"
+MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LDFLAGS_VERSION = -export-symbols-regex ".*"
 endif
 
-MagickWand_libMagickWand_@MAGICK_ABI_SUFFIX@_la_LDFLAGS = -no-undefined \
-  $(MagickWand_libMagickWand_@MAGICK_ABI_SUFFIX@_la_LDFLAGS_VERSION) $(MAGICK_LT_RELEASE_OPTS) \
+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_@MAGICK_ABI_SUFFIX@_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 \