diff options
author | Marti Maria <info@littlecms.com> | 2014-12-17 12:18:42 +0100 |
---|---|---|
committer | Marti Maria <info@littlecms.com> | 2014-12-17 12:18:42 +0100 |
commit | 58b8b180f9572b2e850bad9f900d5c706c7e5ac3 (patch) | |
tree | c9eed8c64711897c611d7e49b71890df70cbfc2c /utils | |
parent | 81746818cd6df89b7a62dbcfc4861d12dbc9c4f4 (diff) | |
download | lcms2-58b8b180f9572b2e850bad9f900d5c706c7e5ac3.tar.gz |
Merge from private branch in preparation of 2.7 rc1
Diffstat (limited to 'utils')
-rw-r--r-- | utils/jpgicc/Makefile.in | 4 | ||||
-rw-r--r-- | utils/linkicc/Makefile.in | 4 | ||||
-rw-r--r-- | utils/psicc/Makefile.in | 4 | ||||
-rw-r--r-- | utils/tificc/Makefile.in | 4 | ||||
-rw-r--r-- | utils/transicc/Makefile.in | 4 |
5 files changed, 15 insertions, 5 deletions
diff --git a/utils/jpgicc/Makefile.in b/utils/jpgicc/Makefile.in index 2fe0428..7aea992 100644 --- a/utils/jpgicc/Makefile.in +++ b/utils/jpgicc/Makefile.in @@ -61,7 +61,9 @@ subdir = utils/jpgicc DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/utils/linkicc/Makefile.in b/utils/linkicc/Makefile.in index 20e8e68..6687610 100644 --- a/utils/linkicc/Makefile.in +++ b/utils/linkicc/Makefile.in @@ -61,7 +61,9 @@ subdir = utils/linkicc DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/utils/psicc/Makefile.in b/utils/psicc/Makefile.in index a3a2144..5cef9b6 100644 --- a/utils/psicc/Makefile.in +++ b/utils/psicc/Makefile.in @@ -61,7 +61,9 @@ subdir = utils/psicc DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/utils/tificc/Makefile.in b/utils/tificc/Makefile.in index db2c29b..afb2dde 100644 --- a/utils/tificc/Makefile.in +++ b/utils/tificc/Makefile.in @@ -61,7 +61,9 @@ subdir = utils/tificc DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/utils/transicc/Makefile.in b/utils/transicc/Makefile.in index b6b29fa..4e6ea2b 100644 --- a/utils/transicc/Makefile.in +++ b/utils/transicc/Makefile.in @@ -61,7 +61,9 @@ subdir = utils/transicc DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d |