(no commit message)

[imagemagick] / coders / Makefile.am

diff --git a/coders/Makefile.am b/coders/Makefile.am
index d592266227aece7b82fa9e5763360015c27e3fee..276383e0bcb44f4a6fbe480a2478288b3b4eb383 100644 (file)
--- a/coders/Makefile.am
+++ b/coders/Makefile.am
@@ -1,4 +1,4 @@
-#  Copyright 1999-2012 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
@@ -118,10 +118,13 @@ MAGICKCORE_CODER_SRCS = \
        coders/info.c \
        coders/inline.c \
        coders/ipl.c \
+       coders/jnx.c \
+       coders/json.c \
        coders/label.c \
        coders/mac.c \
        coders/magick.c \
        coders/map.c \
+       coders/mask.c \
        coders/mat.c \
        coders/matte.c \
        coders/meta.c \
@@ -156,9 +159,11 @@ MAGICKCORE_CODER_SRCS = \
        coders/pwp.c \
        coders/raw.c \
        coders/rgb.c \
+       coders/rgf.c \
        coders/rla.c \
        coders/rle.c \
        coders/scr.c \
+       coders/screenshot.c \
        coders/sct.c \
        coders/sfw.c \
        coders/sgi.c \
@@ -237,10 +242,13 @@ coders_LTLIBRARIES = \
        coders/info.la \
        coders/inline.la \
        coders/ipl.la \
+       coders/jnx.la \
+       coders/json.la \
        coders/label.la \
        coders/mac.la \
        coders/magick.la \
        coders/map.la \
+       coders/mask.la \
        coders/mat.la \
        coders/matte.la \
        coders/meta.la \
@@ -275,6 +283,7 @@ coders_LTLIBRARIES = \
        coders/pwp.la \
        coders/raw.la \
        coders/rgb.la \
+       coders/rgf.la \
        coders/rla.la \
        coders/rle.la \
        coders/scr.la \
@@ -362,13 +371,13 @@ coders_braille_la_LIBADD   = $(MAGICKCORE_LIBS)
 coders_cals_la_SOURCES    = coders/cals.c
 coders_cals_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS)
 coders_cals_la_LDFLAGS     = $(MODULECOMMONFLAGS)
-coders_cals_la_LIBADD      = $(MAGICKCORE_LIBS)
+coders_cals_la_LIBADD      = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 
 # CAPTION coder module
 coders_caption_la_SOURCES  = coders/caption.c
 coders_caption_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
 coders_caption_la_LDFLAGS  = $(MODULECOMMONFLAGS)
-coders_caption_la_LIBADD   = $(MAGICKCORE_LIBS)
+coders_caption_la_LIBADD   = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 
 # CINEON coder module
 coders_cin_la_SOURCES      = coders/cin.c
@@ -410,7 +419,7 @@ coders_cut_la_LIBADD       = $(MAGICKCORE_LIBS)
 coders_dcm_la_SOURCES      = coders/dcm.c
 coders_dcm_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
 coders_dcm_la_LDFLAGS      = $(MODULECOMMONFLAGS)
-coders_dcm_la_LIBADD       = $(MAGICKCORE_LIBS)
+coders_dcm_la_LIBADD       = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 
 # DDS coder module
 coders_dds_la_SOURCES      = coders/dds.c
@@ -434,7 +443,7 @@ coders_dib_la_LIBADD       = $(MAGICKCORE_LIBS)
 coders_djvu_la_SOURCES     = coders/djvu.c
 coders_djvu_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS)
 coders_djvu_la_LDFLAGS     = $(MODULECOMMONFLAGS)
-coders_djvu_la_LIBADD      = $(MAGICKCORE_LIBS) $(DJVU_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS)
+coders_djvu_la_LIBADD      = $(MAGICKCORE_LIBS) $(DJVU_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
 
 # DNG coder module
 coders_dng_la_SOURCES      = coders/dng.c
@@ -476,7 +485,7 @@ coders_ept_la_LIBADD       = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 coders_exr_la_SOURCES      = coders/exr.c
 coders_exr_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS) $(OPENEXR_CFLAGS)
 coders_exr_la_LDFLAGS      = $(MODULECOMMONFLAGS)
-coders_exr_la_LIBADD       = $(MAGICKCORE_LIBS) $(MATH_LIBS) $(OPENEXR_LIBS)
+coders_exr_la_LIBADD       = $(MAGICKCORE_LIBS) $(OPENEXR_LIBS) $(MATH_LIBS)
 
 # FAX coder module
 coders_fax_la_SOURCES      = coders/fax.c
@@ -500,7 +509,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
@@ -524,7 +533,7 @@ coders_gradient_la_LIBADD  = $(MAGICKCORE_LIBS)
 coders_histogram_la_SOURCES = coders/histogram.c
 coders_histogram_la_CPPFLAGS= $(MODULE_EXTRA_CPPFLAGS)
 coders_histogram_la_LDFLAGS = $(MODULECOMMONFLAGS)
-coders_histogram_la_LIBADD  = $(MAGICKCORE_LIBS)
+coders_histogram_la_LIBADD  = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 
 # HALD coder module
 coders_hald_la_SOURCES     = coders/hald.c
