[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=1ca6ae1

The following commit has been merged in the master branch:
commit 1ca6ae13bcba0c9efd6cfcd7de2c65999016cd38
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat May 9 12:17:58 2015 +0000

    Minor changes to the exiv2json build
---
 samples/Makefile | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/samples/Makefile b/samples/Makefile
index 1bc2f8c..fb6e74f 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -55,6 +55,7 @@ include $(top_srcdir)/config/config.mk
 
 # Add source files of sample programs to this list
 BINSRC = addmoddel.cpp        \
+         conntest.cpp         \
          convert-test.cpp     \
          easyaccess-test.cpp  \
          exifcomment.cpp      \
@@ -62,7 +63,6 @@ BINSRC = addmoddel.cpp        \
          exifdata.cpp         \
          exifprint.cpp        \
          exifvalue.cpp        \
-         exiv2json.cpp        \
          httptest.cpp         \
          iotest.cpp           \
          iptceasy.cpp         \
@@ -72,6 +72,7 @@ BINSRC = addmoddel.cpp        \
          largeiptc-test.cpp   \
          mmap-test.cpp        \
          prevtest.cpp         \
+         remotetest.cpp       \
          stringto-test.cpp    \
          taglist.cpp          \
          tiff-test.cpp        \
@@ -83,7 +84,8 @@ BINSRC = addmoddel.cpp        \
          xmpsample.cpp
 
 # Samples that need special treatment during compilation or linking
-OTHERSRC = geotag.cpp         \
+OTHERSRC = exiv2json.cpp      \
+           geotag.cpp         \
            metacopy.cpp       \
            path-test.cpp
 
@@ -132,6 +134,11 @@ $(BINARY): %: %.o
 	mkdir -pv ../bin 2>&1 > /dev/null
 	$(LIBTOOL) --mode=link $(LINK.cc) -o ../bin/$@ $@.o
 
+%.o: %.cpp
+	$(COMPILE.cc) -o $@ $<
+	@$(MAKEDEPEND)
+	@$(POSTDEPEND)
+
 %.ii: %.cpp
 	set -e; \
 	$(CXXCPP) -E $(CPPFLAGS) $< | sed '/^[ 	]*$$/d' > $@
@@ -161,12 +168,12 @@ metacopy path-test: %: %.cpp ../src/utils.o
 	@$(POSTDEPEND)
 	$(LIBTOOL) --mode=link $(LINK.cc) $@.o ../src/utils.o -o ../bin/$@
 
-# link applications which require Jzon.cpp support
-exiv2json: %: %.cpp ../samples/Jzon.o
-	$(COMPILE.cc) -I. -o $@.o $<
+# exiv2json sample requires Jzon
+exiv2json: %: %.cpp Jzon.o
+	$(COMPILE.cc) -o $@.o $<
 	@$(MAKEDEPEND)
 	@$(POSTDEPEND)
-	$(LIBTOOL) --mode=link $(LINK.cc) $@.o ../samples/Jzon.o -o ../bin/$@
+	$(LIBTOOL) --mode=link $(LINK.cc) Jzon.o $@.o -o ../bin/$@
 
 # Remove binaries, e.g., to relink them
 binclean:

-- 
exiv2 packaging