[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=740ec9f

The following commit has been merged in the master branch:
commit 740ec9fa8b6bb407e1fa9b6f78560e326855d264
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Nov 4 20:58:39 2012 +0000

    Fix to samples/Makefile to eliminate warnings about "change in recipe" for geotag/metacopy/path-test
---
 samples/Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/samples/Makefile b/samples/Makefile
index b41163a..e69a7b4 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -60,16 +60,13 @@ BINSRC = addmoddel.cpp        \
          exifcomment.cpp      \
          exifdata-test.cpp    \
          exifprint.cpp        \
-         geotag.cpp           \
          iotest.cpp           \
          iptceasy.cpp         \
          iptcprint.cpp        \
          iptctest.cpp         \
          key-test.cpp         \
          largeiptc-test.cpp   \
-         metacopy.cpp         \
          mmap-test.cpp        \
-         path-test.cpp        \
          prevtest.cpp         \
          stringto-test.cpp    \
          taglist.cpp          \
@@ -131,14 +128,17 @@ endif
 relink: binclean samples
 
 # link expat directly to geotag
-geotag : geotag.o
+geotag : geotag.cpp
+	$(COMPILE.cc) -I../src -o $@.o $<
 	$(LIBTOOL)  --mode=link $(LINK.cc) -lexpat $@.o -o ../bin/$@ 
 
 # link applications which require utils.cpp support
-metacopy: metacopy.o ../src/utils.o
+metacopy: metacopy.cpp ../src/utils.o
+	$(COMPILE.cc) -I../src -o $@.o $<
 	$(LIBTOOL)  --mode=link $(LINK.cc) $@.o ../src/utils.o -o ../bin/$@
 
-path-test: path-test.o ../src/utils.o
+path-test: path-test.cpp ../src/utils.o
+	$(COMPILE.cc) -I../src -o $@.o $<
 	$(LIBTOOL)  --mode=link $(LINK.cc) $@.o ../src/utils.o -o ../bin/$@
 
 # Remove binaries, e.g., to relink them

-- 
exiv2 packaging