@@ -536,7 +545,7 @@ coders_hald_la_LIBADD      = $(MAGICKCORE_LIBS) $(GOMP_LIBS)
 coders_hdr_la_SOURCES     = coders/hdr.c
 coders_hdr_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS)
 coders_hdr_la_LDFLAGS     = $(MODULECOMMONFLAGS)
-coders_hdr_la_LIBADD      = $(MAGICKCORE_LIBS) $(GOMP_LIBS)
+coders_hdr_la_LIBADD      = $(MAGICKCORE_LIBS) $(GOMP_LIBS) $(MATH_LIBS)
 
 # HRZ coder module
 coders_hrz_la_SOURCES      = coders/hrz.c
@@ -578,25 +587,37 @@ 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
 coders_jpeg_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS)
 coders_jpeg_la_LDFLAGS     = $(MODULECOMMONFLAGS)
-coders_jpeg_la_LIBADD      = $(MAGICKCORE_LIBS) $(JPEG_LIBS)
-
+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
 coders_label_la_CPPFLAGS   = $(MODULE_EXTRA_CPPFLAGS)
-coders_label_la_LDFLAGS    = $(MODULECOMMONFLAGS) $(MATH_LIBS)
-coders_label_la_LIBADD     = $(MAGICKCORE_LIBS)
+coders_label_la_LDFLAGS    = $(MODULECOMMONFLAGS)
+coders_label_la_LIBADD     = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 
 # MAC coder module
 coders_mac_la_SOURCES      = coders/mac.c
@@ -616,6 +637,12 @@ coders_map_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
 coders_map_la_LDFLAGS      = $(MODULECOMMONFLAGS)
 coders_map_la_LIBADD       = $(MAGICKCORE_LIBS)
 
+# MASK coder module
+coders_mask_la_SOURCES    = coders/mask.c
+coders_mask_la_CPPFLAGS   = $(MODULE_EXTRA_CPPFLAGS)
+coders_mask_la_LDFLAGS    = $(MODULECOMMONFLAGS)
+coders_mask_la_LIBADD     = $(MAGICKCORE_LIBS)
+
 # MAT coder module
 coders_mat_la_SOURCES      = coders/mat.c
 coders_mat_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
@@ -680,7 +707,7 @@ coders_mtv_la_LIBADD       = $(MAGICKCORE_LIBS)
 coders_mvg_la_SOURCES      = coders/mvg.c
 coders_mvg_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
 coders_mvg_la_LDFLAGS      = $(MODULECOMMONFLAGS)
-coders_mvg_la_LIBADD       = $(MAGICKCORE_LIBS)
+coders_mvg_la_LIBADD       = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 
 # NULL coder module
 coders_null_la_SOURCES     = coders/null.c
@@ -722,7 +749,7 @@ coders_pcd_la_LIBADD       = $(MAGICKCORE_LIBS)
 coders_pcl_la_SOURCES      = coders/pcl.c
 coders_pcl_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
 coders_pcl_la_LDFLAGS      = $(MODULECOMMONFLAGS)
-coders_pcl_la_LIBADD       = $(MAGICKCORE_LIBS)
+coders_pcl_la_LIBADD       = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 
 # PCX coder module
 coders_pcx_la_SOURCES      = coders/pcx.c
@@ -826,6 +853,12 @@ coders_rgb_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
 coders_rgb_la_LDFLAGS      = $(MODULECOMMONFLAGS)
 coders_rgb_la_LIBADD       = $(MAGICKCORE_LIBS)
 
+# RGF coder module
+coders_rgf_la_SOURCES      = coders/rgf.c
+coders_rgf_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
+coders_rgf_la_LDFLAGS      = $(MODULECOMMONFLAGS)
+coders_rgf_la_LIBADD       = $(MAGICKCORE_LIBS)
+
 # RLA coder module
 coders_rla_la_SOURCES      = coders/rla.c
 coders_rla_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
@@ -896,7 +929,7 @@ coders_thumbnail_la_LIBADD = $(MAGICKCORE_LIBS)
 coders_tiff_la_SOURCES     = coders/tiff.c
 coders_tiff_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS)
 coders_tiff_la_LDFLAGS     = $(MODULECOMMONFLAGS)
-coders_tiff_la_LIBADD      = $(MAGICKCORE_LIBS) $(TIFF_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS)
+coders_tiff_la_LIBADD      = $(MAGICKCORE_LIBS) $(TIFF_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
 
 # TILE coder module
 coders_tile_la_SOURCES     = coders/tile.c
@@ -1016,7 +1049,7 @@ coders_xpm_la_LIBADD       = $(MAGICKCORE_LIBS)
 coders_xps_la_SOURCES      = coders/xps.c
 coders_xps_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
 coders_xps_la_LDFLAGS      = $(MODULECOMMONFLAGS)
-coders_xps_la_LIBADD       = $(MAGICKCORE_LIBS)
+coders_xps_la_LIBADD       = $(MAGICKCORE_LIBS) $(MUPDF_LIBS) $(FREETYPE_LIBS) $(MATH_LIBS)
 
 # XWD coder module
 coders_xwd_la_SOURCES      = coders/xwd.c