(no commit message)

[imagemagick] / coders / Makefile.am

diff --git a/coders/Makefile.am b/coders/Makefile.am
index 4151a532fb2a54520a2b816536ee7b3166873458..def0bf2e47fc5dd7e9d4d662dc676792dfb18d83 100644 (file)
--- a/coders/Makefile.am
+++ b/coders/Makefile.am
@@ -1,4 +1,4 @@
-#  Copyright 1999-2011 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
@@ -18,71 +18,71 @@
 codersdir = $(CODER_PATH)
 
 if DPS_DELEGATE
-MAGICK_DPS_MODULES = coders/dps.la
-MAGICK_DPS_SRCS = coders/dps.c
+MAGICKCORE_DPS_MODULES = coders/dps.la
+MAGICKCORE_DPS_SRCS = coders/dps.c
 endif
 
 if DJVU_DELEGATE
-MAGICK_DJVU_MODULES = coders/djvu.la
-MAGICK_DJVU_SRCS = coders/djvu.c
+MAGICKCORE_DJVU_MODULES = coders/djvu.la
+MAGICKCORE_DJVU_SRCS = coders/djvu.c
 endif
 
 if OPENEXR_DELEGATE
-MAGICK_EXR_MODULES = coders/exr.la
-MAGICK_EXR_SRCS = coders/exr.c
+MAGICKCORE_EXR_MODULES = coders/exr.la
+MAGICKCORE_EXR_SRCS = coders/exr.c
 endif
 
 if FPX_DELEGATE
-MAGICK_FPX_MODULES = coders/fpx.la
-MAGICK_FPX_SRCS = coders/fpx.c
+MAGICKCORE_FPX_MODULES = coders/fpx.la
+MAGICKCORE_FPX_SRCS = coders/fpx.c
 endif
 
 if JBIG_DELEGATE
-MAGICK_JBIG_MODULES = coders/jbig.la
-MAGICK_JBIG_SRCS = coders/jbig.c
+MAGICKCORE_JBIG_MODULES = coders/jbig.la
+MAGICKCORE_JBIG_SRCS = coders/jbig.c
 endif
 
 if JPEG_DELEGATE
-MAGICK_JPEG_MODULES = coders/jpeg.la
-MAGICK_JPEG_SRCS = coders/jpeg.c
+MAGICKCORE_JPEG_MODULES = coders/jpeg.la
+MAGICKCORE_JPEG_SRCS = coders/jpeg.c
 endif
 
 if JP2_DELEGATE
-MAGICK_JP2_MODULES = coders/jp2.la
-MAGICK_JP2_SRCS = coders/jp2.c
+MAGICKCORE_JP2_MODULES = coders/jp2.la
+MAGICKCORE_JP2_SRCS = coders/jp2.c
 endif
 
 if PNG_DELEGATE
-MAGICK_PNG_MODULES = coders/png.la
-MAGICK_PNG_SRCS = coders/png.c
+MAGICKCORE_PNG_MODULES = coders/png.la
+MAGICKCORE_PNG_SRCS = coders/png.c
 endif
 
 if TIFF_DELEGATE
-MAGICK_TIFF_MODULES = coders/ept.la coders/tiff.la
-MAGICK_TIFF_SRCS = coders/ept.c coders/tiff.c
+MAGICKCORE_TIFF_MODULES = coders/ept.la coders/tiff.la
+MAGICKCORE_TIFF_SRCS = coders/ept.c coders/tiff.c
 endif
 
 if WEBP_DELEGATE
-MAGICK_WEBP_MODULES = coders/webp.la
-MAGICK_WEBP_SRCS = coders/webp.c
+MAGICKCORE_WEBP_MODULES = coders/webp.la
+MAGICKCORE_WEBP_SRCS = coders/webp.c
 endif
 
 if WINGDI32_DELEGATE
-MAGICK_GDI32_MODULES = coders/clipboard.la coders/emf.la
-MAGICK_GDI32_SRCS = coders/clipboard.c coders/emf.c
+MAGICKCORE_GDI32_MODULES = coders/clipboard.la coders/emf.la
+MAGICKCORE_GDI32_SRCS = coders/clipboard.c coders/emf.c
 endif
 
 if WMF_DELEGATE
