cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Makefile.am: Update to Automake 1.12.4

Browse Source
This commit is contained in:
Bob Friesenhahn 2012-09-20 13:50:27 +00:00
parent ec5ce9c2b3
commit f458c10308
29 changed files with 42 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2012-09-20 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
* Makefile.am: Update to Automake 1.12.4
2012-08-19 Bob Friesenhahn <bfriesen@simple.dallas.tx.us> 2012-08-19 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
* Makefile.in: Update to Automake 1.12.3 * Makefile.in: Update to Automake 1.12.3

2
Makefile.am
View File

@ -25,7 +25,7 @@
docdir = $(LIBTIFF_DOCDIR) docdir = $(LIBTIFF_DOCDIR)
AUTOMAKE_OPTIONS = 1.11 dist-zip foreign AUTOMAKE_OPTIONS = 1.12 dist-zip foreign
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
docfiles = \ docfiles = \

4
Makefile.in
View File

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.12.3 from Makefile.am. # Makefile.in generated by automake 1.12.4 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc. # Copyright (C) 1994-2012 Free Software Foundation, Inc.
@ -353,7 +353,7 @@ tiff_libs_private = @tiff_libs_private@
top_build_prefix = @top_build_prefix@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = 1.11 dist-zip foreign AUTOMAKE_OPTIONS = 1.12 dist-zip foreign
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
docfiles = \ docfiles = \
COPYRIGHT \ COPYRIGHT \

6
aclocal.m4 vendored
View File

