[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=51594a9

The following commit has been merged in the master branch:
commit 51594a943dccb2edf508004c4bbfadc02537f12b
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Sep 23 04:33:01 2012 +0000

    #849: Make all source files dependent on exv_conf.h, removed code to create exv_conf.h from configure.ac
---
 config/configure.ac | 8 --------
 src/Makefile        | 9 ++-------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/config/configure.ac b/config/configure.ac
index 09459c3..e055afa 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -225,14 +225,6 @@ AC_CONFIG_FILES([./src/doxygen.hpp])
 AC_OUTPUT
 
 # ---------------------------------------------------------------------------
-# generate src/exv_conf.h
-# ---------------------------------------------------------------------------
-( pushd src 2>/dev/null
-  make exv_conf.h
-  popd
-) 2>/dev/null >/dev/null
-
-# ---------------------------------------------------------------------------
 # Configuration summary.
 # ---------------------------------------------------------------------------
 
diff --git a/src/Makefile b/src/Makefile
index 04786e3..31fb997 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -232,13 +232,8 @@ ifdef DEP_TRACKING
 -include $(DEP)
 endif
 
-# be sure to rewrite src/exv_conf.h (from config/config.h) before compiling almost anything!
-actions.cpp   basicio.cpp       bmpimage.cpp       convert.hpp  cr2image.cpp crwimage.cpp   epsimage.cpp      \
-exif.cpp      exiv2.cpp         futils.cpp         futils.hpp   gifimage.cpp image.cpp      jp2image.cpp      \
-jpgimage.cpp  localtime.c       makernote.cpp      mrwimage.cpp orfimage.cpp pgfimage.cpp   pngchunk.cpp      \
-pngimage.cpp  preview.cpp       psdimage.cpp       rafimage.cpp rw2image.cpp tgaimage.cpp   tiffcomposite.cpp \
-tiffimage.cpp tiffvisitor.cpp   types.hpp          utils.cpp    version.cpp  xmpsidecar.cpp \
-asfvideo.cpp  matroskavideo.cpp quicktimevideo.cpp riffvideo.cpp : exv_conf.h
+# Be sure to rewrite exv_conf.h before compiling anything
+$(SRC): exv_conf.h
 
 exv_conf.h: $(top_srcdir)/config/config.h
 	sed 's/#define \([A-Z]\)/#define EXV_
/; s/#undef \([A-Z]\)/#undef EXV_
/' < $< > $@

-- 
exiv2 packaging