-MAGICK_WMF_MODULES = coders/wmf.la
-MAGICK_WMF_SRCS = coders/wmf.c
+MAGICKCORE_WMF_MODULES = coders/wmf.la
+MAGICKCORE_WMF_SRCS = coders/wmf.c
 endif
 
 if X11_DELEGATE
-MAGICK_X11_MODULES = coders/x.la coders/xwd.la
-MAGICK_X11_SRCS = coders/x.c coders/xwd.c
+MAGICKCORE_X11_MODULES = coders/x.la coders/xwd.la
+MAGICKCORE_X11_SRCS = coders/x.c coders/xwd.c
 endif
 
-MAGICK_CODER_SRCS = \
+MAGICKCORE_CODER_SRCS = \
        coders/aai.c \
        coders/art.c \
        coders/avs.c \
@@ -104,6 +104,7 @@ MAGICK_CODER_SRCS = \
        coders/dot.c \
        coders/dpx.c \
        coders/fax.c \
+       coders/fd.c \
        coders/fits.c \
        coders/gif.c \
        coders/gradient.c \
@@ -113,6 +114,7 @@ MAGICK_CODER_SRCS = \
        coders/histogram.c \
        coders/hrz.c \
        coders/html.c \
+       coders/jnx.c \
        coders/icon.c \
        coders/info.c \
        coders/inline.c \
@@ -135,6 +137,7 @@ MAGICK_CODER_SRCS = \
        coders/null.c \
        coders/otb.c \
        coders/palm.c \
+       coders/pango.c \
        coders/pattern.c \
        coders/pcd.c \
        coders/pcl.c \
@@ -184,19 +187,19 @@ MAGICK_CODER_SRCS = \
        coders/xps.c \
        coders/ycbcr.c \
        coders/yuv.c \
-  $(MAGICK_DPS_SRCS) \
-  $(MAGICK_DJVU_SRCS) \
-  $(MAGICK_EXR_SRCS) \
-  $(MAGICK_FPX_SRCS) \
-  $(MAGICK_GDI32_SRCS) \
-  $(MAGICK_JBIG_SRCS) \
-  $(MAGICK_JPEG_SRCS) \
-  $(MAGICK_JP2_SRCS) \
-  $(MAGICK_PNG_SRCS) \
-  $(MAGICK_TIFF_SRCS) \
-  $(MAGICK_WEBP_SRCS) \
-  $(MAGICK_WMF_SRCS) \
-  $(MAGICK_X11_SRCS)
+       $(MAGICKCORE_DPS_SRCS) \
+       $(MAGICKCORE_DJVU_SRCS) \
+       $(MAGICKCORE_EXR_SRCS) \
+       $(MAGICKCORE_FPX_SRCS) \
+       $(MAGICKCORE_GDI32_SRCS) \
+       $(MAGICKCORE_JBIG_SRCS) \
+       $(MAGICKCORE_JPEG_SRCS) \
+       $(MAGICKCORE_JP2_SRCS) \
+       $(MAGICKCORE_PNG_SRCS) \
+       $(MAGICKCORE_TIFF_SRCS) \
+       $(MAGICKCORE_WEBP_SRCS) \
+       $(MAGICKCORE_WMF_SRCS) \
+       $(MAGICKCORE_X11_SRCS)
 
 if WITH_MODULES
 coders_LTLIBRARIES = \
@@ -221,6 +224,7 @@ coders_LTLIBRARIES = \
        coders/dot.la \
        coders/dpx.la \
        coders/fax.la \
+       coders/fd.la \
        coders/fits.la \
        coders/gif.la \
        coders/gradient.la \
@@ -230,6 +234,7 @@ coders_LTLIBRARIES = \
        coders/histogram.la \
        coders/hrz.la \
        coders/html.la \
+       coders/jnx.la \
        coders/icon.la \
        coders/info.la \
        coders/inline.la \
@@ -252,6 +257,7 @@ coders_LTLIBRARIES = \
        coders/null.la \
        coders/otb.la \
        coders/palm.la \
+       coders/pango.la \
        coders/pattern.la \
        coders/pcd.la \
        coders/pcl.la \
@@ -301,19 +307,19 @@ coders_LTLIBRARIES = \
        coders/xps.la \
        coders/ycbcr.la \
        coders/yuv.la \
