diff options
42 files changed, 200 insertions, 53 deletions
diff --git a/Makefile.am b/Makefile.am index 996297e9..8f310beb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,13 +38,14 @@ docfiles = \ VERSION EXTRA_DIST = \ + CMakeLists.txt \ HOWTO-RELEASE \ Makefile.vc \ SConstruct \ autogen.sh \ configure.com \ - nmake.opt \ - libtiff-4.pc.in + libtiff-4.pc.in \ + nmake.opt dist_doc_DATA = $(docfiles) diff --git a/Makefile.in b/Makefile.in index cc1582ee..6ab730bb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -424,13 +424,14 @@ docfiles = \ VERSION EXTRA_DIST = \ + CMakeLists.txt \ HOWTO-RELEASE \ Makefile.vc \ SConstruct \ autogen.sh \ configure.com \ - nmake.opt \ - libtiff-4.pc.in + libtiff-4.pc.in \ + nmake.opt dist_doc_DATA = $(docfiles) SUBDIRS = port libtiff tools build contrib test man html diff --git a/build/Makefile.am b/build/Makefile.am index 48fe8b4e..c912a422 100644 --- a/build/Makefile.am +++ b/build/Makefile.am @@ -24,7 +24,9 @@ # Process this file with automake to produce Makefile.in. -EXTRA_DIST = README +EXTRA_DIST = \ + CMakeLists.txt \ + README SUBDIRS = diff --git a/build/Makefile.in b/build/Makefile.in index c1e96dc0..b12c098b 100644 --- a/build/Makefile.in +++ b/build/Makefile.in @@ -356,7 +356,10 @@ tiff_libs_private = @tiff_libs_private@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = README +EXTRA_DIST = \ + CMakeLists.txt \ + README + SUBDIRS = all: all-recursive diff --git a/contrib/Makefile.am b/contrib/Makefile.am index b231ef91..99d0f336 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -23,7 +23,9 @@ # Process this file with automake to produce Makefile.in. -EXTRA_DIST = README +EXTRA_DIST = \ + CMakeLists.txt \ + README SUBDIRS = addtiffo dbs iptcutil mfs pds ras stream tags win_dib diff --git a/contrib/Makefile.in b/contrib/Makefile.in index 54bfc819..9c885fa1 100644 --- a/contrib/Makefile.in +++ b/contrib/Makefile.in @@ -355,7 +355,10 @@ tiff_libs_private = @tiff_libs_private@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = README +EXTRA_DIST = \ + CMakeLists.txt \ + README + SUBDIRS = addtiffo dbs iptcutil mfs pds ras stream tags win_dib all: all-recursive diff --git a/contrib/addtiffo/Makefile.am b/contrib/addtiffo/Makefile.am index d634a152..87342bde 100644 --- a/contrib/addtiffo/Makefile.am +++ b/contrib/addtiffo/Makefile.am @@ -25,7 +25,10 @@ LIBTIFF = $(top_builddir)/libtiff/libtiff.la -EXTRA_DIST = README Makefile.vc +EXTRA_DIST = \ + CMakeLists.txt \ + Makefile.vc \ + README noinst_PROGRAMS = addtiffo diff --git a/contrib/addtiffo/Makefile.in b/contrib/addtiffo/Makefile.in index 07d04c89..8c872b5e 100644 --- a/contrib/addtiffo/Makefile.in +++ b/contrib/addtiffo/Makefile.in @@ -347,7 +347,11 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ LIBTIFF = $(top_builddir)/libtiff/libtiff.la -EXTRA_DIST = README Makefile.vc +EXTRA_DIST = \ + CMakeLists.txt \ + Makefile.vc \ + README + addtiffo_SOURCES = addtiffo.c tif_overview.c tif_ovrcache.c tif_ovrcache.h addtiffo_LDADD = $(LIBTIFF) AM_CPPFLAGS = -I$(top_srcdir)/libtiff diff --git a/contrib/dbs/Makefile.am b/contrib/dbs/Makefile.am index 07873779..90697eed 100644 --- a/contrib/dbs/Makefile.am +++ b/contrib/dbs/Makefile.am @@ -27,7 +27,9 @@ SUBDIRS = xtiff LIBTIFF = $(top_builddir)/libtiff/libtiff.la -EXTRA_DIST = README +EXTRA_DIST = \ + CMakeLists.txt \ + README noinst_PROGRAMS = tiff-bi tiff-grayscale tiff-palette tiff-rgb diff --git a/contrib/dbs/Makefile.in b/contrib/dbs/Makefile.in index 769c69ba..a98dace1 100644 --- a/contrib/dbs/Makefile.in +++ b/contrib/dbs/Makefile.in @@ -401,7 +401,10 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = xtiff LIBTIFF = $(top_builddir)/libtiff/libtiff.la -EXTRA_DIST = README +EXTRA_DIST = \ + CMakeLists.txt \ + README + tiff_bi_SOURCES = tiff-bi.c tiff_bi_LDADD = $(LIBTIFF) tiff_grayscale_SOURCES = tiff-grayscale.c diff --git a/contrib/dbs/xtiff/Makefile.am b/contrib/dbs/xtiff/Makefile.am index 749f5ceb..a138c90a 100644 --- a/contrib/dbs/xtiff/Makefile.am +++ b/contrib/dbs/xtiff/Makefile.am @@ -26,7 +26,12 @@ #LIBTIFF = $(top_builddir)/libtiff/libtiff.la -EXTRA_DIST = README patchlevel.h xtiff.c xtifficon.h +EXTRA_DIST = \ + CMakeLists.txt \ + README \ + patchlevel.h \ + xtiff.c \ + xtifficon.h #noinst_PROGRAMS = diff --git a/contrib/dbs/xtiff/Makefile.in b/contrib/dbs/xtiff/Makefile.in index d6a88eac..25d3f584 100644 --- a/contrib/dbs/xtiff/Makefile.in +++ b/contrib/dbs/xtiff/Makefile.in @@ -298,7 +298,13 @@ tiff_libs_private = @tiff_libs_private@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = README patchlevel.h xtiff.c xtifficon.h +EXTRA_DIST = \ + CMakeLists.txt \ + README \ + patchlevel.h \ + xtiff.c \ + xtifficon.h + all: all-am .SUFFIXES: diff --git a/contrib/iptcutil/Makefile.am b/contrib/iptcutil/Makefile.am index 9caedf14..4aabe2e9 100644 --- a/contrib/iptcutil/Makefile.am +++ b/contrib/iptcutil/Makefile.am @@ -25,7 +25,11 @@ LIBTIFF = $(top_builddir)/libtiff/libtiff.la -EXTRA_DIST = README test.iptc test.txt +EXTRA_DIST = \ + CMakeLists.txt \ + README \ + test.iptc \ + test.txt noinst_PROGRAMS = iptcutil diff --git a/contrib/iptcutil/Makefile.in b/contrib/iptcutil/Makefile.in index 1470613c..e30ea564 100644 --- a/contrib/iptcutil/Makefile.in +++ b/contrib/iptcutil/Makefile.in @@ -346,7 +346,12 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ LIBTIFF = $(top_builddir)/libtiff/libtiff.la -EXTRA_DIST = README test.iptc test.txt +EXTRA_DIST = \ + CMakeLists.txt \ + README \ + test.iptc \ + test.txt + iptcutil_SOURCES = iptcutil.c iptcutil_LDADD = $(LIBTIFF) AM_CPPFLAGS = -I$(top_srcdir)/libtiff diff --git a/contrib/mfs/Makefile.am b/contrib/mfs/Makefile.am index fb8a07e2..b0bad60a 100644 --- a/contrib/mfs/Makefile.am +++ b/contrib/mfs/Makefile.am @@ -23,5 +23,7 @@ # Process this file with automake to produce Makefile.in. -EXTRA_DIST = README mfs_file.c - +EXTRA_DIST = \ + CMakeLists.txt \ + README \ + mfs_file.c diff --git a/contrib/mfs/Makefile.in b/contrib/mfs/Makefile.in index 419209b7..6fda13b7 100644 --- a/contrib/mfs/Makefile.in +++ b/contrib/mfs/Makefile.in @@ -295,7 +295,11 @@ tiff_libs_private = @tiff_libs_private@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = README mfs_file.c +EXTRA_DIST = \ + CMakeLists.txt \ + README \ + mfs_file.c + all: all-am .SUFFIXES: diff --git a/contrib/pds/Makefile.am b/contrib/pds/Makefile.am index b3c145d5..435e2b33 100644 --- a/contrib/pds/Makefile.am +++ b/contrib/pds/Makefile.am @@ -23,5 +23,10 @@ # Process this file with automake to produce Makefile.in. -EXTRA_DIST = README tif_imageiter.c tif_imageiter.h tif_pdsdirread.c tif_pdsdirwrite.c - +EXTRA_DIST = \ + CMakeLists.txt \ + README \ + tif_imageiter.c \ + tif_imageiter.h \ + tif_pdsdirread.c \ + tif_pdsdirwrite.c diff --git a/contrib/pds/Makefile.in b/contrib/pds/Makefile.in index a13e7039..27f07121 100644 --- a/contrib/pds/Makefile.in +++ b/contrib/pds/Makefile.in @@ -295,7 +295,14 @@ tiff_libs_private = @tiff_libs_private@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = README tif_imageiter.c tif_imageiter.h tif_pdsdirread.c tif_pdsdirwrite.c +EXTRA_DIST = \ + CMakeLists.txt \ + README \ + tif_imageiter.c \ + tif_imageiter.h \ + tif_pdsdirread.c \ + tif_pdsdirwrite.c + all: all-am .SUFFIXES: diff --git a/contrib/ras/Makefile.am b/contrib/ras/Makefile.am index 94809447..26617edf 100644 --- a/contrib/ras/Makefile.am +++ b/contrib/ras/Makefile.am @@ -23,5 +23,8 @@ # Process this file with automake to produce Makefile.in. -EXTRA_DIST = README ras2tif.c tif2ras.c - +EXTRA_DIST = \ + CMakeLists.txt \ + README \ + ras2tif.c \ + tif2ras.c diff --git a/contrib/ras/Makefile.in b/contrib/ras/Makefile.in index cee83e67..51691d9d 100644 --- a/contrib/ras/Makefile.in +++ b/contrib/ras/Makefile.in @@ -295,7 +295,12 @@ tiff_libs_private = @tiff_libs_private@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = README ras2tif.c tif2ras.c +EXTRA_DIST = \ + CMakeLists.txt \ + README \ + ras2tif.c \ + tif2ras.c + all: all-am .SUFFIXES: diff --git a/contrib/stream/Makefile.am b/contrib/stream/Makefile.am index 1e7a8dab..0324e865 100644 --- a/contrib/stream/Makefile.am +++ b/contrib/stream/Makefile.am @@ -23,5 +23,8 @@ # Process this file with automake to produce Makefile.in. -EXTRA_DIST = README tiffstream.cpp tiffstream.h - +EXTRA_DIST = \ + CMakeLists.txt \ + README \ + tiffstream.cpp \ + tiffstream.h diff --git a/contrib/stream/Makefile.in b/contrib/stream/Makefile.in index 49e9039c..c2d287cf 100644 --- a/contrib/stream/Makefile.in +++ b/contrib/stream/Makefile.in @@ -295,7 +295,12 @@ tiff_libs_private = @tiff_libs_private@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = README tiffstream.cpp tiffstream.h +EXTRA_DIST = \ + CMakeLists.txt \ + README \ + tiffstream.cpp \ + tiffstream.h + all: all-am .SUFFIXES: diff --git a/contrib/tags/Makefile.am b/contrib/tags/Makefile.am index 9d92444f..67d99679 100644 --- a/contrib/tags/Makefile.am +++ b/contrib/tags/Makefile.am @@ -23,5 +23,11 @@ # Process this file with automake to produce Makefile.in. -EXTRA_DIST = README listtif.c maketif.c xtif_dir.c xtiffio.h xtiffiop.h - +EXTRA_DIST = \ + CMakeLists.txt \ + README \ + listtif.c \ + maketif.c \ + xtif_dir.c \ + xtiffio.h \ + xtiffiop.h diff --git a/contrib/tags/Makefile.in b/contrib/tags/Makefile.in index 28c5b1a5..ad328f17 100644 --- a/contrib/tags/Makefile.in +++ b/contrib/tags/Makefile.in @@ -295,7 +295,15 @@ tiff_libs_private = @tiff_libs_private@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = README listtif.c maketif.c xtif_dir.c xtiffio.h xtiffiop.h +EXTRA_DIST = \ + CMakeLists.txt \ + README \ + listtif.c \ + maketif.c \ + xtif_dir.c \ + xtiffio.h \ + xtiffiop.h + all: all-am .SUFFIXES: diff --git a/contrib/win_dib/Makefile.am b/contrib/win_dib/Makefile.am index 2bdccd0f..50a1dab0 100644 --- a/contrib/win_dib/Makefile.am +++ b/contrib/win_dib/Makefile.am @@ -23,5 +23,10 @@ # Process this file with automake to produce Makefile.in. -EXTRA_DIST = Makefile.w95 README.Tiffile README.tiff2dib Tiffile.cpp tiff2dib.c - +EXTRA_DIST = \ + CMakeLists.txt \ + Makefile.w95 \ + README.Tiffile \ + README.tiff2dib \ + Tiffile.cpp \ + tiff2dib.c diff --git a/contrib/win_dib/Makefile.in b/contrib/win_dib/Makefile.in index df7a430b..76e5c174 100644 --- a/contrib/win_dib/Makefile.in +++ b/contrib/win_dib/Makefile.in @@ -295,7 +295,14 @@ tiff_libs_private = @tiff_libs_private@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = Makefile.w95 README.Tiffile README.tiff2dib Tiffile.cpp tiff2dib.c +EXTRA_DIST = \ + CMakeLists.txt \ + Makefile.w95 \ + README.Tiffile \ + README.tiff2dib \ + Tiffile.cpp \ + tiff2dib.c + all: all-am .SUFFIXES: diff --git a/html/Makefile.am b/html/Makefile.am index 99f5bdef..77653840 100644 --- a/html/Makefile.am +++ b/html/Makefile.am @@ -81,9 +81,12 @@ docfiles = \ v4.0.2.html \ v4.0.3.html \ v4.0.4beta.html \ - v4.0.4.html + v4.0.4.html \ + v4.0.5.html dist_doc_DATA = $(docfiles) SUBDIRS = images man +EXTRA_DIST = \ + CMakeLists.txt diff --git a/html/Makefile.in b/html/Makefile.in index 45811c40..06568f47 100644 --- a/html/Makefile.in +++ b/html/Makefile.in @@ -442,10 +442,14 @@ docfiles = \ v4.0.2.html \ v4.0.3.html \ v4.0.4beta.html \ - v4.0.4.html + v4.0.4.html \ + v4.0.5.html dist_doc_DATA = $(docfiles) SUBDIRS = images man +EXTRA_DIST = \ + CMakeLists.txt + all: all-recursive .SUFFIXES: diff --git a/html/images/Makefile.am b/html/images/Makefile.am index 840e1495..979c8582 100644 --- a/html/images/Makefile.am +++ b/html/images/Makefile.am @@ -44,3 +44,6 @@ docfiles = \ warning.gif dist_doc_DATA = $(docfiles) + +EXTRA_DIST = \ + CMakeLists.txt diff --git a/html/images/Makefile.in b/html/images/Makefile.in index 754c8739..5a23411f 100644 --- a/html/images/Makefile.in +++ b/html/images/Makefile.in @@ -345,6 +345,9 @@ docfiles = \ warning.gif dist_doc_DATA = $(docfiles) +EXTRA_DIST = \ + CMakeLists.txt + all: all-am .SUFFIXES: diff --git a/html/man/Makefile.am b/html/man/Makefile.am index ca222dea..5fd729be 100644 --- a/html/man/Makefile.am +++ b/html/man/Makefile.am @@ -124,3 +124,5 @@ htmldoc: ${GROFF} $(MANSRCDIR)/$$i > $(HTMLMANDIR)/$$i.html; \ done +EXTRA_DIST = \ + CMakeLists.txt diff --git a/html/man/Makefile.in b/html/man/Makefile.in index cbce8ccb..533e7c23 100644 --- a/html/man/Makefile.in +++ b/html/man/Makefile.in @@ -407,6 +407,9 @@ dist_doc_DATA = $(indexfile) $(docfiles) INDEXSTART = '<HTML><HEAD><TITLE>Libtiff HTML manpage index</TITLE></HEAD><BODY BGCOLOR=white><ul><H2>Man Pages</h2><p>' INDEXEND = '</ul></BODY></HTML>' manpages = $(docfiles:.html=) +EXTRA_DIST = \ + CMakeLists.txt + all: all-am .SUFFIXES: diff --git a/libtiff/Makefile.am b/libtiff/Makefile.am index 82fa31dc..ba023dd3 100644 --- a/libtiff/Makefile.am +++ b/libtiff/Makefile.am @@ -27,16 +27,18 @@ LIBPORT = $(top_builddir)/port/libport.la LIBTIFF = $(top_builddir)/libtiff/libtiff.la libtiffincludedir = $(includedir) -EXTRA_DIST = Makefile.vc \ - SConstruct \ - tif_config.h-vms \ - tif_config.vc.h \ - tif_config.wince.h \ - tiffconf.vc.h \ - tiffconf.wince.h \ - libtiff.def \ - libtiff.map \ - libtiffxx.map +EXTRA_DIST = \ + CMakeLists.txt \ + Makefile.vc \ + SConstruct \ + libtiff.def \ + libtiff.map \ + libtiffxx.map \ + tif_config.h-vms \ + tif_config.vc.h \ + tif_config.wince.h \ + tiffconf.vc.h \ + tiffconf.wince.h libtiffinclude_HEADERS = \ tiff.h \ diff --git a/libtiff/Makefile.in b/libtiff/Makefile.in index 2c4a267c..b7a860ae 100644 --- a/libtiff/Makefile.in +++ b/libtiff/Makefile.in @@ -450,9 +450,10 @@ top_srcdir = @top_srcdir@ LIBPORT = $(top_builddir)/port/libport.la LIBTIFF = $(top_builddir)/libtiff/libtiff.la libtiffincludedir = $(includedir) -EXTRA_DIST = Makefile.vc SConstruct tif_config.h-vms tif_config.vc.h \ - tif_config.wince.h tiffconf.vc.h tiffconf.wince.h libtiff.def \ - libtiff.map libtiffxx.map $(am__append_2) $(am__append_4) +EXTRA_DIST = CMakeLists.txt Makefile.vc SConstruct libtiff.def \ + libtiff.map libtiffxx.map tif_config.h-vms tif_config.vc.h \ + tif_config.wince.h tiffconf.vc.h tiffconf.wince.h \ + $(am__append_2) $(am__append_4) libtiffinclude_HEADERS = tiff.h tiffio.h tiffvers.h $(am__append_1) noinst_HEADERS = \ t4.h \ diff --git a/man/Makefile.am b/man/Makefile.am index bcad9ba7..931f71db 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -96,3 +96,6 @@ dist_man3_MANS = \ TIFFWriteRawTile.3tiff \ TIFFWriteScanline.3tiff \ TIFFWriteTile.3tiff + +EXTRA_DIST = \ + CMakeLists.txt diff --git a/man/Makefile.in b/man/Makefile.in index 910c308c..c042344c 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -401,6 +401,9 @@ dist_man3_MANS = \ TIFFWriteScanline.3tiff \ TIFFWriteTile.3tiff +EXTRA_DIST = \ + CMakeLists.txt + all: all-am .SUFFIXES: diff --git a/port/Makefile.am b/port/Makefile.am index e8253455..4d6e11d0 100644 --- a/port/Makefile.am +++ b/port/Makefile.am @@ -23,7 +23,11 @@ # Process this file with automake to produce Makefile.in. -EXTRA_DIST = Makefile.vc libport.h snprintf.c +EXTRA_DIST = \ + CMakeLists.txt \ + Makefile.vc \ + libport.h \ + snprintf.c noinst_LTLIBRARIES = libport.la libport_la_SOURCES = dummy.c libport.h diff --git a/port/Makefile.in b/port/Makefile.in index 394f69b7..c7cd118f 100644 --- a/port/Makefile.in +++ b/port/Makefile.in @@ -345,7 +345,12 @@ tiff_libs_private = @tiff_libs_private@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = Makefile.vc libport.h snprintf.c +EXTRA_DIST = \ + CMakeLists.txt \ + Makefile.vc \ + libport.h \ + snprintf.c + noinst_LTLIBRARIES = libport.la libport_la_SOURCES = dummy.c libport.h libport_la_LIBADD = @LTLIBOBJS@ diff --git a/test/Makefile.am b/test/Makefile.am index ee18045e..c51a8fa5 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -36,6 +36,7 @@ TESTS_ENVIRONMENT = \ EXTRA_DIST = \ $(TESTSCRIPTS) \ $(IMAGES_EXTRA_DIST) \ + CMakeLists.txt \ common.sh # All of the tests to execute via 'make check' diff --git a/test/Makefile.in b/test/Makefile.in index d2abbad1..e4ad3a70 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -640,6 +640,7 @@ TESTS_ENVIRONMENT = \ EXTRA_DIST = \ $(TESTSCRIPTS) \ $(IMAGES_EXTRA_DIST) \ + CMakeLists.txt \ common.sh diff --git a/tools/Makefile.am b/tools/Makefile.am index 6497f2dc..4a55cf5c 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -26,7 +26,9 @@ LIBPORT = $(top_builddir)/port/libport.la LIBTIFF = $(top_builddir)/libtiff/libtiff.la -EXTRA_DIST = Makefile.vc +EXTRA_DIST = \ + CMakeLists.txt \ + Makefile.vc bin_PROGRAMS = \ bmp2tiff \ diff --git a/tools/Makefile.in b/tools/Makefile.in index d49a9987..317b3922 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -457,7 +457,10 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ LIBPORT = $(top_builddir)/port/libport.la LIBTIFF = $(top_builddir)/libtiff/libtiff.la -EXTRA_DIST = Makefile.vc +EXTRA_DIST = \ + CMakeLists.txt \ + Makefile.vc + @HAVE_RPATH_TRUE@AM_LDFLAGS = $(LIBDIR) bmp2tiff_SOURCES = bmp2tiff.c bmp2tiff_LDADD = $(LIBTIFF) $(LIBPORT) |