Moved taglist.cpp back to src/ to make doc build easier.

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)
 

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)
 

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

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        \

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

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>