(no commit message)

[imagemagick] / coders / Makefile.am

diff --git a/coders/Makefile.am b/coders/Makefile.am
index 7a6a797468c7e9d949449239764696be3c34c210..cbbe32665f6a73cba468937f9f5fa8c279f6dce3 100644 (file)
--- a/coders/Makefile.am
+++ b/coders/Makefile.am
@@ -1,4 +1,4 @@
-#  Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization
+#  Copyright 1999-2014 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
@@ -47,7 +47,7 @@ MAGICKCORE_JPEG_MODULES = coders/jpeg.la
 MAGICKCORE_JPEG_SRCS = coders/jpeg.c
 endif
 
-if JP2_DELEGATE
+if LIBOPENJP2_DELEGATE
 MAGICKCORE_JP2_MODULES = coders/jp2.la
 MAGICKCORE_JP2_SRCS = coders/jp2.c
 endif
@@ -114,11 +114,12 @@ MAGICKCORE_CODER_SRCS = \
        coders/histogram.c \
        coders/hrz.c \
        coders/html.c \
-       coders/jnx.c \
        coders/icon.c \
        coders/info.c \
        coders/inline.c \
        coders/ipl.c \
+       coders/jnx.c \
+       coders/json.c \
        coders/label.c \
        coders/mac.c \
        coders/magick.c \
@@ -236,11 +237,12 @@ coders_LTLIBRARIES = \
        coders/histogram.la \
        coders/hrz.la \
        coders/html.la \
-       coders/jnx.la \
        coders/icon.la \
        coders/info.la \
        coders/inline.la \
        coders/ipl.la \
+       coders/jnx.la \
+       coders/json.la \
        coders/label.la \
        coders/mac.la \
        coders/magick.la \
@@ -556,12 +558,6 @@ coders_html_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS)
 coders_html_la_LDFLAGS     = $(MODULECOMMONFLAGS)
 coders_html_la_LIBADD      = $(MAGICKCORE_LIBS)
 
-# JNX coder module
-coders_jnx_la_SOURCES     = coders/jnx.c
-coders_jnx_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS)
-coders_jnx_la_LDFLAGS     = $(MODULECOMMONFLAGS)
-coders_jnx_la_LIBADD      = $(MAGICKCORE_LIBS)
-
 # ICON coder module
 coders_icon_la_SOURCES     = coders/icon.c
 coders_icon_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS)
@@ -590,7 +586,7 @@ coders_ipl_la_LIBADD      = $(MAGICKCORE_LIBS)
 coders_jbig_la_SOURCES     = coders/jbig.c
 coders_jbig_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS)
 coders_jbig_la_LDFLAGS     = $(MODULECOMMONFLAGS)
-coders_jbig_la_LIBADD      = $(MAGICKCORE_LIBS) $(JBIG_LIBS)
+coders_jbig_la_LIBADD      = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(MATH_LIBS)
 
 # JPEG coder module
 coders_jpeg_la_SOURCES     = coders/jpeg.c
@@ -600,9 +596,21 @@ coders_jpeg_la_LIBADD      = $(MAGICKCORE_LIBS) $(JPEG_LIBS) $(MATH_LIBS)
  
 # JPEG 2000 coder module
 coders_jp2_la_SOURCES      = coders/jp2.c
-coders_jp2_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
+coders_jp2_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS) $(LIBOPENJP2_CFLAGS)
 coders_jp2_la_LDFLAGS      = $(MODULECOMMONFLAGS)
-coders_jp2_la_LIBADD       = $(MAGICKCORE_LIBS) $(JP2_LIBS) $(JPEG_LIBS) $(MATH_LIBS)
+coders_jp2_la_LIBADD       = $(MAGICKCORE_LIBS) $(LIBOPENJP2_LIBS) $(MATH_LIBS)
+
+# JNX coder module
+coders_jnx_la_SOURCES     = coders/jnx.c
+coders_jnx_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS)
+coders_jnx_la_LDFLAGS     = $(MODULECOMMONFLAGS)
+coders_jnx_la_LIBADD      = $(MAGICKCORE_LIBS)
+
+# JSON coder module
+coders_json_la_SOURCES     = coders/json.c
+coders_json_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS)
+coders_json_la_LDFLAGS     = $(MODULECOMMONFLAGS)
+coders_json_la_LIBADD      = $(MAGICKCORE_LIBS)
 
 # LABEL coder module
 coders_label_la_SOURCES    = coders/label.c