libtiff: Do not distribute tiffconf.h, remove tif_config.h/tiffconf.h during

From d6d625459093e9998c0c2c1a73655e847b3bd961 Mon Sep 17 00:00:00 2001
From: Andrey Kiselev <[EMAIL REDACTED]>
Date: Wed, 18 Jul 2007 14:30:05 +0000
Subject: [PATCH] Do not distribute tiffconf.h, remove tif_config.h/tiffconf.h
 during cleaning. As per bug
 http://bugzilla.remotesensing.org/show_bug.cgi?id=1573

---
 libtiff/Makefile.am | 23 +++++++++++------------
 libtiff/Makefile.vc |  3 ++-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/libtiff/Makefile.am b/libtiff/Makefile.am
index 901411b4..b918bb95 100644
--- a/libtiff/Makefile.am
+++ b/libtiff/Makefile.am
@@ -25,33 +25,38 @@
 
 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 \
 	     $(EXTRA_SRCS)
 
-HDRS = \
+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 \
@@ -90,7 +95,7 @@ SRCS = \
 	tif_write.c \
 	tif_zip.c
 
-SRCSXX = \
+libtiffxx_la_SOURCES = \
 	tif_stream.cxx
 
 EXTRA_SRCS = \
@@ -102,16 +107,11 @@ EXTRA_SRCS = \
 	tif_win3.c \
 	tif_win32.c
 
-libtiffincludedir = $(includedir)
-libtiffinclude_HEADERS = $(HDRS)
-noinst_HEADERS = $(EXTRA_HDRS)
-
 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)
@@ -120,7 +120,6 @@ libtiff_la_LDFLAGS += $(LIBDIR)
 endif
 libtiff_la_LIBADD = $(LIBPORT)
 
-libtiffxx_la_SOURCES = $(SRCSXX)
 libtiffxx_la_LDFLAGS = \
 	-no-undefined \
 	-version-number $(LIBTIFF_VERSION_INFO)
diff --git a/libtiff/Makefile.vc b/libtiff/Makefile.vc
index 001e3445..2d5b52a5 100644
--- a/libtiff/Makefile.vc
+++ b/libtiff/Makefile.vc
@@ -1,4 +1,4 @@
-# $Id: Makefile.vc,v 1.17.2.1 2007-04-06 14:18:47 dron Exp $
+# $Id: Makefile.vc,v 1.17.2.2 2007-07-18 14:30:05 dron Exp $
 #
 # Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>
 #
@@ -94,6 +94,7 @@ $(DLLNAME):	tif_config.h tiffconf.h libtiff.def $(OBJ)
 	/implib:libtiff_i.lib $(OBJ) $(LIBS)
 	
 clean:
+	-del tif_config.h tiffconf.h
 	-del *.obj
 	-del *.lib
 	-del *.dll