@ -1,4 +1,4 @@
# generated automatically by aclocal 1.12.3 -*- Autoconf -*- # generated automatically by aclocal 1.12.4 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc. # Copyright (C) 1996-2012 Free Software Foundation, Inc.
@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12' [am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro. dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.12.3], [], m4_if([$1], [1.12.4], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
]) ])
@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.12.3])dnl [AM_AUTOMAKE_VERSION([1.12.4])dnl
m4_ifndef([AC_AUTOCONF_VERSION], m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

2
build/Makefile.in
View File

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.12.3 from Makefile.am. # Makefile.in generated by automake 1.12.4 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc. # Copyright (C) 1994-2012 Free Software Foundation, Inc.

2
contrib/Makefile.in
View File

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.12.3 from Makefile.am. # Makefile.in generated by automake 1.12.4 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc. # Copyright (C) 1994-2012 Free Software Foundation, Inc.

2
contrib/addtiffo/Makefile.am
View File

@ -32,5 +32,5 @@ noinst_PROGRAMS = addtiffo
addtiffo_SOURCES = addtiffo.c tif_overview.c tif_ovrcache.c tif_ovrcache.h addtiffo_SOURCES = addtiffo.c tif_overview.c tif_ovrcache.c tif_ovrcache.h
addtiffo_LDADD = $(LIBTIFF) addtiffo_LDADD = $(LIBTIFF)
INCLUDES = -I$(top_srcdir)/libtiff AM_CPPFLAGS = -I$(top_srcdir)/libtiff

4
contrib/addtiffo/Makefile.in
View File

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.12.3 from Makefile.am. # Makefile.in generated by automake 1.12.4 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc. # Copyright (C) 1994-2012 Free Software Foundation, Inc.
@ -295,7 +295,7 @@ LIBTIFF = $(top_builddir)/libtiff/libtiff.la
EXTRA_DIST = README Makefile.vc EXTRA_DIST = README Makefile.vc
addtiffo_SOURCES = addtiffo.c tif_overview.c tif_ovrcache.c tif_ovrcache.h addtiffo_SOURCES = addtiffo.c tif_overview.c tif_ovrcache.c tif_ovrcache.h
addtiffo_LDADD = $(LIBTIFF) addtiffo_LDADD = $(LIBTIFF)
INCLUDES = -I$(top_srcdir)/libtiff AM_CPPFLAGS = -I$(top_srcdir)/libtiff
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:

2
contrib/dbs/Makefile.am
View File

@ -40,5 +40,5 @@ tiff_palette_LDADD = $(LIBTIFF)
tiff_rgb_SOURCES = tiff-rgb.c tiff_rgb_SOURCES = tiff-rgb.c
tiff_rgb_LDADD = $(LIBTIFF) tiff_rgb_LDADD = $(LIBTIFF)
INCLUDES = -I$(top_srcdir)/libtiff AM_CPPFLAGS = -I$(top_srcdir)/libtiff

4
contrib/dbs/Makefile.in
View File

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.12.3 from Makefile.am. # Makefile.in generated by automake 1.12.4 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc. # Copyright (C) 1994-2012 Free Software Foundation, Inc.
@ -351,7 +351,7 @@ tiff_palette_SOURCES = tiff-palette.c
tiff_palette_LDADD = $(LIBTIFF) tiff_palette_LDADD = $(LIBTIFF)
tiff_rgb_SOURCES = tiff-rgb.c tiff_rgb_SOURCES = tiff-rgb.c
tiff_rgb_LDADD = $(LIBTIFF) tiff_rgb_LDADD = $(LIBTIFF)
INCLUDES = -I$(top_srcdir)/libtiff AM_CPPFLAGS = -I$(top_srcdir)/libtiff
all: all-recursive all: all-recursive
.SUFFIXES: .SUFFIXES:

2
contrib/dbs/xtiff/Makefile.in
View File

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.12.3 from Makefile.am. # Makefile.in generated by automake 1.12.4 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc. # Copyright (C) 1994-2012 Free Software Foundation, Inc.

2
contrib/iptcutil/Makefile.am
View File

@ -32,5 +32,5 @@ noinst_PROGRAMS = iptcutil
iptcutil_SOURCES = iptcutil.c iptcutil_SOURCES = iptcutil.c
iptcutil_LDADD = $(LIBTIFF) iptcutil_LDADD = $(LIBTIFF)
INCLUDES = -I$(top_srcdir)/libtiff AM_CPPFLAGS = -I$(top_srcdir)/libtiff

4
contrib/iptcutil/Makefile.in
View File

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.12.3 from Makefile.am. # Makefile.in generated by automake 1.12.4 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc. # Copyright (C) 1994-2012 Free Software Foundation, Inc.
@ -294,7 +294,7 @@ LIBTIFF = $(top_builddir)/libtiff/libtiff.la
EXTRA_DIST = README test.iptc test.txt EXTRA_DIST = README test.iptc test.txt
iptcutil_SOURCES = iptcutil.c iptcutil_SOURCES = iptcutil.c
iptcutil_LDADD = $(LIBTIFF) iptcutil_LDADD = $(LIBTIFF)
INCLUDES = -I$(top_srcdir)/libtiff AM_CPPFLAGS = -I$(top_srcdir)/libtiff
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:

2
contrib/mfs/Makefile.in
View File

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.12.3 from Makefile.am. # Makefile.in generated by automake 1.12.4 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc. # Copyright (C) 1994-2012 Free Software Foundation, Inc.

2
contrib/pds/Makefile.in
View File

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.12.3 from Makefile.am. # Makefile.in generated by automake 1.12.4 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc. # Copyright (C) 1994-2012 Free Software Foundation, Inc.

2
contrib/ras/Makefile.in
View File

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.12.3 from Makefile.am. # Makefile.in generated by automake 1.12.4 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc. # Copyright (C) 1994-2012 Free Software Foundation, Inc.

2
contrib/stream/Makefile.in
View File

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.12.3 from Makefile.am. # Makefile.in generated by automake 1.12.4 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc. # Copyright (C) 1994-2012 Free Software Foundation, Inc.

2
contrib/tags/Makefile.in
View File

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.12.3 from Makefile.am. # Makefile.in generated by automake 1.12.4 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc. # Copyright (C) 1994-2012 Free Software Foundation, Inc.

2
contrib/win_dib/Makefile.in
View File

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.12.3 from Makefile.am. # Makefile.in generated by automake 1.12.4 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc. # Copyright (C) 1994-2012 Free Software Foundation, Inc.

2
html/Makefile.in
View File

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.12.3 from Makefile.am. # Makefile.in generated by automake 1.12.4 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc. # Copyright (C) 1994-2012 Free Software Foundation, Inc.

2
html/images/Makefile.in
View File

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.12.3 from Makefile.am. # Makefile.in generated by automake 1.12.4 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc. # Copyright (C) 1994-2012 Free Software Foundation, Inc.

2
html/man/Makefile.in
View File

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.12.3 from Makefile.am. # Makefile.in generated by automake 1.12.4 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc. # Copyright (C) 1994-2012 Free Software Foundation, Inc.

2
libtiff/Makefile.in
View File

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.12.3 from Makefile.am. # Makefile.in generated by automake 1.12.4 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc. # Copyright (C) 1994-2012 Free Software Foundation, Inc.

2
man/Makefile.in
View File

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.12.3 from Makefile.am. # Makefile.in generated by automake 1.12.4 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc. # Copyright (C) 1994-2012 Free Software Foundation, Inc.

2
port/Makefile.in
View File

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.12.3 from Makefile.am. # Makefile.in generated by automake 1.12.4 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc. # Copyright (C) 1994-2012 Free Software Foundation, Inc.

4
test/Makefile.am
View File

@ -23,7 +23,7 @@
# Process this file with automake to produce Makefile.in. # Process this file with automake to produce Makefile.in.
AUTOMAKE_OPTIONS = 1.11 color-tests parallel-tests foreign AUTOMAKE_OPTIONS = 1.12 color-tests parallel-tests foreign
LIBTIFF = $(top_builddir)/libtiff/libtiff.la LIBTIFF = $(top_builddir)/libtiff/libtiff.la
@ -182,7 +182,7 @@ raw_decode_LDADD = $(LIBTIFF)
custom_dir_SOURCES = custom_dir.c custom_dir_SOURCES = custom_dir.c
custom_dir_LDADD = $(LIBTIFF) custom_dir_LDADD = $(LIBTIFF)
INCLUDES = -I$(top_srcdir)/libtiff AM_CPPFLAGS = -I$(top_srcdir)/libtiff
# memcheck: valgrind's memory access checker # memcheck: valgrind's memory access checker
memcheck: memcheck:

6
test/Makefile.in
View File

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.12.3 from Makefile.am. # Makefile.in generated by automake 1.12.4 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc. # Copyright (C) 1994-2012 Free Software Foundation, Inc.
@ -521,7 +521,7 @@ tiff_libs_private = @tiff_libs_private@
top_build_prefix = @top_build_prefix@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = 1.11 color-tests parallel-tests foreign AUTOMAKE_OPTIONS = 1.12 color-tests parallel-tests foreign
LIBTIFF = $(top_builddir)/libtiff/libtiff.la LIBTIFF = $(top_builddir)/libtiff/libtiff.la
# Environment parameters to be used during tests # Environment parameters to be used during tests
@ -674,7 +674,7 @@ raw_decode_SOURCES = raw_decode.c
raw_decode_LDADD = $(LIBTIFF) raw_decode_LDADD = $(LIBTIFF)
custom_dir_SOURCES = custom_dir.c custom_dir_SOURCES = custom_dir.c
custom_dir_LDADD = $(LIBTIFF) custom_dir_LDADD = $(LIBTIFF)
INCLUDES = -I$(top_srcdir)/libtiff AM_CPPFLAGS = -I$(top_srcdir)/libtiff
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:

2
tools/Makefile.am
View File

@ -135,7 +135,7 @@ tiffgt_SOURCES = tiffgt.c
tiffgt_CFLAGS = $(CFLAGS) $(GLUT_CFLAGS) $(AM_CFLAGS) tiffgt_CFLAGS = $(CFLAGS) $(GLUT_CFLAGS) $(AM_CFLAGS)
tiffgt_LDADD = $(LIBTIFF) $(LIBPORT) $(X_LIBS) $(GLUT_LIBS) tiffgt_LDADD = $(LIBTIFF) $(LIBPORT) $(X_LIBS) $(GLUT_LIBS)
INCLUDES = -I$(top_srcdir)/libtiff AM_CPPFLAGS = -I$(top_srcdir)/libtiff
echo: echo:
(echo $(CFLAGS)) (echo $(CFLAGS))

4
tools/Makefile.in
View File

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.12.3 from Makefile.am. # Makefile.in generated by automake 1.12.4 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc. # Copyright (C) 1994-2012 Free Software Foundation, Inc.
@ -453,7 +453,7 @@ tiffsplit_LDADD = $(LIBTIFF) $(LIBPORT)
tiffgt_SOURCES = tiffgt.c tiffgt_SOURCES = tiffgt.c
tiffgt_CFLAGS = $(CFLAGS) $(GLUT_CFLAGS) $(AM_CFLAGS) tiffgt_CFLAGS = $(CFLAGS) $(GLUT_CFLAGS) $(AM_CFLAGS)
tiffgt_LDADD = $(LIBTIFF) $(LIBPORT) $(X_LIBS) $(GLUT_LIBS) tiffgt_LDADD = $(LIBTIFF) $(LIBPORT) $(X_LIBS) $(GLUT_LIBS)
INCLUDES = -I$(top_srcdir)/libtiff AM_CPPFLAGS = -I$(top_srcdir)/libtiff
all: all-am all: all-am
.SUFFIXES: .SUFFIXES: