...

[imagemagick] / utilities / Makefile.am

diff --git a/utilities/Makefile.am b/utilities/Makefile.am
index 3bd7ba988575cf38d37c84dfdfbfcdeb6f03598a..437370e99fc25069b490386e09d714125f97d8a8 100644 (file)
--- a/utilities/Makefile.am
+++ b/utilities/Makefile.am
@@ -1,10 +1,10 @@
-#  Copyright 1999-2016 ImageMagick Studio LLC, a non-profit organization
+#  Copyright 1999-2018 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
 #  obtain a copy of the License at
 #
-#    http://www.imagemagick.org/script/license.php
+#    http://imagemagick.org/script/license.php
 #
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,67 +14,18 @@
 #
 #  Makefile for building ImageMagick utilities.
 
+if WITH_UTILITIES
 UTILITIES_PGMS = \
-       utilities/animate \
-       utilities/compare \
-       utilities/composite \
-       utilities/conjure \
-       utilities/display \
-       utilities/identify \
-       utilities/import \
-       utilities/magick \
-       utilities/mogrify \
-       utilities/montage \
-       utilities/stream
+       utilities/magick
 
 UTILITIES_XFAIL_TESTS = \
   $(UTILITIES_TTF_XFAIL_TESTS) \
   $(UTILITIES_XML_XFAIL_TESTS)
 
-utilities_animate_LDADD        = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
-utilities_animate_LDFLAGS      = $(LDFLAGS)
-utilities_animate_SOURCES      = utilities/animate.c
-
-utilities_compare_LDADD        = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
-utilities_compare_LDFLAGS      = $(LDFLAGS)
-utilities_compare_SOURCES      = utilities/compare.c
-
-utilities_composite_LDADD      = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
-utilities_composite_LDFLAGS    = $(LDFLAGS)
-utilities_composite_SOURCES    = utilities/composite.c
-
-utilities_conjure_LDADD        = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
-utilities_conjure_LDFLAGS      = $(LDFLAGS)
-utilities_conjure_SOURCES      = utilities/conjure.c
-
-utilities_display_LDADD        = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
-utilities_display_LDFLAGS      = $(LDFLAGS)
-utilities_display_SOURCES      = utilities/display.c
-
-utilities_identify_LDADD       = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
-utilities_identify_LDFLAGS     = $(LDFLAGS)
-utilities_identify_SOURCES     = utilities/identify.c
-
-utilities_import_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
-utilities_import_LDFLAGS       = $(LDFLAGS)
-utilities_import_SOURCES       = utilities/import.c
-
 utilities_magick_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 utilities_magick_LDFLAGS       = $(LDFLAGS)
 utilities_magick_SOURCES       = utilities/magick.c
 
-utilities_mogrify_LDADD        = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
-utilities_mogrify_LDFLAGS      = $(LDFLAGS)
-utilities_mogrify_SOURCES      = utilities/mogrify.c
-
-utilities_montage_LDADD        = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
-utilities_montage_LDFLAGS      = $(LDFLAGS)
-utilities_montage_SOURCES      = utilities/montage.c
-
-utilities_stream_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
-utilities_stream_LDFLAGS       = $(LDFLAGS)
-utilities_stream_SOURCES       = utilities/stream.c
-
 UTILITIES_MANS = \
        utilities/ImageMagick.1 \
        utilities/animate.1 \
@@ -86,6 +37,7 @@ UTILITIES_MANS = \
        utilities/identify.1 \
        utilities/import.1 \
        utilities/magick.1 \
+       utilities/magick-script.1 \
        utilities/mogrify.1 \
        utilities/montage.1 \
        utilities/stream.1
@@ -101,18 +53,29 @@ UTILITIES_CONFIGURE = \
        utilities/identify.1.in \
        utilities/import.1.in \
        utilities/magick.1.in \
+       utilities/magick-script.1.in \
        utilities/mogrify.1.in \
        utilities/montage.1.in \
        utilities/stream.1.in
 
 UTILITIES_EXTRA_DIST = \
        $(UTILITIES_MANS) \
-       $(UTILITIES_TESTS) 
+       $(UTILITIES_TESTS)
 
-UTILITIES_CLEANFILES = 
+UTILITIES_CLEANFILES =
 
 # Link these utilities to 'magick'.
-MAGICK_UTILITIES=convert magick-script
+MAGICK_UTILITIES=animate compare composite conjure convert display identify import magick-script mogrify montage stream
+
+else
+UTILITIES_PGMS =
+UTILITIES_MANS =
+UTILITIES_CONFIGURE =
+UTILITIES_EXTRA_DIST =
+UTILITIES_CLEANFILES =
+MAGICK_UTILITIES=
+endif
+
 UTILITIES_INSTALL_EXEC_LOCAL_TARGETS=install-exec-local-utilities
 install-exec-local-utilities:
        $(mkdir_p) $(DESTDIR)$(bindir)