GraphicsMagick: Update other libtiff related files.
GraphicsMagick Commits <[email protected]>
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.25976.1670061648.1459.graphicsmagick-commit@lists.sourceforge.net> |
changeset d4192d2958fd in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=d4192d2958fd
summary: Update other libtiff related files.
diffstat:
tiff/libtiff/CMakeLists.txt | 233 ++++++++++++++++++++++-------------
tiff/libtiff/Makefile.am | 20 +-
tiff/libtiff/Makefile.in | 104 ++++++++--------
tiff/libtiff/libtiff.def | 13 +-
tiff/libtiff/tif_config.h.cmake.in | 148 +++++-----------------
tiff/libtiff/tif_config.h.in | 235 ++----------------------------------
tiff/libtiff/tiffconf.h.cmake.in | 24 ++-
tiff/libtiff/tiffconf.h.in | 19 ++-
8 files changed, 304 insertions(+), 492 deletions(-)
diffs (truncated from 1277 to 500 lines):
diff -r 3ad6ff7604bd -r d4192d2958fd tiff/libtiff/CMakeLists.txt
--- a/tiff/libtiff/CMakeLists.txt Sat Dec 03 01:28:31 2022 +0100
+++ b/tiff/libtiff/CMakeLists.txt Sat Dec 03 10:59:46 2022 +0100
@@ -30,97 +30,132 @@
${CMAKE_CURRENT_BINARY_DIR}/tiffconf.h
@ONLY)
-extra_dist(
- 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)
+set(tiff_public_HEADERS
+ tiff.h
+ tiffio.h
+ tiffvers.h
+ ${CMAKE_CURRENT_BINARY_DIR}/tiffconf.h)
-set(tiff_HEADERS
- tiff.h
- tiffio.h
- tiffvers.h)
+set(tiff_private_HEADERS
+ t4.h
+ tif_dir.h
+ tif_predict.h
+ tiffiop.h
+ uvcode.h
+ ${CMAKE_CURRENT_BINARY_DIR}/tif_config.h)
-set(tiff_noinst_HEADERS
- t4.h
- tif_dir.h
- tif_predict.h
- tiffiop.h
- uvcode.h)
-set(nodist_tiff_HEADERS
- ${CMAKE_CURRENT_BINARY_DIR}/tiffconf.h)
+add_library(tiff libtiff.def)
-set(tiff_SOURCES
- tif_aux.c
- tif_close.c
- tif_codec.c
- tif_color.c
- tif_compress.c
- tif_dir.c
- tif_dirinfo.c
- tif_dirread.c
- tif_dirwrite.c
- tif_dumpmode.c
- tif_error.c
- tif_extension.c
- tif_fax3.c
- tif_fax3sm.c
- tif_flush.c
- tif_getimage.c
- tif_jbig.c
- tif_jpeg.c
- tif_jpeg_12.c
- tif_luv.c
- tif_lzma.c
- tif_lzw.c
- tif_next.c
- tif_ojpeg.c
- tif_open.c
- tif_packbits.c
- tif_pixarlog.c
- tif_predict.c
- tif_print.c
- tif_read.c
- tif_strip.c
- tif_swab.c
- tif_thunder.c
- tif_tile.c
- tif_version.c
- tif_warning.c
- tif_webp.c
- tif_write.c
- tif_zip.c
- tif_zstd.c)
-
-set(tiffxx_HEADERS
- tiffio.hxx)
-
-set(tiffxx_SOURCES
- tif_stream.cxx)
+target_sources(tiff PRIVATE
+ ${tiff_public_HEADERS}
+ ${tiff_private_HEADERS}
+ tif_aux.c
+ tif_close.c
+ tif_codec.c
+ tif_color.c
+ tif_compress.c
+ tif_dir.c
+ tif_dirinfo.c
+ tif_dirread.c
+ tif_dirwrite.c
+ tif_dumpmode.c
+ tif_error.c
+ tif_extension.c
+ tif_fax3.c
+ tif_fax3sm.c
+ tif_flush.c
+ tif_getimage.c
+ tif_jbig.c
+ tif_jpeg.c
+ tif_jpeg_12.c
+ tif_lerc.c
+ tif_luv.c
+ tif_lzma.c
+ tif_lzw.c
+ tif_next.c
+ tif_ojpeg.c
+ tif_open.c
+ tif_packbits.c
+ tif_pixarlog.c
+ tif_predict.c
+ tif_print.c
+ tif_read.c
+ tif_strip.c
+ tif_swab.c
+ tif_thunder.c
+ tif_tile.c
+ tif_version.c
+ tif_warning.c
+ tif_webp.c
+ tif_write.c
+ tif_zip.c
+ tif_zstd.c)
if(USE_WIN32_FILEIO)
- extra_dist(tif_unix.c)
- list(APPEND tiff_SOURCES tif_win32.c)
+ target_sources(tiff PRIVATE tif_win32.c)
else()
- extra_dist(tif_win32.c)
- list(APPEND tiff_SOURCES tif_unix.c)
+ target_sources(tiff PRIVATE tif_unix.c)
endif()
-add_library(tiff ${tiff_SOURCES} ${tiff_HEADERS} ${nodist_tiff_HEADERS}
- ${tiff_port_SOURCES} libtiff.def)
target_include_directories(tiff
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+ PRIVATE
${TIFF_INCLUDES}
)
-target_link_libraries(tiff ${TIFF_LIBRARY_DEPS})
+
+set(tiff_libs_private_list "") # cmake list
+set(tiff_requires_private "") # cmake string
+
+if(ZIP_SUPPORT)
+ target_link_libraries(tiff PRIVATE ZLIB::ZLIB)
+ string(APPEND tiff_requires_private " zlib")
+endif()
+if(ZIP_SUPPORT AND LIBDEFLATE_SUPPORT)
+ target_link_libraries(tiff PRIVATE Deflate::Deflate)
+ list(APPEND tiff_libs_private_list "${Deflate_LIBRARY}")
+endif()
+if(JPEG_SUPPORT)
+ target_link_libraries(tiff PRIVATE JPEG::JPEG)
+ string(APPEND tiff_requires_private " libjpeg")
+ if(JPEG_DUAL_MODE_8_12)
+ target_include_directories(tiff PRIVATE ${JPEG12_INCLUDE_DIR})
+ target_link_libraries(tiff PRIVATE ${JPEG12_LIBRARIES})
+ endif()
+endif()
+if(JBIG_SUPPORT)
+ target_link_libraries(tiff PRIVATE JBIG::JBIG)
+ list(APPEND tiff_libs_private_list "${JBIG_LIBRARY}")
+endif()
+if(LERC_SUPPORT)
+ target_link_libraries(tiff PRIVATE LERC::LERC)
+ list(APPEND tiff_libs_private_list "${LERC_LIBRARY}")
+ if(NOT BUILD_SHARED_LIBS)
+ set_target_properties(tiff PROPERTIES COMPILE_DEFINITIONS LERC_STATIC)
+ endif()
+endif()
+if(LZMA_SUPPORT)
+ target_link_libraries(tiff PRIVATE LibLZMA::LibLZMA)
+ string(APPEND tiff_requires_private " liblzma")
+endif()
+if(ZSTD_SUPPORT)
+ target_link_libraries(tiff PRIVATE ZSTD::ZSTD)
+ string(APPEND tiff_requires_private " libzstd")
+endif()
+if(WEBP_SUPPORT)
+ target_link_libraries(tiff PRIVATE WebP::WebP)
+ string(APPEND tiff_requires_private " libwebp")
+endif()
+target_link_libraries(tiff PRIVATE CMath::CMath)
+if(CMath_LIBRARY)
+ list(APPEND tiff_libs_private_list "${CMath_LIBRARY}")
+endif()
+
+set(tiff_libs_private_list "${tiff_libs_private_list}" PARENT_SCOPE)
+set(tiff_requires_private "${tiff_requires_private}" PARENT_SCOPE)
+
set_target_properties(tiff PROPERTIES SOVERSION ${SO_COMPATVERSION})
if(NOT CYGWIN)
# This property causes shared libraries on Linux to have the full version
@@ -134,16 +169,30 @@
"-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libtiff.map")
endif()
-install(TARGETS tiff
- RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
- LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
+export(TARGETS tiff NAMESPACE TIFF:: FILE "${CMAKE_CURRENT_BINARY_DIR}/libtiffTargets.cmake")
+install(TARGETS tiff EXPORT TiffTargets
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-install(FILES ${tiff_HEADERS} ${nodist_tiff_HEADERS}
- DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
+install(FILES ${tiff_public_HEADERS}
+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+
+set(TIFF_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/tiff)
+install(EXPORT TiffTargets
+ FILE TiffTargets.cmake
+ NAMESPACE TIFF::
+ DESTINATION ${TIFF_CONFIGDIR}
+)
if(CXX_SUPPORT)
- add_library(tiffxx ${tiffxx_SOURCES} ${tiffxx_HEADERS})
+ set(tiffxx_HEADERS
+ tiffio.hxx)
+
+ add_library(tiffxx ../placeholder.h)
+ target_sources(tiffxx PRIVATE
+ ${tiffxx_HEADERS}
+ tif_stream.cxx)
target_link_libraries(tiffxx tiff)
set_target_properties(tiffxx PROPERTIES SOVERSION ${SO_COMPATVERSION})
if(NOT CYGWIN)
@@ -159,11 +208,21 @@
endif()
install(TARGETS tiffxx
- RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
- LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(FILES ${tiffxx_HEADERS}
- DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
endif()
+
+add_executable(mkg3states ../placeholder.h)
+target_sources(mkg3states PRIVATE mkg3states.c tif_fax3.h)
+target_link_libraries(mkg3states tiff port)
+
+add_custom_target(faxtable
+ DEPENDS mkg3states
+ COMMAND ${CMAKE_COMMAND} -E rm "tif_fax3sm.c"
+ COMMAND mkg3states -b -c const "tif_fax3sm.c"
+ WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
diff -r 3ad6ff7604bd -r d4192d2958fd tiff/libtiff/Makefile.am
--- a/tiff/libtiff/Makefile.am Sat Dec 03 01:28:31 2022 +0100
+++ b/tiff/libtiff/Makefile.am Sat Dec 03 10:59:46 2022 +0100
@@ -29,18 +29,11 @@
EXTRA_DIST = \
CMakeLists.txt \
- Makefile.vc \
- SConstruct \
libtiff.def \
libtiff.map \
libtiffxx.map \
- tif_config.h-vms \
tif_config.h.cmake.in \
- tif_config.vc.h \
- tif_config.wince.h \
- tiffconf.h.cmake.in \
- tiffconf.vc.h \
- tiffconf.wince.h
+ tiffconf.h.cmake.in
libtiffinclude_HEADERS = \
tiff.h \
@@ -81,6 +74,7 @@
tif_jbig.c \
tif_jpeg.c \
tif_jpeg_12.c \
+ tif_lerc.c \
tif_luv.c \
tif_lzma.c \
tif_lzw.c \
@@ -128,7 +122,6 @@
if HAVE_LD_VERSION_SCRIPT
libtiff_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libtiff.map
endif
-libtiff_la_LIBADD = $(LIBPORT)
libtiffxx_la_LDFLAGS = \
-no-undefined \
@@ -139,7 +132,7 @@
if HAVE_LD_VERSION_SCRIPT
libtiffxx_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libtiffxx.map
endif
-libtiffxx_la_LIBADD = $(LIBTIFF) $(LIBPORT)
+libtiffxx_la_LIBADD = $(LIBTIFF)
libtiffxx_la_DEPENDENCIES = libtiff.la
#
@@ -154,3 +147,10 @@
faxtable: mkg3states
(rm -f tif_fax3sm.c && ./mkg3states -b -c const tif_fax3sm.c)
+if STATIC_LERC
+extra_CPPFLAGS = -DLERC_STATIC
+else
+extra_CPPFLAGS =
+endif
+
+AM_CPPFLAGS = -I$(top_srcdir)/libtiff -I$(top_srcdir)/port $(extra_CPPFLAGS)
diff -r 3ad6ff7604bd -r d4192d2958fd tiff/libtiff/Makefile.in
--- a/tiff/libtiff/Makefile.in Sat Dec 03 01:28:31 2022 +0100
+++ b/tiff/libtiff/Makefile.in Sat Dec 03 10:59:46 2022 +0100
@@ -137,7 +137,8 @@
DIST_COMMON = $(srcdir)/Makefile.am $(am__libtiffinclude_HEADERS_DIST) \
$(noinst_HEADERS) $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = tif_config.h tiffconf.h
+CONFIG_HEADER = $(top_builddir)/config/config.h tif_config.h \
+ tiffconf.h $(top_builddir)/port/libport_config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
PROGRAMS = $(noinst_PROGRAMS)
@@ -172,17 +173,17 @@
"$(DESTDIR)$(libtiffincludedir)" \
"$(DESTDIR)$(libtiffincludedir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
-libtiff_la_DEPENDENCIES = $(LIBPORT)
+libtiff_la_LIBADD =
am__libtiff_la_SOURCES_DIST = tif_aux.c tif_close.c tif_codec.c \
tif_color.c tif_compress.c tif_dir.c tif_dirinfo.c \
tif_dirread.c tif_dirwrite.c tif_dumpmode.c tif_error.c \
tif_extension.c tif_fax3.c tif_fax3sm.c tif_flush.c \
- tif_getimage.c tif_jbig.c tif_jpeg.c tif_jpeg_12.c tif_luv.c \
- tif_lzma.c tif_lzw.c tif_next.c tif_ojpeg.c tif_open.c \
- tif_packbits.c tif_pixarlog.c tif_predict.c tif_print.c \
- tif_read.c tif_strip.c tif_swab.c tif_thunder.c tif_tile.c \
- tif_version.c tif_warning.c tif_webp.c tif_write.c tif_zip.c \
- tif_zstd.c tif_win32.c tif_unix.c
+ tif_getimage.c tif_jbig.c tif_jpeg.c tif_jpeg_12.c tif_lerc.c \
+ tif_luv.c tif_lzma.c tif_lzw.c tif_next.c tif_ojpeg.c \
+ tif_open.c tif_packbits.c tif_pixarlog.c tif_predict.c \
+ tif_print.c tif_read.c tif_strip.c tif_swab.c tif_thunder.c \
+ tif_tile.c tif_version.c tif_warning.c tif_webp.c tif_write.c \
+ tif_zip.c tif_zstd.c tif_win32.c tif_unix.c
@WIN32_IO_TRUE@am__objects_1 = tif_win32.lo
@WIN32_IO_FALSE@am__objects_2 = tif_unix.lo
am_libtiff_la_OBJECTS = tif_aux.lo tif_close.lo tif_codec.lo \
@@ -190,11 +191,11 @@
tif_dirread.lo tif_dirwrite.lo tif_dumpmode.lo tif_error.lo \
tif_extension.lo tif_fax3.lo tif_fax3sm.lo tif_flush.lo \
tif_getimage.lo tif_jbig.lo tif_jpeg.lo tif_jpeg_12.lo \
- tif_luv.lo tif_lzma.lo tif_lzw.lo tif_next.lo tif_ojpeg.lo \
- tif_open.lo tif_packbits.lo tif_pixarlog.lo tif_predict.lo \
- tif_print.lo tif_read.lo tif_strip.lo tif_swab.lo \
- tif_thunder.lo tif_tile.lo tif_version.lo tif_warning.lo \
- tif_webp.lo tif_write.lo tif_zip.lo tif_zstd.lo \
+ tif_lerc.lo tif_luv.lo tif_lzma.lo tif_lzw.lo tif_next.lo \
+ tif_ojpeg.lo tif_open.lo tif_packbits.lo tif_pixarlog.lo \
+ tif_predict.lo tif_print.lo tif_read.lo tif_strip.lo \
+ tif_swab.lo tif_thunder.lo tif_tile.lo tif_version.lo \
+ tif_warning.lo tif_webp.lo tif_write.lo tif_zip.lo tif_zstd.lo \
$(am__objects_1) $(am__objects_2)
libtiff_la_OBJECTS = $(am_libtiff_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
@@ -225,7 +226,7 @@
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
-DEFAULT_INCLUDES = -I.@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/config -I$(top_builddir)/port
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__maybe_remake_depfiles = depfiles
am__depfiles_remade = ./$(DEPDIR)/mkg3states.Po \
@@ -238,19 +239,19 @@
./$(DEPDIR)/tif_fax3.Plo ./$(DEPDIR)/tif_fax3sm.Plo \
./$(DEPDIR)/tif_flush.Plo ./$(DEPDIR)/tif_getimage.Plo \
./$(DEPDIR)/tif_jbig.Plo ./$(DEPDIR)/tif_jpeg.Plo \
- ./$(DEPDIR)/tif_jpeg_12.Plo ./$(DEPDIR)/tif_luv.Plo \
- ./$(DEPDIR)/tif_lzma.Plo ./$(DEPDIR)/tif_lzw.Plo \
- ./$(DEPDIR)/tif_next.Plo ./$(DEPDIR)/tif_ojpeg.Plo \
- ./$(DEPDIR)/tif_open.Plo ./$(DEPDIR)/tif_packbits.Plo \
- ./$(DEPDIR)/tif_pixarlog.Plo ./$(DEPDIR)/tif_predict.Plo \
- ./$(DEPDIR)/tif_print.Plo ./$(DEPDIR)/tif_read.Plo \
- ./$(DEPDIR)/tif_stream.Plo ./$(DEPDIR)/tif_strip.Plo \
- ./$(DEPDIR)/tif_swab.Plo ./$(DEPDIR)/tif_thunder.Plo \
- ./$(DEPDIR)/tif_tile.Plo ./$(DEPDIR)/tif_unix.Plo \
- ./$(DEPDIR)/tif_version.Plo ./$(DEPDIR)/tif_warning.Plo \
- ./$(DEPDIR)/tif_webp.Plo ./$(DEPDIR)/tif_win32.Plo \
- ./$(DEPDIR)/tif_write.Plo ./$(DEPDIR)/tif_zip.Plo \
- ./$(DEPDIR)/tif_zstd.Plo
+ ./$(DEPDIR)/tif_jpeg_12.Plo ./$(DEPDIR)/tif_lerc.Plo \
+ ./$(DEPDIR)/tif_luv.Plo ./$(DEPDIR)/tif_lzma.Plo \
+ ./$(DEPDIR)/tif_lzw.Plo ./$(DEPDIR)/tif_next.Plo \
+ ./$(DEPDIR)/tif_ojpeg.Plo ./$(DEPDIR)/tif_open.Plo \
+ ./$(DEPDIR)/tif_packbits.Plo ./$(DEPDIR)/tif_pixarlog.Plo \
+ ./$(DEPDIR)/tif_predict.Plo ./$(DEPDIR)/tif_print.Plo \
+ ./$(DEPDIR)/tif_read.Plo ./$(DEPDIR)/tif_stream.Plo \
+ ./$(DEPDIR)/tif_strip.Plo ./$(DEPDIR)/tif_swab.Plo \
+ ./$(DEPDIR)/tif_thunder.Plo ./$(DEPDIR)/tif_tile.Plo \
+ ./$(DEPDIR)/tif_unix.Plo ./$(DEPDIR)/tif_version.Plo \
+ ./$(DEPDIR)/tif_warning.Plo ./$(DEPDIR)/tif_webp.Plo \
+ ./$(DEPDIR)/tif_win32.Plo ./$(DEPDIR)/tif_write.Plo \
+ ./$(DEPDIR)/tif_zip.Plo ./$(DEPDIR)/tif_zstd.Plo
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -463,23 +464,23 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
tiff_libs_private = @tiff_libs_private@
+tiff_requires_private = @tiff_requires_private@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
LIBPORT = $(top_builddir)/port/libport.la
LIBTIFF = $(top_builddir)/libtiff/libtiff.la
libtiffincludedir = $(includedir)
-EXTRA_DIST = CMakeLists.txt Makefile.vc SConstruct libtiff.def \
- libtiff.map libtiffxx.map tif_config.h-vms \
- tif_config.h.cmake.in tif_config.vc.h tif_config.wince.h \
- tiffconf.h.cmake.in tiffconf.vc.h tiffconf.wince.h \
- $(am__append_2) $(am__append_4)
+EXTRA_DIST = CMakeLists.txt libtiff.def libtiff.map libtiffxx.map \
+ tif_config.h.cmake.in tiffconf.h.cmake.in $(am__append_2) \
+ $(am__append_4)
libtiffinclude_HEADERS = tiff.h tiffio.h tiffvers.h $(am__append_1)
noinst_HEADERS = \
t4.h \
@@ -495,8 +496,8 @@
tif_compress.c tif_dir.c tif_dirinfo.c tif_dirread.c \
tif_dirwrite.c tif_dumpmode.c tif_error.c tif_extension.c \
tif_fax3.c tif_fax3sm.c tif_flush.c tif_getimage.c tif_jbig.c \
- tif_jpeg.c tif_jpeg_12.c tif_luv.c tif_lzma.c tif_lzw.c \
- tif_next.c tif_ojpeg.c tif_open.c tif_packbits.c \
+ tif_jpeg.c tif_jpeg_12.c tif_lerc.c tif_luv.c tif_lzma.c \
+ tif_lzw.c tif_next.c tif_ojpeg.c tif_open.c tif_packbits.c \
tif_pixarlog.c tif_predict.c tif_print.c tif_read.c \
tif_strip.c tif_swab.c tif_thunder.c tif_tile.c tif_version.c \
tif_warning.c tif_webp.c tif_write.c tif_zip.c tif_zstd.c \
@@ -507,13 +508,15 @@
lib_LTLIBRARIES = libtiff.la $(am__append_6)
libtiff_la_LDFLAGS = -no-undefined -version-info \
$(LIBTIFF_VERSION_INFO) $(am__append_7) $(am__append_8)
-libtiff_la_LIBADD = $(LIBPORT)
libtiffxx_la_LDFLAGS = -no-undefined -version-info \
$(LIBTIFF_VERSION_INFO) $(am__append_9) $(am__append_10)
-libtiffxx_la_LIBADD = $(LIBTIFF) $(LIBPORT)
+libtiffxx_la_LIBADD = $(LIBTIFF)
libtiffxx_la_DEPENDENCIES = libtiff.la
mkg3states_SOURCES = mkg3states.c tif_fax3.h
mkg3states_LDADD = $(LIBPORT)
+@STATIC_LERC_FALSE@extra_CPPFLAGS =
+@STATIC_LERC_TRUE@extra_CPPFLAGS = -DLERC_STATIC
+AM_CPPFLAGS = -I$(top_srcdir)/libtiff -I$(top_srcdir)/port $(extra_CPPFLAGS)
all: tif_config.h tiffconf.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -549,28 +552,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-tif_config.h: stamp-h1
- @test -f $@ || rm -f stamp-h1
- @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
-
-stamp-h1: $(srcdir)/tif_config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1