-  $(MAGICK_DPS_MODULES) \
-  $(MAGICK_DJVU_MODULES) \
-  $(MAGICK_EXR_MODULES) \
-  $(MAGICK_FPX_MODULES) \
-  $(MAGICK_GDI32_MODULES)  \
-  $(MAGICK_JBIG_MODULES) \
-  $(MAGICK_JPEG_MODULES) \
-  $(MAGICK_JP2_MODULES) \
-  $(MAGICK_PNG_MODULES) \
-  $(MAGICK_TIFF_MODULES) \
-  $(MAGICK_WEBP_MODULES) \
-  $(MAGICK_WMF_MODULES) \
-  $(MAGICK_X11_MODULES)
+       $(MAGICKCORE_DPS_MODULES) \
+       $(MAGICKCORE_DJVU_MODULES) \
+       $(MAGICKCORE_EXR_MODULES) \
+       $(MAGICKCORE_FPX_MODULES) \
+       $(MAGICKCORE_GDI32_MODULES)  \
+       $(MAGICKCORE_JBIG_MODULES) \
+       $(MAGICKCORE_JPEG_MODULES) \
+       $(MAGICKCORE_JP2_MODULES) \
+       $(MAGICKCORE_PNG_MODULES) \
+       $(MAGICKCORE_TIFF_MODULES) \
+       $(MAGICKCORE_WEBP_MODULES) \
+       $(MAGICKCORE_WMF_MODULES) \
+       $(MAGICKCORE_X11_MODULES)
 else
 coders_LTLIBRARIES =
 endif # WITH_MODULES
@@ -355,16 +361,16 @@ coders_braille_la_LDFLAGS  = $(MODULECOMMONFLAGS)
 coders_braille_la_LIBADD   = $(MAGICKCORE_LIBS)
 
 # CALS coder module
-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_SOURCES    = coders/cals.c
+coders_cals_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS)
+coders_cals_la_LDFLAGS     = $(MODULECOMMONFLAGS)
+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
@@ -406,7 +412,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
@@ -430,7 +436,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
@@ -472,7 +478,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
@@ -480,6 +486,12 @@ coders_fax_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
 coders_fax_la_LDFLAGS      = $(MODULECOMMONFLAGS)
 coders_fax_la_LIBADD       = $(MAGICKCORE_LIBS)
 
+# FD coder module
+coders_fd_la_SOURCES      = coders/fd.c
+coders_fd_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
+coders_fd_la_LDFLAGS      = $(MODULECOMMONFLAGS)
+coders_fd_la_LIBADD       = $(MAGICKCORE_LIBS)
+
 # FITS coder module
 coders_fits_la_SOURCES     = coders/fits.c
 coders_fits_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS)
@@ -514,7 +526,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
@@ -526,7 +538,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
@@ -540,6 +552,12 @@ 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)
@@ -574,8 +592,8 @@ coders_jbig_la_LIBADD      = $(MAGICKCORE_LIBS) $(JBIG_LIBS)
 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)
@@ -585,8 +603,8 @@ coders_jp2_la_LIBADD       = $(MAGICKCORE_LIBS) $(JP2_LIBS) $(JPEG_LIBS) $(MATH_
 # 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
@@ -670,7 +688,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
@@ -690,6 +708,12 @@ coders_palm_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS)
 coders_palm_la_LDFLAGS     = $(MODULECOMMONFLAGS)
 coders_palm_la_LIBADD      = $(MAGICKCORE_LIBS)
 
+# PANGO coder module
+coders_pango_la_SOURCES  = coders/pango.c
+coders_pango_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) $(PANGO_CFLAGS)
+coders_pango_la_LDFLAGS  = $(MODULECOMMONFLAGS)
+coders_pango_la_LIBADD   = $(MAGICKCORE_LIBS) $(PANGO_LIBS)
+
 # Pattern module
 coders_pattern_la_SOURCES   = coders/pattern.c
 coders_pattern_la_CPPFLAGS  = $(MODULE_EXTRA_CPPFLAGS)
@@ -706,7 +730,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
@@ -880,7 +904,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
@@ -1000,7 +1024,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) $(MATH_LIBS)
 
 # XWD coder module
 coders_xwd_la_SOURCES      = coders/xwd.c