]> granicus.if.org Git - imagemagick/blobdiff - Makefile.in
projects / imagemagick / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
(no commit message)
[imagemagick] / Makefile.in
diff --git a/Makefile.in b/Makefile.in
index 891966a75c388a982a8f7d6f20e628cdc4630aa4..c6e861eea90f28115c09bad37e93a41b5da33cc0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -341,8 +341,8 @@ am__installdirs = "$(DESTDIR)$(codersdir)" "$(DESTDIR)$(filtersdir)" \
        "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
        "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
        "$(DESTDIR)$(configlibdir)" "$(DESTDIR)$(configsharedir)" \
-       "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgconfigdir)" \
-       "$(DESTDIR)$(MagickCoreincdir)" \
+       "$(DESTDIR)$(configsharearchdir)" "$(DESTDIR)$(docdir)" \
+       "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(MagickCoreincdir)" \
        "$(DESTDIR)$(MagickWandincdir)" "$(DESTDIR)$(includedir)" \
        "$(DESTDIR)$(ltdlincludedir)" "$(DESTDIR)$(magickppincdir)" \
        "$(DESTDIR)$(magickpptopincdir)"
@@ -810,7 +810,8 @@ coders_cals_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_CFLAGS) $(CFLAGS) $(coders_cals_la_LDFLAGS) $(LDFLAGS) -o \
        $@
 @WITH_MODULES_TRUE@am_coders_cals_la_rpath = -rpath $(codersdir)
-coders_caption_la_DEPENDENCIES = $(MAGICKCORE_LIBS)
+coders_caption_la_DEPENDENCIES = $(MAGICKCORE_LIBS) \
+       $(am__DEPENDENCIES_1)
 am_coders_caption_la_OBJECTS = coders/coders_caption_la-caption.lo
 coders_caption_la_OBJECTS = $(am_coders_caption_la_OBJECTS)
 coders_caption_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -2182,8 +2183,8 @@ DIST_SOURCES = $(Magick___lib_libMagick___la_SOURCES) \
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(man_MANS)
-DATA = $(configlib_DATA) $(configshare_DATA) $(doc_DATA) \
-       $(pkgconfig_DATA)
+DATA = $(configlib_DATA) $(configshare_DATA) $(configsharearch_DATA) \
+       $(doc_DATA) $(pkgconfig_DATA)
 am__include_HEADERS_DIST = ltdl/ltdl.h
 am__ltdlinclude_HEADERS_DIST = ltdl/libltdl/lt_system.h \
        ltdl/libltdl/lt_error.h ltdl/libltdl/lt_dlloader.h
@@ -2373,7 +2374,9 @@ HTMLDecodeDelegate = @HTMLDecodeDelegate@
 ILBMDecodeDelegate = @ILBMDecodeDelegate@
 ILBMEncodeDelegate = @ILBMEncodeDelegate@
 INCLTDL = @INCLTDL@
+INCLUDEARCH_DIR = @INCLUDEARCH_DIR@
 INCLUDE_DIR = @INCLUDE_DIR@
+INCLUDE_PATH = @INCLUDE_PATH@
 INFO_DIR = @INFO_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -2495,6 +2498,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PACKAGE_VERSION_ADDENDUM = @PACKAGE_VERSION_ADDENDUM@
+PANGO_CFLAGS = @PANGO_CFLAGS@
+PANGO_LIBS = @PANGO_LIBS@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCLCMYKDevice = @PCLCMYKDevice@
 PCLColorDevice = @PCLColorDevice@
@@ -2530,6 +2535,8 @@ SBIN_DIR = @SBIN_DIR@
 SCANDecodeDelegate = @SCANDecodeDelegate@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
+SHAREARCH_DIR = @SHAREARCH_DIR@
+SHAREARCH_PATH = @SHAREARCH_PATH@
 SHAREDSTATE_DIR = @SHAREDSTATE_DIR@
 SHARE_PATH = @SHARE_PATH@
 SHELL = @SHELL@
@@ -2643,8 +2650,6 @@ top_srcdir = @top_srcdir@
 type_include_files = @type_include_files@
 windows_font_dir = @windows_font_dir@
 xml2_config = @xml2_config@
-AUTOMAKE_OPTIONS = 1.11 subdir-objects parallel-tests color-tests dist-zip dist-bzip2 dist-xz foreign
-topincludedir = @includedir@/ImageMagick
 
 # -I$(srcdir) is needed for user that built libltdl with a sub-Automake
 # (not as a sub-package!) using 'nostdinc':
