Merged libtiff 4.0.3 changes into the trunk.

[wxWidgets.git] / src / tiff / libtiff / Makefile.am

diff --git a/src/tiff/libtiff/Makefile.am b/src/tiff/libtiff/Makefile.am
index a8780c7cf6c35f3fc9777422cf64e427b34be672..82fa31dc8fcd661fd6870f0a99683ffbb7d790b5 100644 (file)
--- a/src/tiff/libtiff/Makefile.am
+++ b/src/tiff/libtiff/Makefile.am
@@ -25,28 +25,39 @@
 
 LIBPORT = $(top_builddir)/port/libport.la
 LIBTIFF = $(top_builddir)/libtiff/libtiff.la
+libtiffincludedir = $(includedir)
 
-EXTRA_DIST = Makefile.vc SConstruct tif_config.h.vc tiffconf.h.vc libtiff.def \
-            $(EXTRA_SRCS)
-
-HDRS = \
+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
+
+libtiffinclude_HEADERS = \
        tiff.h \
-        tiffconf.h \
        tiffio.h \
        tiffvers.h
 
 if HAVE_CXX
-HDRS +=        tiffio.hxx
+libtiffinclude_HEADERS += tiffio.hxx
 endif
 
-EXTRA_HDRS = \
+noinst_HEADERS = \
        t4.h \
        tif_dir.h \
        tif_predict.h \
        tiffiop.h \
        uvcode.h
 
-SRCS = \
+nodist_libtiffinclude_HEADERS = \
+       tiffconf.h
+
+libtiff_la_SOURCES = \
        tif_aux.c \
        tif_close.c \
        tif_codec.c \
@@ -63,8 +74,11 @@ SRCS = \
        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 \
@@ -78,49 +92,47 @@ SRCS = \
        tif_swab.c \
        tif_thunder.c \
        tif_tile.c \
-       tif_unix.c \
        tif_version.c \
        tif_warning.c \
        tif_write.c \
        tif_zip.c
 
-SRCSXX = \
+libtiffxx_la_SOURCES = \
        tif_stream.cxx
 
-EXTRA_SRCS = \
-       tif_acorn.c \
-       tif_apple.c \
-       tif_atari.c \
-       tif_msdos.c \
-       tif_next.c \
-       tif_win3.c \
-       tif_win32.c
-
-libtiffincludedir = $(includedir)
-libtiffinclude_HEADERS = $(HDRS)
-noinst_HEADERS = $(EXTRA_HDRS)
+if WIN32_IO
+EXTRA_DIST += tif_unix.c
+libtiff_la_SOURCES += tif_win32.c
+else
+EXTRA_DIST += tif_win32.c
+libtiff_la_SOURCES += tif_unix.c
+endif
 
 lib_LTLIBRARIES = libtiff.la
 if HAVE_CXX
 lib_LTLIBRARIES += libtiffxx.la
 endif
 
-libtiff_la_SOURCES = $(SRCS)
 libtiff_la_LDFLAGS = \
        -no-undefined \
-       -version-number $(LIBTIFF_VERSION_INFO)
+       -version-info $(LIBTIFF_VERSION_INFO)
 if HAVE_RPATH
 libtiff_la_LDFLAGS += $(LIBDIR)
 endif
+if HAVE_LD_VERSION_SCRIPT
+libtiff_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libtiff.map
+endif
 libtiff_la_LIBADD = $(LIBPORT)
 
-libtiffxx_la_SOURCES = $(SRCSXX)
 libtiffxx_la_LDFLAGS = \
        -no-undefined \
-       -version-number $(LIBTIFF_VERSION_INFO)
+       -version-info $(LIBTIFF_VERSION_INFO)
 if HAVE_RPATH
 libtiffxx_la_LDFLAGS += $(LIBDIR)
 endif
+if HAVE_LD_VERSION_SCRIPT
+libtiffxx_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libtiffxx.map
+endif
 libtiffxx_la_LIBADD = $(LIBTIFF) $(LIBPORT)
 libtiffxx_la_DEPENDENCIES = libtiff.la