[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=5c6a8e3

The following commit has been merged in the master branch:
commit 5c6a8e3bad3c1ac7d473ece7470f394338cec190
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Oct 5 09:06:56 2016 +0000

    #1230 Buildserver Maintenance.
---
 samples/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/Makefile b/samples/Makefile
index 407f55b..ede6a5f 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -161,28 +161,28 @@ relink: binclean samples
 
 # link expat directly to geotag
 geotag: %: %.cpp
-	$(COMPILE.cc) -o $@.o $<
+	$(COMPILE.cc) -I../src -I../include -I../include/exiv2 -I/usr/local/include -I/usr/include -o $@.o $<
 	@$(MAKEDEPEND)
 	@$(POSTDEPEND)
 	$(LIBTOOL) --mode=link $(LINK.cc) -lexpat $@.o -o ../bin/$@
 
 # link applications which require utils.cpp support
 metacopy path-test toexv: %: %.cpp ../src/utils.o
-	$(COMPILE.cc) -I../src -I../include -I../include/exiv2 -o $@.o $<
+	$(COMPILE.cc) -I../src -I../include -I../include/exiv2 -I/usr/local/include -I/usr/include -o $@.o $<
 	@$(MAKEDEPEND)
 	@$(POSTDEPEND)
 	$(LIBTOOL) --mode=link $(LINK.cc) $@.o ../src/utils.o -o ../bin/$@
 
 # exiv2json sample requires Jzon
 exiv2json: %: %.cpp Jzon.o
-	$(COMPILE.cc) -o $@.o $<
+	$(COMPILE.cc) -I../src -I../include -I../include/exiv2 -I/usr/local/include -I/usr/include -o $@.o $<
 	@$(MAKEDEPEND)
 	@$(POSTDEPEND)
 	$(LIBTOOL) --mode=link $(LINK.cc) Jzon.o $@.o -o ../bin/$@
 
 # mt-test requires C++11
 mt-test: %: %.cpp
-	$(COMPILE.cc) -std=c++11  -o $@.o $<
+	$(COMPILE.cc) -std=c++11 -I../src -I../include -I../include/exiv2 -I/usr/local/include -I/usr/include -o $@.o $<
 	@$(MAKEDEPEND)
 	@$(POSTDEPEND)
 	$(LIBTOOL) --mode=link $(LINK.cc) $@.o -o ../bin/$@

-- 
exiv2 packaging