GraphicsMagick: 2 new changesets
GraphicsMagick Commits <[email protected]> Sat, 09 Mar 2024 13:49:09 -0600
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.718.1710013768.7900.graphicsmagick-commit@lists.sourceforge.net> |
changeset e1ca545bfbba in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=e1ca545bfbba summary: Give up on the attempt to selectively force C++ linkage by introducing a C++ file for components which should have C++ linkage. changeset c98f714d4e64 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=c98f714d4e64 summary: Clean-up utilities/tests/composite_tmp.msl diffstat: ChangeLog | 8 + Makefile.am | 14 - Makefile.in | 303 ++++++++++++-------------------- VisualMagick/installer/inc/version.isx | 4 +- aclocal.m4 | 66 ++++-- coders/Makefile.am | 12 +- config/compile | 2 +- config/depcomp | 2 +- config/missing | 2 +- config/tap-driver.sh | 2 +- config/test-driver | 11 +- configure | 21 ++- configure.ac | 4 +- magick/acppfile.cpp | 10 - magick/version.h | 4 +- utilities/Makefile.am | 3 +- www/ChangeLog.html | 10 + 17 files changed, 218 insertions(+), 260 deletions(-) diffs (truncated from 1175 to 500 lines): diff -r e6072b847c54 -r c98f714d4e64 ChangeLog --- a/ChangeLog Mon Feb 26 08:09:42 2024 -0600 +++ b/ChangeLog Sat Mar 09 13:47:58 2024 -0600 @@ -1,3 +1,11 @@ +2024-03-09 Bob Friesenhahn <[email protected]> + + * utilities/Makefile.am: Give up on the attempt to selectively + force C++ linkage by introducing a C++ file for components which + should have C++ linkage. A libtool bug, and an Automake weakness + prevented this from working as expected. + (UTILITIES_CLEANFILES): Clean-up utilities/tests/composite_tmp.msl. + 2024-02-26 Bob Friesenhahn <[email protected]> * coders/hrz.c (RegisterHRZImage): Remove defective comment. diff -r e6072b847c54 -r c98f714d4e64 Makefile.am --- a/Makefile.am Mon Feb 26 08:09:42 2024 -0600 +++ b/Makefile.am Sat Mar 09 13:47:58 2024 -0600 @@ -28,20 +28,6 @@ MODULECOMMONFLAGS = -no-undefined -export-symbols-regex ".*" -shared -module -avoid-version MODULECOMMONCPPFLAGS = $(AM_CPPFLAGS) -# A dummy C++ file to force libtool linkage with the C++ compiler via simple inclusion. -# FIXME: Need condition code to handle the cases where: -# C++ is not needed at all (don't include acppfile.cpp in compile at all) -# C++ is needed and a static build (acppfile.cpp added to libGraphicsMagick.a and utilities/gm) -# C++ is needed but a shared (non-module) build (acppfile.cpp added to only libGraphicsMagick.so) -# C++ is needed, but a shared modules build (acppfile.cpp added to only to C++-dependent modules) -ACPPFILE = magick/acppfile.cpp - -# if WITH_MODULES # Building modules -# if WITH_SHARED_LIBS # Building shared libraries -# if HasFPX -# if HasHEIF -# if HasJXL - # Coverity parameters # FIXME: Could use info from /etc/os-release, or output from # lsb_release. diff -r e6072b847c54 -r c98f714d4e64 Makefile.in --- a/Makefile.in Mon Feb 26 08:09:42 2024 -0600 +++ b/Makefile.in Sat Mar 09 13:47:58 2024 -0600 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.3 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -492,13 +492,11 @@ $@ @WITH_MODULES_TRUE@am_coders_fits_la_rpath = -rpath $(codersdir) coders_fpx_la_DEPENDENCIES = $(LIBMAGICK) $(am__DEPENDENCIES_1) -am__objects_1 = magick/coders_fpx_la-acppfile.lo -am_coders_fpx_la_OBJECTS = coders/fpx_la-fpx.lo $(am__objects_1) +am_coders_fpx_la_OBJECTS = coders/fpx_la-fpx.lo coders_fpx_la_OBJECTS = $(am_coders_fpx_la_OBJECTS) -coders_fpx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ - $(AM_CXXFLAGS) $(CXXFLAGS) $(coders_fpx_la_LDFLAGS) $(LDFLAGS) \ - -o $@ +coders_fpx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(coders_fpx_la_LDFLAGS) $(LDFLAGS) -o $@ @HasFPX_TRUE@@WITH_MODULES_TRUE@am_coders_fpx_la_rpath = -rpath \ @HasFPX_TRUE@@WITH_MODULES_TRUE@ $(codersdir) coders_gif_la_DEPENDENCIES = $(LIBMAGICK) @@ -525,13 +523,12 @@ $@ @WITH_MODULES_TRUE@am_coders_gray_la_rpath = -rpath $(codersdir) coders_heif_la_DEPENDENCIES = $(LIBMAGICK) $(am__DEPENDENCIES_1) -am__objects_2 = magick/coders_heif_la-acppfile.lo -am_coders_heif_la_OBJECTS = coders/heif_la-heif.lo $(am__objects_2) +am_coders_heif_la_OBJECTS = coders/heif_la-heif.lo coders_heif_la_OBJECTS = $(am_coders_heif_la_OBJECTS) -coders_heif_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ - $(AM_CXXFLAGS) $(CXXFLAGS) $(coders_heif_la_LDFLAGS) \ - $(LDFLAGS) -o $@ +coders_heif_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(coders_heif_la_LDFLAGS) $(LDFLAGS) -o \ + $@ @HasHEIF_TRUE@@WITH_MODULES_TRUE@am_coders_heif_la_rpath = -rpath \ @HasHEIF_TRUE@@WITH_MODULES_TRUE@ $(codersdir) coders_histogram_la_DEPENDENCIES = $(LIBMAGICK) @@ -618,13 +615,11 @@ @HasJPEG_TRUE@@WITH_MODULES_TRUE@am_coders_jpeg_la_rpath = -rpath \ @HasJPEG_TRUE@@WITH_MODULES_TRUE@ $(codersdir) coders_jxl_la_DEPENDENCIES = $(LIBMAGICK) $(am__DEPENDENCIES_1) -am__objects_3 = magick/coders_jxl_la-acppfile.lo -am_coders_jxl_la_OBJECTS = coders/jxl_la-jxl.lo $(am__objects_3) +am_coders_jxl_la_OBJECTS = coders/jxl_la-jxl.lo coders_jxl_la_OBJECTS = $(am_coders_jxl_la_OBJECTS) -coders_jxl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ - $(AM_CXXFLAGS) $(CXXFLAGS) $(coders_jxl_la_LDFLAGS) $(LDFLAGS) \ - -o $@ +coders_jxl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(coders_jxl_la_LDFLAGS) $(LDFLAGS) -o $@ @HasJXL_TRUE@@WITH_MODULES_TRUE@am_coders_jxl_la_rpath = -rpath \ @HasJXL_TRUE@@WITH_MODULES_TRUE@ $(codersdir) coders_label_la_DEPENDENCIES = $(LIBMAGICK) @@ -1222,35 +1217,34 @@ coders/psd.c coders/cals.c coders/caption.c coders/cineon.c \ coders/cmyk.c coders/cut.c coders/dcm.c coders/dcraw.c \ coders/dib.c coders/dps.c coders/dpx.c coders/fax.c \ - coders/fits.c coders/fpx.c magick/acppfile.cpp \ - coders/clipboard.c coders/emf.c coders/gif.c coders/gradient.c \ - coders/gray.c coders/heif.c coders/histogram.c coders/hrz.c \ - coders/html.c coders/icon.c coders/identity.c coders/info.c \ - coders/jbig.c coders/jp2.c coders/jnx.c coders/jpeg.c \ - coders/jxl.c coders/label.c coders/locale.c coders/logo.c \ - coders/mac.c coders/map.c coders/mat.c coders/matte.c \ - coders/meta.c coders/miff.c coders/mono.c coders/mpc.c \ - coders/mpeg.c coders/mpr.c coders/msl.c coders/mtv.c \ - coders/mvg.c coders/null.c coders/otb.c coders/palm.c \ - coders/pcd.c coders/pcl.c coders/pcx.c coders/pdb.c \ - coders/pdf.c coders/pict.c coders/pix.c coders/plasma.c \ - coders/png.c coders/pnm.c coders/preview.c coders/ps.c \ - coders/ps2.c coders/ps3.c coders/pwp.c coders/rgb.c \ - coders/rla.c coders/rle.c coders/sct.c coders/sfw.c \ - coders/sgi.c coders/stegano.c coders/sun.c coders/svg.c \ - coders/tga.c coders/ept.c coders/tiff.c coders/tile.c \ - coders/tim.c coders/topol.c coders/ttf.c coders/txt.c \ - coders/uil.c coders/url.c coders/uyvy.c coders/vicar.c \ - coders/vid.c coders/viff.c coders/wbmp.c coders/webp.c \ - coders/wmf.c coders/wpg.c coders/x.c coders/xwd.c coders/xbm.c \ - coders/xc.c coders/xcf.c coders/xpm.c coders/yuv.c \ - filters/analyze.c -@HasX11_TRUE@am__objects_4 = magick/libGraphicsMagick_la-animate.lo \ + coders/fits.c coders/fpx.c coders/clipboard.c coders/emf.c \ + coders/gif.c coders/gradient.c coders/gray.c coders/heif.c \ + coders/histogram.c coders/hrz.c coders/html.c coders/icon.c \ + coders/identity.c coders/info.c coders/jbig.c coders/jp2.c \ + coders/jnx.c coders/jpeg.c coders/jxl.c coders/label.c \ + coders/locale.c coders/logo.c coders/mac.c coders/map.c \ + coders/mat.c coders/matte.c coders/meta.c coders/miff.c \ + coders/mono.c coders/mpc.c coders/mpeg.c coders/mpr.c \ + coders/msl.c coders/mtv.c coders/mvg.c coders/null.c \ + coders/otb.c coders/palm.c coders/pcd.c coders/pcl.c \ + coders/pcx.c coders/pdb.c coders/pdf.c coders/pict.c \ + coders/pix.c coders/plasma.c coders/png.c coders/pnm.c \ + coders/preview.c coders/ps.c coders/ps2.c coders/ps3.c \ + coders/pwp.c coders/rgb.c coders/rla.c coders/rle.c \ + coders/sct.c coders/sfw.c coders/sgi.c coders/stegano.c \ + coders/sun.c coders/svg.c coders/tga.c coders/ept.c \ + coders/tiff.c coders/tile.c coders/tim.c coders/topol.c \ + coders/ttf.c coders/txt.c coders/uil.c coders/url.c \ + coders/uyvy.c coders/vicar.c coders/vid.c coders/viff.c \ + coders/wbmp.c coders/webp.c coders/wmf.c coders/wpg.c \ + coders/x.c coders/xwd.c coders/xbm.c coders/xc.c coders/xcf.c \ + coders/xpm.c coders/yuv.c filters/analyze.c +@HasX11_TRUE@am__objects_1 = magick/libGraphicsMagick_la-animate.lo \ @HasX11_TRUE@ magick/libGraphicsMagick_la-display.lo \ @HasX11_TRUE@ magick/libGraphicsMagick_la-PreRvIcccm.lo \ @HasX11_TRUE@ magick/libGraphicsMagick_la-widget.lo \ @HasX11_TRUE@ magick/libGraphicsMagick_la-xwindow.lo -am__objects_5 = magick/libGraphicsMagick_la-analyze.lo \ +am__objects_2 = magick/libGraphicsMagick_la-analyze.lo \ magick/libGraphicsMagick_la-annotate.lo \ magick/libGraphicsMagick_la-attribute.lo \ magick/libGraphicsMagick_la-average.lo \ @@ -1323,45 +1317,41 @@ magick/libGraphicsMagick_la-type.lo \ magick/libGraphicsMagick_la-unix_port.lo \ magick/libGraphicsMagick_la-utility.lo \ - magick/libGraphicsMagick_la-version.lo $(am__objects_4) -@CYGWIN_BUILD_TRUE@@WIN32_NATIVE_BUILD_FALSE@am__objects_6 = magick/libGraphicsMagick_la-nt_feature.lo -@WIN32_NATIVE_BUILD_TRUE@am__objects_6 = magick/libGraphicsMagick_la-nt_base.lo \ + magick/libGraphicsMagick_la-version.lo $(am__objects_1) +@CYGWIN_BUILD_TRUE@@WIN32_NATIVE_BUILD_FALSE@am__objects_3 = magick/libGraphicsMagick_la-nt_feature.lo +@WIN32_NATIVE_BUILD_TRUE@am__objects_3 = magick/libGraphicsMagick_la-nt_base.lo \ @WIN32_NATIVE_BUILD_TRUE@ magick/libGraphicsMagick_la-nt_feature.lo -@ENABLE_BROKEN_CODERS_TRUE@am__objects_7 = coders/magick_libGraphicsMagick_la-psd.lo -@HasDPS_TRUE@am__objects_8 = \ +@ENABLE_BROKEN_CODERS_TRUE@am__objects_4 = coders/magick_libGraphicsMagick_la-psd.lo +@HasDPS_TRUE@am__objects_5 = \ @HasDPS_TRUE@ coders/magick_libGraphicsMagick_la-dps.lo -am__objects_9 = magick/libGraphicsMagick_la-acppfile.lo -@HasFPX_TRUE@am__objects_10 = \ -@HasFPX_TRUE@ coders/magick_libGraphicsMagick_la-fpx.lo \ -@HasFPX_TRUE@ $(am__objects_9) -@HasWINGDI32_TRUE@am__objects_11 = coders/magick_libGraphicsMagick_la-clipboard.lo \ +@HasFPX_TRUE@am__objects_6 = \ +@HasFPX_TRUE@ coders/magick_libGraphicsMagick_la-fpx.lo +@HasWINGDI32_TRUE@am__objects_7 = coders/magick_libGraphicsMagick_la-clipboard.lo \ @HasWINGDI32_TRUE@ coders/magick_libGraphicsMagick_la-emf.lo -@HasHEIF_TRUE@am__objects_12 = \ -@HasHEIF_TRUE@ coders/magick_libGraphicsMagick_la-heif.lo \ -@HasHEIF_TRUE@ $(am__objects_9) -@HasJBIG_TRUE@am__objects_13 = \ +@HasHEIF_TRUE@am__objects_8 = \ +@HasHEIF_TRUE@ coders/magick_libGraphicsMagick_la-heif.lo +@HasJBIG_TRUE@am__objects_9 = \ @HasJBIG_TRUE@ coders/magick_libGraphicsMagick_la-jbig.lo -@HasJP2_TRUE@am__objects_14 = \ +@HasJP2_TRUE@am__objects_10 = \ @HasJP2_TRUE@ coders/magick_libGraphicsMagick_la-jp2.lo -@HasJPEG_TRUE@am__objects_15 = \ +@HasJPEG_TRUE@am__objects_11 = \ @HasJPEG_TRUE@ coders/magick_libGraphicsMagick_la-jnx.lo \ @HasJPEG_TRUE@ coders/magick_libGraphicsMagick_la-jpeg.lo -@HasJXL_TRUE@am__objects_16 = \ -@HasJXL_TRUE@ coders/magick_libGraphicsMagick_la-jxl.lo \ -@HasJXL_TRUE@ $(am__objects_9) -@HasPNG_TRUE@am__objects_17 = \ +@HasJXL_TRUE@am__objects_12 = \ +@HasJXL_TRUE@ coders/magick_libGraphicsMagick_la-jxl.lo +@HasPNG_TRUE@am__objects_13 = \ @HasPNG_TRUE@ coders/magick_libGraphicsMagick_la-png.lo -@HasTIFF_TRUE@am__objects_18 = \ +@HasTIFF_TRUE@am__objects_14 = \ @HasTIFF_TRUE@ coders/magick_libGraphicsMagick_la-ept.lo \ @HasTIFF_TRUE@ coders/magick_libGraphicsMagick_la-tiff.lo -@HasWEBP_TRUE@am__objects_19 = \ +@HasWEBP_TRUE@am__objects_15 = \ @HasWEBP_TRUE@ coders/magick_libGraphicsMagick_la-webp.lo -@HasX11_TRUE@am__objects_20 = coders/magick_libGraphicsMagick_la-x.lo \ +@HasX11_TRUE@am__objects_16 = coders/magick_libGraphicsMagick_la-x.lo \ @HasX11_TRUE@ coders/magick_libGraphicsMagick_la-xwd.lo -am__objects_21 = coders/magick_libGraphicsMagick_la-art.lo \ +am__objects_17 = coders/magick_libGraphicsMagick_la-art.lo \ coders/magick_libGraphicsMagick_la-avs.lo \ coders/magick_libGraphicsMagick_la-bmp.lo \ - coders/magick_libGraphicsMagick_la-braille.lo $(am__objects_7) \ + coders/magick_libGraphicsMagick_la-braille.lo $(am__objects_4) \ coders/magick_libGraphicsMagick_la-cals.lo \ coders/magick_libGraphicsMagick_la-caption.lo \ coders/magick_libGraphicsMagick_la-cineon.lo \ @@ -1369,20 +1359,20 @@ coders/magick_libGraphicsMagick_la-cut.lo \ coders/magick_libGraphicsMagick_la-dcm.lo \ coders/magick_libGraphicsMagick_la-dcraw.lo \ - coders/magick_libGraphicsMagick_la-dib.lo $(am__objects_8) \ + coders/magick_libGraphicsMagick_la-dib.lo $(am__objects_5) \ coders/magick_libGraphicsMagick_la-dpx.lo \ coders/magick_libGraphicsMagick_la-fax.lo \ - coders/magick_libGraphicsMagick_la-fits.lo $(am__objects_10) \ - $(am__objects_11) coders/magick_libGraphicsMagick_la-gif.lo \ + coders/magick_libGraphicsMagick_la-fits.lo $(am__objects_6) \ + $(am__objects_7) coders/magick_libGraphicsMagick_la-gif.lo \ coders/magick_libGraphicsMagick_la-gradient.lo \ - coders/magick_libGraphicsMagick_la-gray.lo $(am__objects_12) \ + coders/magick_libGraphicsMagick_la-gray.lo $(am__objects_8) \ coders/magick_libGraphicsMagick_la-histogram.lo \ coders/magick_libGraphicsMagick_la-hrz.lo \ coders/magick_libGraphicsMagick_la-html.lo \ coders/magick_libGraphicsMagick_la-icon.lo \ coders/magick_libGraphicsMagick_la-identity.lo \ - coders/magick_libGraphicsMagick_la-info.lo $(am__objects_13) \ - $(am__objects_14) $(am__objects_15) $(am__objects_16) \ + coders/magick_libGraphicsMagick_la-info.lo $(am__objects_9) \ + $(am__objects_10) $(am__objects_11) $(am__objects_12) \ coders/magick_libGraphicsMagick_la-label.lo \ coders/magick_libGraphicsMagick_la-locale.lo \ coders/magick_libGraphicsMagick_la-logo.lo \ @@ -1409,7 +1399,7 @@ coders/magick_libGraphicsMagick_la-pdf.lo \ coders/magick_libGraphicsMagick_la-pict.lo \ coders/magick_libGraphicsMagick_la-pix.lo \ - coders/magick_libGraphicsMagick_la-plasma.lo $(am__objects_17) \ + coders/magick_libGraphicsMagick_la-plasma.lo $(am__objects_13) \ coders/magick_libGraphicsMagick_la-pnm.lo \ coders/magick_libGraphicsMagick_la-preview.lo \ coders/magick_libGraphicsMagick_la-ps.lo \ @@ -1425,7 +1415,7 @@ coders/magick_libGraphicsMagick_la-stegano.lo \ coders/magick_libGraphicsMagick_la-sun.lo \ coders/magick_libGraphicsMagick_la-svg.lo \ - coders/magick_libGraphicsMagick_la-tga.lo $(am__objects_18) \ + coders/magick_libGraphicsMagick_la-tga.lo $(am__objects_14) \ coders/magick_libGraphicsMagick_la-tile.lo \ coders/magick_libGraphicsMagick_la-tim.lo \ coders/magick_libGraphicsMagick_la-topol.lo \ @@ -1437,33 +1427,33 @@ coders/magick_libGraphicsMagick_la-vicar.lo \ coders/magick_libGraphicsMagick_la-vid.lo \ coders/magick_libGraphicsMagick_la-viff.lo \ - coders/magick_libGraphicsMagick_la-wbmp.lo $(am__objects_19) \ + coders/magick_libGraphicsMagick_la-wbmp.lo $(am__objects_15) \ coders/magick_libGraphicsMagick_la-wmf.lo \ - coders/magick_libGraphicsMagick_la-wpg.lo $(am__objects_20) \ + coders/magick_libGraphicsMagick_la-wpg.lo $(am__objects_16) \ coders/magick_libGraphicsMagick_la-xbm.lo \ coders/magick_libGraphicsMagick_la-xc.lo \ coders/magick_libGraphicsMagick_la-xcf.lo \ coders/magick_libGraphicsMagick_la-xpm.lo \ coders/magick_libGraphicsMagick_la-yuv.lo -am__objects_22 = filters/magick_libGraphicsMagick_la-analyze.lo +am__objects_18 = filters/magick_libGraphicsMagick_la-analyze.lo @WITH_MODULES_FALSE@am_magick_libGraphicsMagick_la_OBJECTS = \ -@WITH_MODULES_FALSE@ $(am__objects_5) $(am__objects_6) \ -@WITH_MODULES_FALSE@ $(am__objects_21) $(am__objects_22) +@WITH_MODULES_FALSE@ $(am__objects_2) $(am__objects_3) \ +@WITH_MODULES_FALSE@ $(am__objects_17) $(am__objects_18) @WITH_MODULES_TRUE@am_magick_libGraphicsMagick_la_OBJECTS = \ -@WITH_MODULES_TRUE@ $(am__objects_5) $(am__objects_6) +@WITH_MODULES_TRUE@ $(am__objects_2) $(am__objects_3) magick_libGraphicsMagick_la_OBJECTS = \ $(am_magick_libGraphicsMagick_la_OBJECTS) -magick_libGraphicsMagick_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ - $(AM_CXXFLAGS) $(CXXFLAGS) \ - $(magick_libGraphicsMagick_la_LDFLAGS) $(LDFLAGS) -o $@ +magick_libGraphicsMagick_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(magick_libGraphicsMagick_la_LDFLAGS) \ + $(LDFLAGS) -o $@ wand_libGraphicsMagickWand_la_DEPENDENCIES = $(LIBMAGICK) \ $(am__DEPENDENCIES_1) -am__objects_23 = wand/libGraphicsMagickWand_la-drawing_wand.lo \ +am__objects_19 = wand/libGraphicsMagickWand_la-drawing_wand.lo \ wand/libGraphicsMagickWand_la-magick_compat.lo \ wand/libGraphicsMagickWand_la-magick_wand.lo \ wand/libGraphicsMagickWand_la-pixel_wand.lo -am_wand_libGraphicsMagickWand_la_OBJECTS = $(am__objects_23) +am_wand_libGraphicsMagickWand_la_OBJECTS = $(am__objects_19) wand_libGraphicsMagickWand_la_OBJECTS = \ $(am_wand_libGraphicsMagickWand_la_OBJECTS) wand_libGraphicsMagickWand_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -1581,13 +1571,12 @@ am_tests_rwfile_OBJECTS = tests/rwfile-rwfile.$(OBJEXT) tests_rwfile_OBJECTS = $(am_tests_rwfile_OBJECTS) tests_rwfile_DEPENDENCIES = $(LIBMAGICK) -am__objects_24 = magick/acppfile.$(OBJEXT) -am_utilities_gm_OBJECTS = utilities/gm.$(OBJEXT) $(am__objects_24) +am_utilities_gm_OBJECTS = utilities/gm.$(OBJEXT) utilities_gm_OBJECTS = $(am_utilities_gm_OBJECTS) utilities_gm_DEPENDENCIES = $(LIBMAGICK) -utilities_gm_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(utilities_gm_LDFLAGS) $(LDFLAGS) -o $@ +utilities_gm_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(utilities_gm_LDFLAGS) $(LDFLAGS) -o $@ am_wand_drawtest_OBJECTS = wand/wand_drawtest-drawtest.$(OBJEXT) wand_drawtest_OBJECTS = $(am_wand_drawtest_OBJECTS) wand_drawtest_DEPENDENCIES = $(LIBWAND) @@ -1857,12 +1846,7 @@ coders/$(DEPDIR)/yuv_la-yuv.Plo \ filters/$(DEPDIR)/analyze_la-analyze.Plo \ filters/$(DEPDIR)/magick_libGraphicsMagick_la-analyze.Plo \ - magick/$(DEPDIR)/acppfile.Po \ - magick/$(DEPDIR)/coders_fpx_la-acppfile.Plo \ - magick/$(DEPDIR)/coders_heif_la-acppfile.Plo \ - magick/$(DEPDIR)/coders_jxl_la-acppfile.Plo \ magick/$(DEPDIR)/libGraphicsMagick_la-PreRvIcccm.Plo \ - magick/$(DEPDIR)/libGraphicsMagick_la-acppfile.Plo \ magick/$(DEPDIR)/libGraphicsMagick_la-analyze.Plo \ magick/$(DEPDIR)/libGraphicsMagick_la-animate.Plo \ magick/$(DEPDIR)/libGraphicsMagick_la-annotate.Plo \ @@ -2190,9 +2174,6 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -CSCOPE = cscope AM_RECURSIVE_TARGETS = cscope check recheck am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ @@ -2448,6 +2429,8 @@ CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -2472,6 +2455,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEC_PREFIX_DIR = @EXEC_PREFIX_DIR@ EXEEXT = @EXEEXT@ EditorDelegate = @EditorDelegate@ @@ -2790,20 +2774,6 @@ MODULECOMMONFLAGS = -no-undefined -export-symbols-regex ".*" -shared -module -avoid-version MODULECOMMONCPPFLAGS = $(AM_CPPFLAGS) -# A dummy C++ file to force libtool linkage with the C++ compiler via simple inclusion. -# FIXME: Need condition code to handle the cases where: -# C++ is not needed at all (don't include acppfile.cpp in compile at all) -# C++ is needed and a static build (acppfile.cpp added to libGraphicsMagick.a and utilities/gm) -# C++ is needed but a shared (non-module) build (acppfile.cpp added to only libGraphicsMagick.so) -# C++ is needed, but a shared modules build (acppfile.cpp added to only to C++-dependent modules) -ACPPFILE = magick/acppfile.cpp - -# if WITH_MODULES # Building modules -# if WITH_SHARED_LIBS # Building shared libraries -# if HasFPX -# if HasHEIF -# if HasJXL - # Coverity parameters # FIXME: Could use info from /etc/os-release, or output from # lsb_release. @@ -2957,11 +2927,11 @@ @HasDPS_TRUE@MAGICK_DPS_MODULES = coders/dps.la @HasDPS_TRUE@MAGICK_DPS_SRCS = coders/dps.c @HasFPX_TRUE@MAGICK_FPX_MODULES = coders/fpx.la -@HasFPX_TRUE@MAGICK_FPX_SRCS = coders/fpx.c $(ACPPFILE) +@HasFPX_TRUE@MAGICK_FPX_SRCS = coders/fpx.c @HasWINGDI32_TRUE@MAGICK_GDI32_MODULES = coders/clipboard.la coders/emf.la @HasWINGDI32_TRUE@MAGICK_GDI32_SRCS = coders/clipboard.c coders/emf.c @HasHEIF_TRUE@MAGICK_HEIF_MODULES = coders/heif.la -@HasHEIF_TRUE@MAGICK_HEIF_SRCS = coders/heif.c $(ACPPFILE) +@HasHEIF_TRUE@MAGICK_HEIF_SRCS = coders/heif.c @HasJBIG_TRUE@MAGICK_JBIG_MODULES = coders/jbig.la @HasJBIG_TRUE@MAGICK_JBIG_SRCS = coders/jbig.c @HasJPEG_TRUE@MAGICK_JPEG_MODULES = coders/jnx.la coders/jpeg.la @@ -2969,7 +2939,7 @@ @HasJP2_TRUE@MAGICK_JP2_MODULES = coders/jp2.la @HasJP2_TRUE@MAGICK_JP2_SRCS = coders/jp2.c @HasJXL_TRUE@MAGICK_JXL_MODULES = coders/jxl.la -@HasJXL_TRUE@MAGICK_JXL_SRCS = coders/jxl.c $(ACPPFILE) +@HasJXL_TRUE@MAGICK_JXL_SRCS = coders/jxl.c @HasPNG_TRUE@MAGICK_PNG_MODULES = coders/png.la @HasPNG_TRUE@MAGICK_PNG_SRCS = coders/png.c @HasTIFF_TRUE@MAGICK_TIFF_MODULES = coders/ept.la coders/tiff.la @@ -3303,7 +3273,7 @@ coders_fits_la_LIBADD = $(LIBMAGICK) $(LIB_MATH) # FPX coder module -coders_fpx_la_SOURCES = coders/fpx.c $(ACPPFILE) +coders_fpx_la_SOURCES = coders/fpx.c coders_fpx_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) coders_fpx_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_fpx_la_LIBADD = $(LIBMAGICK) $(LIB_FPX) @@ -3327,7 +3297,7 @@ coders_gradient_la_LIBADD = $(LIBMAGICK) # HEIF coder module -coders_heif_la_SOURCES = coders/heif.c $(ACPPFILE) +coders_heif_la_SOURCES = coders/heif.c coders_heif_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) coders_heif_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_heif_la_LIBADD = $(LIBMAGICK) $(LIB_HEIF) @@ -3393,7 +3363,7 @@ coders_jp2_la_LIBADD = $(LIBMAGICK) $(LIB_JP2) $(LIB_HEIF) $(LIB_JPEG) $(LIB_MATH) # JXL coder module -coders_jxl_la_SOURCES = coders/jxl.c $(ACPPFILE) +coders_jxl_la_SOURCES = coders/jxl.c coders_jxl_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) coders_jxl_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_jxl_la_LIBADD = $(LIBMAGICK) $(LIB_JXL) @@ -4854,7 +4824,7 @@ utilities_gm_LDADD = $(LIBMAGICK) utilities_gm_LDFLAGS = $(LDFLAGS) -utilities_gm_SOURCES = utilities/gm.c $(ACPPFILE) +utilities_gm_SOURCES = utilities/gm.c UTILITIES_XFAIL_TESTS = # Tests to run @@ -4893,6 +4863,7 @@ utilities/tests/*_out.miff \ utilities/tests/*_out.pnm \ utilities/tests/*_out.txt \ + utilities/tests/composite_tmp.msl \ utilities/tests/demo*.miff \ utilities/tests/gm.core \ utilities/tests/core @@ -5461,17 +5432,9 @@ $(AM_V_CCLD)$(coders_fits_la_LINK) $(am_coders_fits_la_rpath) $(coders_fits_la_OBJECTS) $(coders_fits_la_LIBADD) $(LIBS) coders/fpx_la-fpx.lo: coders/$(am__dirstamp) \ coders/$(DEPDIR)/$(am__dirstamp) -magick/$(am__dirstamp): - @$(MKDIR_P) magick - @: > magick/$(am__dirstamp) -magick/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) magick/$(DEPDIR) - @: > magick/$(DEPDIR)/$(am__dirstamp) -magick/coders_fpx_la-acppfile.lo: magick/$(am__dirstamp) \ - magick/$(DEPDIR)/$(am__dirstamp) coders/fpx.la: $(coders_fpx_la_OBJECTS) $(coders_fpx_la_DEPENDENCIES) $(EXTRA_coders_fpx_la_DEPENDENCIES) coders/$(am__dirstamp) - $(AM_V_CXXLD)$(coders_fpx_la_LINK) $(am_coders_fpx_la_rpath) $(coders_fpx_la_OBJECTS) $(coders_fpx_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(coders_fpx_la_LINK) $(am_coders_fpx_la_rpath) $(coders_fpx_la_OBJECTS) $(coders_fpx_la_LIBADD) $(LIBS) coders/gif_la-gif.lo: coders/$(am__dirstamp) \ coders/$(DEPDIR)/$(am__dirstamp) @@ -5489,11 +5452,9 @@ $(AM_V_CCLD)$(coders_gray_la_LINK) $(am_coders_gray_la_rpath) $(coders_gray_la_OBJECTS) $(coders_gray_la_LIBADD) $(LIBS) coders/heif_la-heif.lo: coders/$(am__dirstamp) \ coders/$(DEPDIR)/$(am__dirstamp) -magick/coders_heif_la-acppfile.lo: magick/$(am__dirstamp) \ - magick/$(DEPDIR)/$(am__dirstamp) coders/heif.la: $(coders_heif_la_OBJECTS) $(coders_heif_la_DEPENDENCIES) $(EXTRA_coders_heif_la_DEPENDENCIES) coders/$(am__dirstamp) - $(AM_V_CXXLD)$(coders_heif_la_LINK) $(am_coders_heif_la_rpath) $(coders_heif_la_OBJECTS) $(coders_heif_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(coders_heif_la_LINK) $(am_coders_heif_la_rpath) $(coders_heif_la_OBJECTS) $(coders_heif_la_LIBADD) $(LIBS)