@@ -2772,12 +2777,18 @@ M4_EXTRA_DIST = \
 # (share/ImageMagick-version)
 configsharedir = $(SHARE_PATH)
 configshare_DATA = \
-       config/configure.xml \
        config/english.xml \
        config/francais.xml \
        config/locale.xml
 
 
+# Where architecture-independent configuration files get installed
+# (share/arch/ImageMagick-version)
+configsharearchdir = $(SHAREARCH_PATH)
+configsharearch_DATA = \
+       config/configure.xml
+
+
 # Where architecture-dependent configuration files get installed
 # (share/ImageMagick-version)
 configlibdir = $(CONFIGURE_PATH)
@@ -3171,9 +3182,9 @@ coders_cals_la_LIBADD = $(MAGICKCORE_LIBS)
 
 # CAPTION coder module
 coders_caption_la_SOURCES = coders/caption.c
-coders_caption_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
+coders_caption_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) $(PANGO_CFLAGS)
 coders_caption_la_LDFLAGS = $(MODULECOMMONFLAGS)
-coders_caption_la_LIBADD = $(MAGICKCORE_LIBS)
+coders_caption_la_LIBADD = $(MAGICKCORE_LIBS) $(PANGO_LIBS)
 
 # CINEON coder module
 coders_cin_la_SOURCES = coders/cin.c
@@ -3828,7 +3839,7 @@ coders_yuv_la_SOURCES = coders/yuv.c
 coders_yuv_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
 coders_yuv_la_LDFLAGS = $(MODULECOMMONFLAGS)
 coders_yuv_la_LIBADD = $(MAGICKCORE_LIBS)
-MagickCoreincdir = $(topincludedir)/MagickCore
+MagickCoreincdir = $(INCLUDE_PATH)/MagickCore
 
 # Headers which are installed
 MagickCoreinc_HEADERS = \
@@ -4253,7 +4264,7 @@ MAGICKCORE_INSTALL_DATA_LOCAL_TARGETS = MagickCore-install-data-local
 
 # Uninstall magick-config.h
 MAGICKCORE_UNINSTALL_LOCAL_TARGETS = MagickCore-uninstall-local
-MagickWandincdir = $(topincludedir)/MagickWand
+MagickWandincdir = $(INCLUDE_PATH)/MagickWand
 MAGICKWAND_SOURCES = \
        MagickWand/MagickWand.h \
        MagickWand/animate.c \
@@ -4509,12 +4520,12 @@ Magick___lib_libMagick___la_SOURCES = \
        Magick++/lib/Magick++/Thread.h \
        Magick++/lib/Magick++/TypeMetric.h
 
-magickpptopincdir = $(topincludedir)
+magickpptopincdir = $(INCLUDE_PATH)
 magickpptopinc_HEADERS = $(MAGICKPP_TOP_INCHEADERS)
 MAGICKPP_TOP_INCHEADERS_OPT = \
   Magick++/lib/Magick++.h
 
-magickppincdir = $(topincludedir)/Magick++
+magickppincdir = $(INCLUDE_PATH)/Magick++
 magickppinc_HEADERS = $(MAGICKPP_INCHEADERS)
 MAGICKPP_INCHEADERS_OPT = \
        Magick++/lib/Magick++/Blob.h \
@@ -10742,6 +10753,26 @@ uninstall-configshareDATA:
        test -n "$$files" || exit 0; \
        echo " ( cd '$(DESTDIR)$(configsharedir)' && rm -f" $$files ")"; \
        cd "$(DESTDIR)$(configsharedir)" && rm -f $$files
