Control: tag -1 patch Here's a documented patch that should fix the FTBFS issues after running autoreconf.
Cheers, -Hilko
>From 4b8b832d2f2d3b32f52d5accbfa0a6c77e1a37d2 Mon Sep 17 00:00:00 2001 From: Hilko Bengen <ben...@debian.org> Subject: [PATCH] Add proper LDADD statements for executables that could no longer be built after autoreconf. - tests_validate needs to be linked with libm - Programs that are linked against libmagickwand also requires libMagicKcore (see output of `pkg-config --libs MagickWand') - Programs that are linked against libMagick++ also require libMagickCore (see output of `pkg-config --libs Magick++') --- Magick++/Makefile.am | 42 +++++++++++++++++++++--------------------- tests/Makefile.am | 2 +- wand/Makefile.am | 4 ++-- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Magick++/Makefile.am b/Magick++/Makefile.am index 2188f26..a58ba6d 100644 --- a/Magick++/Makefile.am +++ b/Magick++/Makefile.am @@ -188,67 +188,67 @@ MAGICKPP_CHECK_PGRMS_OPT = \ Magick++/tests/readWriteImages Magick___demo_analyze_SOURCES = Magick++/demo/analyze.cpp -Magick___demo_analyze_LDADD = $(MAGICKPP_LIBS) +Magick___demo_analyze_LDADD = $(MAGICKPP_LIBS) $(MAGICKCORE_LIBS) Magick___demo_button_SOURCES = Magick++/demo/button.cpp -Magick___demo_button_LDADD = $(MAGICKPP_LIBS) +Magick___demo_button_LDADD = $(MAGICKPP_LIBS) $(MAGICKCORE_LIBS) Magick___demo_demo_SOURCES = Magick++/demo/demo.cpp -Magick___demo_demo_LDADD = $(MAGICKPP_LIBS) +Magick___demo_demo_LDADD = $(MAGICKPP_LIBS) $(MAGICKCORE_LIBS) Magick___demo_detrans_SOURCES = Magick++/demo/detrans.cpp -Magick___demo_detrans_LDADD = $(MAGICKPP_LIBS) +Magick___demo_detrans_LDADD = $(MAGICKPP_LIBS) $(MAGICKCORE_LIBS) Magick___demo_flip_SOURCES = Magick++/demo/flip.cpp -Magick___demo_flip_LDADD = $(MAGICKPP_LIBS) +Magick___demo_flip_LDADD = $(MAGICKPP_LIBS) $(MAGICKCORE_LIBS) Magick___demo_gravity_SOURCES = Magick++/demo/gravity.cpp -Magick___demo_gravity_LDADD = $(MAGICKPP_LIBS) +Magick___demo_gravity_LDADD = $(MAGICKPP_LIBS) $(MAGICKCORE_LIBS) Magick___demo_piddle_SOURCES = Magick++/demo/piddle.cpp -Magick___demo_piddle_LDADD = $(MAGICKPP_LIBS) +Magick___demo_piddle_LDADD = $(MAGICKPP_LIBS) $(MAGICKCORE_LIBS) Magick___demo_shapes_SOURCES = Magick++/demo/shapes.cpp -Magick___demo_shapes_LDADD = $(MAGICKPP_LIBS) +Magick___demo_shapes_LDADD = $(MAGICKPP_LIBS) $(MAGICKCORE_LIBS) Magick___demo_zoom_SOURCES = Magick++/demo/zoom.cpp -Magick___demo_zoom_LDADD = $(MAGICKPP_LIBS) +Magick___demo_zoom_LDADD = $(MAGICKPP_LIBS) $(MAGICKCORE_LIBS) Magick___tests_appendImages_SOURCES = Magick++/tests/appendImages.cpp -Magick___tests_appendImages_LDADD = $(MAGICKPP_LIBS) +Magick___tests_appendImages_LDADD = $(MAGICKPP_LIBS) $(MAGICKCORE_LIBS) Magick___tests_attributes_SOURCES = Magick++/tests/attributes.cpp -Magick___tests_attributes_LDADD = $(MAGICKPP_LIBS) +Magick___tests_attributes_LDADD = $(MAGICKPP_LIBS) $(MAGICKCORE_LIBS) Magick___tests_averageImages_SOURCES = Magick++/tests/averageImages.cpp -Magick___tests_averageImages_LDADD = $(MAGICKPP_LIBS) +Magick___tests_averageImages_LDADD = $(MAGICKPP_LIBS) $(MAGICKCORE_LIBS) Magick___tests_coalesceImages_SOURCES = Magick++/tests/coalesceImages.cpp -Magick___tests_coalesceImages_LDADD = $(MAGICKPP_LIBS) +Magick___tests_coalesceImages_LDADD = $(MAGICKPP_LIBS) $(MAGICKCORE_LIBS) Magick___tests_coderInfo_SOURCES = Magick++/tests/coderInfo.cpp -Magick___tests_coderInfo_LDADD = $(MAGICKPP_LIBS) +Magick___tests_coderInfo_LDADD = $(MAGICKPP_LIBS) $(MAGICKCORE_LIBS) Magick___tests_color_SOURCES = Magick++/tests/color.cpp -Magick___tests_color_LDADD = $(MAGICKPP_LIBS) +Magick___tests_color_LDADD = $(MAGICKPP_LIBS) $(MAGICKCORE_LIBS) Magick___tests_colorHistogram_SOURCES = Magick++/tests/colorHistogram.cpp -Magick___tests_colorHistogram_LDADD = $(MAGICKPP_LIBS) +Magick___tests_colorHistogram_LDADD = $(MAGICKPP_LIBS) $(MAGICKCORE_LIBS) Magick___tests_exceptions_SOURCES = Magick++/tests/exceptions.cpp -Magick___tests_exceptions_LDADD = $(MAGICKPP_LIBS) +Magick___tests_exceptions_LDADD = $(MAGICKPP_LIBS) $(MAGICKCORE_LIBS) Magick___tests_montageImages_SOURCES = Magick++/tests/montageImages.cpp -Magick___tests_montageImages_LDADD = $(MAGICKPP_LIBS) +Magick___tests_montageImages_LDADD = $(MAGICKPP_LIBS) $(MAGICKCORE_LIBS) Magick___tests_morphImages_SOURCES = Magick++/tests/morphImages.cpp -Magick___tests_morphImages_LDADD = $(MAGICKPP_LIBS) +Magick___tests_morphImages_LDADD = $(MAGICKPP_LIBS) $(MAGICKCORE_LIBS) Magick___tests_readWriteBlob_SOURCES = Magick++/tests/readWriteBlob.cpp -Magick___tests_readWriteBlob_LDADD = $(MAGICKPP_LIBS) +Magick___tests_readWriteBlob_LDADD = $(MAGICKPP_LIBS) $(MAGICKCORE_LIBS) Magick___tests_readWriteImages_SOURCES = Magick++/tests/readWriteImages.cpp -Magick___tests_readWriteImages_LDADD = $(MAGICKPP_LIBS) +Magick___tests_readWriteImages_LDADD = $(MAGICKPP_LIBS) $(MAGICKCORE_LIBS) MAGICKPP_LOCAL_TARGETS = www/Magick++/NEWS.html www/Magick++/ChangeLog.html diff --git a/tests/Makefile.am b/tests/Makefile.am index 6dfd7e9..b72bcb2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -19,7 +19,7 @@ TESTS_CHECK_PGRMS = \ tests_validate_SOURCES = tests/validate.c tests/validate.h tests_validate_CPPFLAGS = $(AM_CPPFLAGS) -tests_validate_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) +tests_validate_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(MATH_LIBS) TESTS_XFAIL_TESTS = diff --git a/wand/Makefile.am b/wand/Makefile.am index 28f656e..29aa87d 100644 --- a/wand/Makefile.am +++ b/wand/Makefile.am @@ -139,11 +139,11 @@ WAND_EXTRA_DIST = \ wand_drawtest_SOURCES = wand/drawtest.c wand_drawtest_LDFLAGS = $(LDFLAGS) -wand_drawtest_LDADD = $(MAGICKWAND_LIBS) +wand_drawtest_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) wand_wandtest_SOURCES = wand/wandtest.c wand_wandtest_LDFLAGS = $(LDFLAGS) -wand_wandtest_LDADD = $(MAGICKWAND_LIBS) +wand_wandtest_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) WAND_CHECK_PGRMS = \ wand/drawtest \ -- 2.1.0
