(no commit message)

[imagemagick] / MagickWand / Makefile.am

diff --git a/MagickWand/Makefile.am b/MagickWand/Makefile.am
index c24dedc791f9d1b443ef3f728477e9b5a1b88fb3..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
@@ -39,12 +39,12 @@ MAGICKWAND_SOURCES = \
        MagickWand/identify.h \
        MagickWand/import.c \
        MagickWand/import.h \
+       MagickWand/magick-cli.c \
+       MagickWand/magick-cli.h \
        MagickWand/magick-image.c \
        MagickWand/magick-image.h \
        MagickWand/magick-property.c \
        MagickWand/magick-property.h \
-       MagickWand/magick-cli.c \
-       MagickWand/magick-cli.h \
        MagickWand/magick-wand.c \
        MagickWand/magick-wand-private.h \
        MagickWand/method-attribute.h \
@@ -55,16 +55,22 @@ 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 \
        MagickWand/pixel-wand.h \
        MagickWand/pixel-wand-private.h \
+       MagickWand/script-token.c \
+       MagickWand/script-token.h \
        MagickWand/stream.c \
        MagickWand/stream.h \
        MagickWand/studio.h \
        MagickWand/wand.c \
        MagickWand/wand.h \
+       MagickWand/wandcli.c \
+       MagickWand/wandcli.h \
+       MagickWand/wandcli-private.h \
        MagickWand/wand-view.c \
        MagickWand/wand-view.h 
 
@@ -90,14 +96,18 @@ MAGICKWAND_INCLUDE_HDRS = \
        MagickWand/pixel-iterator.h \
        MagickWand/pixel-wand.h \
        MagickWand/stream.h \
+       MagickWand/wandcli.h \
        MagickWand/wand-view.h
 
 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 \
-       MagickWand/wand.h
+       MagickWand/wand.h \
+       MagickWand/wandcli-private.h
 
 # Headers which are installed
 MagickWandinc_HEADERS = \
@@ -107,49 +117,34 @@ 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_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES = $(MAGICKWAND_SOURCES)
+MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS = $(LIBRARY_EXTRA_CPPFLAGS)
 
-MagickWand_libMagickWand_la_SOURCES = $(MAGICKWAND_SOURCES)
-MagickWand_libMagickWand_la_CPPFLAGS = $(LIBRARY_EXTRA_CPPFLAGS)
-MagickWand_libMagickWand_la_LDFLAGS = -no-undefined -export-symbols-regex ".*" \
-       -version-info \
+if HAVE_LD_VERSION_SCRIPT
+MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LDFLAGS_VERSION =  -Wl,--version-script=$(top_srcdir)/MagickWand/libMagickWand.map
+else
+MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LDFLAGS_VERSION = -export-symbols-regex ".*"
+endif
+
+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 \
-       MagickWand/input_256c.miff \
-       MagickWand/input_bilevel.miff \
-       MagickWand/input_gray.miff \
-       MagickWand/input_truecolor.miff \
+       MagickWand/libMagickWand.map \
        MagickWand/MagickWand-config.1 \
-       MagickWand/MagickWand.pc.in \
-       MagickWand/sequence.miff \
-       MagickWand/common.sh \
-       $(MAGICKWAND_TESTS)
-
-MagickWand_drawtest_SOURCES      = MagickWand/drawtest.c
-MagickWand_drawtest_LDFLAGS      = $(LDFLAGS)
-MagickWand_drawtest_LDADD        = $(MAGICKWAND_LIBS)
-
-MagickWand_wandtest_SOURCES      = MagickWand/wandtest.c
-MagickWand_wandtest_LDFLAGS      = $(LDFLAGS)
-MagickWand_wandtest_LDADD        = $(MAGICKWAND_LIBS)
-
-MAGICKWAND_CHECK_PGRMS = \
-       MagickWand/drawtest \
-       MagickWand/wandtest
-
-MAGICKWAND_TESTS = \
-       MagickWand/drawtest.sh \
-       MagickWand/wandtest.sh
+       MagickWand/MagickWand.pc.in
 
-MAGICKWAND_CLEANFILES = \
-       MagickWand/*_out.*
+MAGICKWAND_CLEANFILES =