#1071 Remove Jzon from libexiv2

1) Move src/Jzon.cpp and include/exiv2/Jzon.hpp to samples/Jzon.{cpp|hpp}
2) Update build environment appropriately.

config/Doxyfile

@@ -700,10 +700,10 @@ RECURSIVE              = NO
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = ../include/exiv2/Jzon.h \
+EXCLUDE                = ../samples/Jzon.h \
                          ../src/getopt_win32.c \
                          ../src/getopt_win32.h \
-                         ../src/Jzon.cpp \
+                         ../samples/Jzon.cpp \
                          ../src/localtime.c \
                          ../src/private.h \
                          ../src/timegm.h \

samples/CMakeLists.txt

@@ -28,7 +28,6 @@ SET( SAMPLES addmoddel.cpp
              exifdata.cpp
              exifprint.cpp
              exifvalue.cpp
-             exiv2json.cpp
              geotag.cpp
              iotest.cpp
              iptceasy.cpp
@@ -69,6 +68,12 @@ SET_TARGET_PROPERTIES( pathtest PROPERTIES OUTPUT_NAME path-test )
 TARGET_LINK_LIBRARIES( pathtest exiv2lib )
 INSTALL( TARGETS pathtest ${INSTALL_TARGET_STANDARD_ARGS} )
 
+SET( EXIV2JSON_SRC exiv2json.cpp Jzon.cpp )
+ADD_EXECUTABLE( exiv2json ${EXIV2JSON_SRC} )
+SET_TARGET_PROPERTIES( exiv2json PROPERTIES OUTPUT_NAME exiv2json )
+TARGET_LINK_LIBRARIES( exiv2json exiv2lib )
+INSTALL( TARGETS exiv2json ${INSTALL_TARGET_STANDARD_ARGS} )
+
 # That's all Folks!
 ##
 

samples/Makefile

@@ -161,6 +161,13 @@ 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 $<
+	@$(MAKEDEPEND)
+	@$(POSTDEPEND)
+	$(LIBTOOL) --mode=link $(LINK.cc) $@.o ../samples/Jzon.o -o ../bin/$@
+
 # Remove binaries, e.g., to relink them
 binclean:
 	$(RM) $(EXECUTABLE)

src/CMakeLists.txt

@@ -57,7 +57,6 @@ SET( LIBEXIV2_HDR         ${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/asfvideo.hp
                           ${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/iptc.hpp
                           ${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/jp2image.hpp
                           ${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/jpgimage.hpp
-                          ${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/Jzon.h
                           ${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/matroskavideo.hpp
                           ${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/metadatum.hpp
                           ${CMAKE_CURRENT_LIST_DIR}/../include/exiv2/mrwimage.hpp
@@ -105,7 +104,6 @@ SET( LIBEXIV2_SRC         asfvideo.cpp
                           iptc.cpp
                           jp2image.cpp
                           jpgimage.cpp
-                          Jzon.cpp
                           makernote.cpp
                           matroskavideo.cpp
                           metadatum.cpp

src/Makefile

@@ -63,7 +63,6 @@ CCHDR =  exiv2.hpp         \
          config.h          \
          exv_conf.h        \
          exv_msvc.h        \
-         Jzon.h            \
          version.hpp
 
 # Add library C++ source files to this list
@@ -88,7 +87,6 @@ CCSRC =  asfvideo.cpp          \
 	 iptc.cpp              \
 	 jp2image.cpp          \
 	 jpgimage.cpp          \
-	 Jzon.cpp              \
 	 makernote.cpp         \
 	 matroskavideo.cpp     \
 	 metadatum.cpp         \