]> granicus.if.org Git - imagemagick/commitdiff
projects / imagemagick / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: aa839e3)
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Mon, 26 Mar 2012 12:55:00 +0000 (12:55 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Mon, 26 Mar 2012 12:55:00 +0000 (12:55 +0000)
Makefile.am patch | blob | history
Makefile.in patch | blob | history
utilities/Makefile.am patch | blob | history

diff --git a/Makefile.am b/Makefile.am
index 8b4b503eb785c8ac7a84f18d8651aabbc2caffbb..fd95d53f5e0da5cc001ea621d0fadb77a4709305 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -184,11 +184,17 @@ endif
 
 all-local: $(MAGICKPP_LOCAL_TARGETS) $(PERLMAGICK_ALL_LOCAL_TARGETS) $(MAINTAINER_TARGETS)
 
-install-exec-local: $(PERLMAGICK_INSTALL_EXEC_LOCAL_TARGETS)
+install-exec-local: $(PERLMAGICK_INSTALL_EXEC_LOCAL_TARGETS) \
+       $(UTILITIES_INSTALL_EXEC_LOCAL_TARGETS)
 
-install-data-local: $(MAGICK_INSTALL_DATA_LOCAL_TARGETS) $(PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS) $(HTML_INSTALL_DATA_TARGETS)
+install-data-local: $(MAGICK_INSTALL_DATA_LOCAL_TARGETS) \
+       $(PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS) \
+       $(HTML_INSTALL_DATA_TARGETS)
 
-uninstall-local: $(MAGICK_UNINSTALL_LOCAL_TARGETS) $(PERLMAGICK_UNINSTALL_LOCAL_TARGETS) $(HTML_UNINSTALL_DATA_TARGETS)
+uninstall-local: $(MAGICK_UNINSTALL_LOCAL_TARGETS) \
+       $(PERLMAGICK_UNINSTALL_LOCAL_TARGETS) \
+       $(HTML_UNINSTALL_DATA_TARGETS) \
+       $(UTILITIES_UNINSTALL_LOCAL_TARGETS)
 
 clean-local: $(PERLMAGICK_CLEAN_LOCAL_TARGETS)
 
diff --git a/Makefile.in b/Makefile.in
index fcd2560b0059060ca6aa377e627e2d4848956357..2a0f669c418ca06c77df7107e314715c6c722f45 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1772,10 +1772,10 @@ ltdl_shl_load_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        -o $@
 am__EXEEXT_1 = utilities/animate$(EXEEXT) utilities/compare$(EXEEXT) \
        utilities/composite$(EXEEXT) utilities/conjure$(EXEEXT) \
-       utilities/convert$(EXEEXT) utilities/display$(EXEEXT) \
-       utilities/identify$(EXEEXT) utilities/import$(EXEEXT) \
-       utilities/magick$(EXEEXT) utilities/mogrify$(EXEEXT) \
-       utilities/montage$(EXEEXT) utilities/stream$(EXEEXT)
+       utilities/display$(EXEEXT) utilities/identify$(EXEEXT) \
+       utilities/import$(EXEEXT) utilities/magick$(EXEEXT) \
+       utilities/mogrify$(EXEEXT) utilities/montage$(EXEEXT) \
+       utilities/stream$(EXEEXT)
 am__EXEEXT_2 = tests/validate$(EXEEXT)
 am__EXEEXT_3 = Magick++/demo/analyze$(EXEEXT) \
        Magick++/demo/button$(EXEEXT) Magick++/demo/demo$(EXEEXT) \
@@ -1931,13 +1931,6 @@ utilities_conjure_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(AM_CFLAGS) $(CFLAGS) $(utilities_conjure_LDFLAGS) $(LDFLAGS) \
        -o $@
-am_utilities_convert_OBJECTS = utilities/convert.$(OBJEXT)
-utilities_convert_OBJECTS = $(am_utilities_convert_OBJECTS)
-utilities_convert_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
-utilities_convert_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(AM_CFLAGS) $(CFLAGS) $(utilities_convert_LDFLAGS) $(LDFLAGS) \
-       -o $@
 am_utilities_display_OBJECTS = utilities/display.$(OBJEXT)
 utilities_display_OBJECTS = $(am_utilities_display_OBJECTS)
 utilities_display_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
@@ -2118,11 +2111,10 @@ SOURCES = $(Magick___lib_libMagick___la_SOURCES) \
        $(MagickWand_drawtest_SOURCES) $(MagickWand_wandtest_SOURCES) \
        $(tests_validate_SOURCES) $(utilities_animate_SOURCES) \
        $(utilities_compare_SOURCES) $(utilities_composite_SOURCES) \
-       $(utilities_conjure_SOURCES) $(utilities_convert_SOURCES) \
-       $(utilities_display_SOURCES) $(utilities_identify_SOURCES) \
-       $(utilities_import_SOURCES) $(utilities_magick_SOURCES) \
-       $(utilities_mogrify_SOURCES) $(utilities_montage_SOURCES) \
-       $(utilities_stream_SOURCES)
+       $(utilities_conjure_SOURCES) $(utilities_display_SOURCES) \
+       $(utilities_identify_SOURCES) $(utilities_import_SOURCES) \
+       $(utilities_magick_SOURCES) $(utilities_mogrify_SOURCES) \
+       $(utilities_montage_SOURCES) $(utilities_stream_SOURCES)
 DIST_SOURCES = $(Magick___lib_libMagick___la_SOURCES) \
        $(am__MagickCore_libMagickCore_la_SOURCES_DIST) \
        $(MagickWand_libMagickWand_la_SOURCES) \
@@ -2210,11 +2202,10 @@ DIST_SOURCES = $(Magick___lib_libMagick___la_SOURCES) \
        $(MagickWand_drawtest_SOURCES) $(MagickWand_wandtest_SOURCES) \
        $(tests_validate_SOURCES) $(utilities_animate_SOURCES) \
        $(utilities_compare_SOURCES) $(utilities_composite_SOURCES) \
-       $(utilities_conjure_SOURCES) $(utilities_convert_SOURCES) \
-       $(utilities_display_SOURCES) $(utilities_identify_SOURCES) \
-       $(utilities_import_SOURCES) $(utilities_magick_SOURCES) \
-       $(utilities_mogrify_SOURCES) $(utilities_montage_SOURCES) \
-       $(utilities_stream_SOURCES)
+       $(utilities_conjure_SOURCES) $(utilities_display_SOURCES) \
+       $(utilities_identify_SOURCES) $(utilities_import_SOURCES) \
+       $(utilities_magick_SOURCES) $(utilities_mogrify_SOURCES) \
+       $(utilities_montage_SOURCES) $(utilities_stream_SOURCES)
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(man_MANS)
@@ -4746,7 +4737,6 @@ UTILITIES_PGMS = \
        utilities/compare \
        utilities/composite \
        utilities/conjure \
-       utilities/convert \
        utilities/display \
        utilities/identify \
        utilities/import \
@@ -4771,9 +4761,6 @@ utilities_composite_SOURCES = utilities/composite.c
 utilities_conjure_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 utilities_conjure_LDFLAGS = $(LDFLAGS)
 utilities_conjure_SOURCES = utilities/conjure.c
-utilities_convert_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
-utilities_convert_LDFLAGS = $(LDFLAGS)
-utilities_convert_SOURCES = utilities/convert.c
 utilities_display_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 utilities_display_LDFLAGS = $(LDFLAGS)
 utilities_display_SOURCES = utilities/display.c
@@ -4832,7 +4819,7 @@ UTILITIES_EXTRA_DIST = \
 UTILITIES_CLEANFILES = 
 
 # Link these utilities to 'magick'.
-MAGICKPROGRAMS = convert magick-script
+MAGICK_UTILITIES = convert magick-script
 UTILITIES_INSTALL_EXEC_LOCAL_TARGETS = install-exec-local-utilities
 UTILITIES_UNINSTALL_LOCAL_TARGETS = uninstall-local-utilities
 TESTS_CHECK_PGRMS = \
@@ -6577,11 +6564,6 @@ utilities/conjure.$(OBJEXT): utilities/$(am__dirstamp) \
 utilities/conjure$(EXEEXT): $(utilities_conjure_OBJECTS) $(utilities_conjure_DEPENDENCIES) $(EXTRA_utilities_conjure_DEPENDENCIES) utilities/$(am__dirstamp)
        @rm -f utilities/conjure$(EXEEXT)
        $(AM_V_CCLD)$(utilities_conjure_LINK) $(utilities_conjure_OBJECTS) $(utilities_conjure_LDADD) $(LIBS)
-utilities/convert.$(OBJEXT): utilities/$(am__dirstamp) \
-       utilities/$(DEPDIR)/$(am__dirstamp)
-utilities/convert$(EXEEXT): $(utilities_convert_OBJECTS) $(utilities_convert_DEPENDENCIES) $(EXTRA_utilities_convert_DEPENDENCIES) utilities/$(am__dirstamp)
-       @rm -f utilities/convert$(EXEEXT)
-       $(AM_V_CCLD)$(utilities_convert_LINK) $(utilities_convert_OBJECTS) $(utilities_convert_LDADD) $(LIBS)
 utilities/display.$(OBJEXT): utilities/$(am__dirstamp) \
        utilities/$(DEPDIR)/$(am__dirstamp)
 utilities/display$(EXEEXT): $(utilities_display_OBJECTS) $(utilities_display_DEPENDENCIES) $(EXTRA_utilities_display_DEPENDENCIES) utilities/$(am__dirstamp)
@@ -7452,7 +7434,6 @@ mostlyclean-compile:
        -rm -f utilities/compare.$(OBJEXT)
        -rm -f utilities/composite.$(OBJEXT)
        -rm -f utilities/conjure.$(OBJEXT)
-       -rm -f utilities/convert.$(OBJEXT)
        -rm -f utilities/display.$(OBJEXT)
        -rm -f utilities/identify.$(OBJEXT)
        -rm -f utilities/import.$(OBJEXT)
@@ -7878,7 +7859,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/compare.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/composite.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/conjure.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/convert.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/display.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/identify.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/import.Po@am__quote@
@@ -11339,7 +11319,7 @@ install-exec-local-utilities:
        $(mkdir_p) $(DESTDIR)$(bindir)
        cd $(DESTDIR)$(bindir) ; \
        magick=`echo "magick" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-       for name in $(MAGICKPROGRAMS) ; \
+       for name in $(MAGICK_UTILITIES) ; \
        do \
          target=`echo "$$name" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
          rm -f $$target ; \
@@ -11347,7 +11327,7 @@ install-exec-local-utilities:
        done
 uninstall-local-utilities:
        cd $(DESTDIR)$(bindir) ; \
-       for name in $(MAGICKPROGRAMS) ; \
+       for name in $(MAGICK_UTILITIES) ; \
        do \
          target=`echo "$$name" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
          rm -f $$target ; \
@@ -11432,11 +11412,17 @@ perl-sources:
 
 all-local: $(MAGICKPP_LOCAL_TARGETS) $(PERLMAGICK_ALL_LOCAL_TARGETS) $(MAINTAINER_TARGETS)
 
-install-exec-local: $(PERLMAGICK_INSTALL_EXEC_LOCAL_TARGETS)
+install-exec-local: $(PERLMAGICK_INSTALL_EXEC_LOCAL_TARGETS) \
+       $(UTILITIES_INSTALL_EXEC_LOCAL_TARGETS)
 
-install-data-local: $(MAGICK_INSTALL_DATA_LOCAL_TARGETS) $(PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS) $(HTML_INSTALL_DATA_TARGETS)
+install-data-local: $(MAGICK_INSTALL_DATA_LOCAL_TARGETS) \
+       $(PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS) \
+       $(HTML_INSTALL_DATA_TARGETS)
 
-uninstall-local: $(MAGICK_UNINSTALL_LOCAL_TARGETS) $(PERLMAGICK_UNINSTALL_LOCAL_TARGETS) $(HTML_UNINSTALL_DATA_TARGETS)
+uninstall-local: $(MAGICK_UNINSTALL_LOCAL_TARGETS) \
+       $(PERLMAGICK_UNINSTALL_LOCAL_TARGETS) \
+       $(HTML_UNINSTALL_DATA_TARGETS) \
+       $(UTILITIES_UNINSTALL_LOCAL_TARGETS)
 
 clean-local: $(PERLMAGICK_CLEAN_LOCAL_TARGETS)
 
diff --git a/utilities/Makefile.am b/utilities/Makefile.am
index 9dfb3ce65cf19f4ee7e46fd306c6c68455de22fd..9401d528b3695cee99075f726a294bb2f4f6ff88 100644 (file)
--- a/utilities/Makefile.am
+++ b/utilities/Makefile.am
@@ -19,7 +19,6 @@ UTILITIES_PGMS = \
        utilities/compare \
        utilities/composite \
        utilities/conjure \
-       utilities/convert \
        utilities/display \
        utilities/identify \
        utilities/import \
@@ -48,10 +47,6 @@ utilities_conjure_LDADD      = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 utilities_conjure_LDFLAGS      = $(LDFLAGS)
 utilities_conjure_SOURCES      = utilities/conjure.c
 
-utilities_convert_LDADD        = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
-utilities_convert_LDFLAGS      = $(LDFLAGS)
-utilities_convert_SOURCES      = utilities/convert.c
-
 utilities_display_LDADD        = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 utilities_display_LDFLAGS      = $(LDFLAGS)
 utilities_display_SOURCES      = utilities/display.c
@@ -117,13 +112,13 @@ UTILITIES_EXTRA_DIST = \
 UTILITIES_CLEANFILES = 
 
 # Link these utilities to 'magick'.
-MAGICKPROGRAMS=convert magick-script
+MAGICK_UTILITIES=convert magick-script
 UTILITIES_INSTALL_EXEC_LOCAL_TARGETS=install-exec-local-utilities
 install-exec-local-utilities:
        $(mkdir_p) $(DESTDIR)$(bindir)
        cd $(DESTDIR)$(bindir) ; \
        magick=`echo "magick" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-       for name in $(MAGICKPROGRAMS) ; \
+       for name in $(MAGICK_UTILITIES) ; \
        do \
          target=`echo "$$name" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
          rm -f $$target ; \
@@ -133,7 +128,7 @@ install-exec-local-utilities:
 UTILITIES_UNINSTALL_LOCAL_TARGETS=uninstall-local-utilities
 uninstall-local-utilities:
        cd $(DESTDIR)$(bindir) ; \
-       for name in $(MAGICKPROGRAMS) ; \
+       for name in $(MAGICK_UTILITIES) ; \
        do \
          target=`echo "$$name" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
          rm -f $$target ; \
Unnamed repository; edit this file 'description' to name the repository.