+install-configsharearchDATA: $(configsharearch_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(configsharearchdir)" || $(MKDIR_P) "$(DESTDIR)$(configsharearchdir)"
+       @list='$(configsharearch_DATA)'; test -n "$(configsharearchdir)" || list=; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(configsharearchdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(configsharearchdir)" || exit $$?; \
+       done
+
+uninstall-configsharearchDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(configsharearch_DATA)'; test -n "$(configsharearchdir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(configsharearchdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(configsharearchdir)" && rm -f $$files
 install-docDATA: $(doc_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
@@ -11286,7 +11317,7 @@ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \
 install-binPROGRAMS: install-libLTLIBRARIES
 
 installdirs:
-       for dir in "$(DESTDIR)$(codersdir)" "$(DESTDIR)$(filtersdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configlibdir)" "$(DESTDIR)$(configsharedir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(MagickCoreincdir)" "$(DESTDIR)$(MagickWandincdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(ltdlincludedir)" "$(DESTDIR)$(magickppincdir)" "$(DESTDIR)$(magickpptopincdir)"; do \
+       for dir in "$(DESTDIR)$(codersdir)" "$(DESTDIR)$(filtersdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configlibdir)" "$(DESTDIR)$(configsharedir)" "$(DESTDIR)$(configsharearchdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(MagickCoreincdir)" "$(DESTDIR)$(MagickWandincdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(ltdlincludedir)" "$(DESTDIR)$(magickppincdir)" "$(DESTDIR)$(magickpptopincdir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: $(BUILT_SOURCES)
@@ -11372,10 +11403,11 @@ info-am:
 install-data-am: install-MagickCoreincHEADERS \
        install-MagickWandincHEADERS install-codersLTLIBRARIES \
        install-configlibDATA install-configshareDATA \
-       install-data-local install-docDATA install-filtersLTLIBRARIES \
-       install-includeHEADERS install-ltdlincludeHEADERS \
-       install-magickppincHEADERS install-magickpptopincHEADERS \
-       install-man install-pkgconfigDATA
+       install-configsharearchDATA install-data-local install-docDATA \
+       install-filtersLTLIBRARIES install-includeHEADERS \
+       install-ltdlincludeHEADERS install-magickppincHEADERS \
+       install-magickpptopincHEADERS install-man \
+       install-pkgconfigDATA
 
 install-dvi: install-dvi-am
 
@@ -11429,11 +11461,12 @@ uninstall-am: uninstall-MagickCoreincHEADERS \
        uninstall-MagickWandincHEADERS uninstall-binPROGRAMS \
        uninstall-binSCRIPTS uninstall-codersLTLIBRARIES \
        uninstall-configlibDATA uninstall-configshareDATA \
-       uninstall-docDATA uninstall-filtersLTLIBRARIES \
-       uninstall-includeHEADERS uninstall-libLTLIBRARIES \
-       uninstall-local uninstall-ltdlincludeHEADERS \
-       uninstall-magickppincHEADERS uninstall-magickpptopincHEADERS \
-       uninstall-man uninstall-pkgconfigDATA
+       uninstall-configsharearchDATA uninstall-docDATA \
+       uninstall-filtersLTLIBRARIES uninstall-includeHEADERS \
+       uninstall-libLTLIBRARIES uninstall-local \
+       uninstall-ltdlincludeHEADERS uninstall-magickppincHEADERS \
+       uninstall-magickpptopincHEADERS uninstall-man \
+       uninstall-pkgconfigDATA
 
 uninstall-man: uninstall-man1
 
@@ -11453,9 +11486,10 @@ uninstall-man: uninstall-man1
        html-am info info-am install install-MagickCoreincHEADERS \
        install-MagickWandincHEADERS install-am install-binPROGRAMS \
        install-binSCRIPTS install-codersLTLIBRARIES \
-       install-configlibDATA install-configshareDATA install-data \
-       install-data-am install-data-local install-docDATA install-dvi \
-       install-dvi-am install-exec install-exec-am install-exec-local \
+       install-configlibDATA install-configshareDATA \
+       install-configsharearchDATA install-data install-data-am \
+       install-data-local install-docDATA install-dvi install-dvi-am \
+       install-exec install-exec-am install-exec-local \
        install-filtersLTLIBRARIES install-html install-html-am \
        install-includeHEADERS install-info install-info-am \
        install-libLTLIBRARIES install-ltdlincludeHEADERS \
@@ -11469,12 +11503,12 @@ uninstall-man: uninstall-man1
        uninstall-MagickCoreincHEADERS uninstall-MagickWandincHEADERS \
        uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \
        uninstall-codersLTLIBRARIES uninstall-configlibDATA \
-       uninstall-configshareDATA uninstall-docDATA \
-       uninstall-filtersLTLIBRARIES uninstall-includeHEADERS \
-       uninstall-libLTLIBRARIES uninstall-local \
-       uninstall-ltdlincludeHEADERS uninstall-magickppincHEADERS \
-       uninstall-magickpptopincHEADERS uninstall-man uninstall-man1 \
-       uninstall-pkgconfigDATA
+       uninstall-configshareDATA uninstall-configsharearchDATA \
+       uninstall-docDATA uninstall-filtersLTLIBRARIES \
+       uninstall-includeHEADERS uninstall-libLTLIBRARIES \
+       uninstall-local uninstall-ltdlincludeHEADERS \
+       uninstall-magickppincHEADERS uninstall-magickpptopincHEADERS \
+       uninstall-man uninstall-man1 uninstall-pkgconfigDATA
 
 
 # We need the following in order to create an <argz.h> when the system
Unnamed repository; edit this file 'description' to name the repository.