[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=8896c99

The following commit has been merged in the master branch:
commit 8896c99005a7302482bcb08b345baeb7f39f8ab7
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Oct 10 14:52:00 2007 +0000

    Moved taglist.cpp back to src/ to make doc build easier.
---
 Makefile                     | 5 +----
 config/Makefile.in           | 5 +----
 doc/templates/Makefile       | 4 ++--
 samples/Makefile             | 1 -
 src/Makefile                 | 2 +-
 {samples => src}/taglist.cpp | 8 ++++----
 6 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 70ff158..bd84f22 100644
--- a/Makefile
+++ b/Makefile
@@ -64,15 +64,12 @@ uninstall: config/config.mk
 	cd src && $(MAKE) $(MAKECMDGOALS)
 	cd po && $(MAKE) $(MAKECMDGOALS)
 
-doc: config/config.mk taglist
+doc: config/config.mk
 	cd doc && $(MAKE) $(MAKECMDGOALS)
 
 samples: config/config.mk
 	cd samples && $(MAKE) $(MAKECMDGOALS)
 
-taglist: config/config.mk
-	cd samples && $(MAKE) $@
-
 config:
 	cd config && $(MAKE) -f config.make $(MAKECMDGOALS)
 
diff --git a/config/Makefile.in b/config/Makefile.in
index 2878a64..0560f04 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -64,15 +64,12 @@ uninstall: config/config.mk
 	cd src && $(MAKE) $(MAKECMDGOALS)
 	cd po && $(MAKE) $(MAKECMDGOALS)
 
-doc: config/config.mk taglist
+doc: config/config.mk
 	cd doc && $(MAKE) $(MAKECMDGOALS)
 
 samples: config/config.mk
 	cd samples && $(MAKE) $(MAKECMDGOALS)
 
-taglist: config/config.mk
-	cd samples && $(MAKE) $@
-
 config:
 	cd config && $(MAKE) -f config.make $(MAKECMDGOALS)
 
diff --git a/doc/templates/Makefile b/doc/templates/Makefile
index 2be91cf..3af2cfb 100644
--- a/doc/templates/Makefile
+++ b/doc/templates/Makefile
@@ -56,7 +56,7 @@ TABLES = Exif \
          Sigma \
          Sony
 
-TAGLIST = ../../samples/taglist
+TAGLIST = ../../src/taglist
 
 # **********************************************************************
 # ======================================================================
@@ -93,7 +93,7 @@ Iptc: $(TAGLIST)
 	@rm -f $@.tmp
 
 $(TAGLIST): 
-	$(error File $(TAGLIST) does not exist. Did you build the library and examples?)
+	$(error File $(TAGLIST) does not exist. Did you build the library and programs in the src/ directory?)
 
 mostlyclean:
 	rm -f *.xml
diff --git a/samples/Makefile b/samples/Makefile
index fd45623..012e04a 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -69,7 +69,6 @@ BINSRC = addmoddel.cpp        \
          key-test.cpp         \
          largeiptc-test.cpp   \
          makernote-test.cpp   \
-         taglist.cpp          \
          write-test.cpp       \
          write2-test.cpp      \
          tiffparse.cpp        \
diff --git a/src/Makefile b/src/Makefile
index 4ee34dc..07ec234 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -114,7 +114,7 @@ CSRC =   localtime.c
 endif
 
 # Add source files of simple applications to this list
-BINSRC = 
+BINSRC = taglist.cpp
 
 # Source files for the Exiv2 application
 EXIV2MAIN = exiv2.cpp
diff --git a/samples/taglist.cpp b/src/taglist.cpp
similarity index 93%
rename from samples/taglist.cpp
rename to src/taglist.cpp
index a06b708..5c6c325 100644
--- a/samples/taglist.cpp
+++ b/src/taglist.cpp
@@ -8,10 +8,10 @@
   History:   07-Jan-04, ahu: created
  */
 // *****************************************************************************
-#include <exiv2/makernote.hpp>
-#include <exiv2/tags.hpp>
-#include <exiv2/datasets.hpp>
-#include <exiv2/error.hpp>
+#include "makernote.hpp"
+#include "tags.hpp"
+#include "datasets.hpp"
+#include "error.hpp"
 
 #include <string>
 #include <iostream>

-- 
exiv2 packaging