diff --git a/pub/Makefile.am b/pub/Makefile.am
index cfc960e27e6e7a8347188c56dccce29977fed581..f57a422638f9a11807ae476cab52d0a75ebd1700 100644
--- a/pub/Makefile.am
+++ b/pub/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = yaml++/src src
+SUBDIRS = yamlcpp src
 ACLOCAL_AMFLAGS = -I m4
diff --git a/pub/Makefile.in b/pub/Makefile.in
index 1419ee36d4d5e2921573d8720918dc0bcfc1b6c0..cd5f6b370bf8a57e3f475ef5d49bd6187abdd875 100644
--- a/pub/Makefile.in
+++ b/pub/Makefile.in
@@ -228,7 +228,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = yaml++/src src
+SUBDIRS = yamlcpp src
 ACLOCAL_AMFLAGS = -I m4
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/pub/configure b/pub/configure
index 22f08784abd1dddcca4e8b88699867c1b4c0466d..6b62e62654222b02128e44b89f3b408187d6cca6 100755
--- a/pub/configure
+++ b/pub/configure
@@ -707,7 +707,7 @@ PACKAGE_BUGREPORT='j.wuttke@fz-juelich.de'
 PACKAGE_URL=''
 
 ac_unique_file="src/frida2.cpp"
-ac_unique_file="yaml++/src/parser.cpp"
+ac_unique_file="yamlcpp/parser.cpp"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -10703,6 +10703,8 @@ CC="$lt_save_CC"
 # Only expand once:
 
 
+
+# AC_PROG_RANLIB
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -13362,11 +13364,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13365: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13367: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13369: \$? = $ac_status" >&5
+   echo "$as_me:13371: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13461,11 +13463,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13464: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13466: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13468: \$? = $ac_status" >&5
+   echo "$as_me:13470: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13513,11 +13515,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13516: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13518: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13520: \$? = $ac_status" >&5
+   echo "$as_me:13522: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16259,7 +16261,7 @@ fi
 ##  Execute                                                                  ##
 ###############################################################################
 
-ac_config_files="$ac_config_files Makefile yaml++/src/Makefile src/Makefile"
+ac_config_files="$ac_config_files Makefile yamlcpp/Makefile src/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -17334,7 +17336,7 @@ do
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "yaml++/src/Makefile") CONFIG_FILES="$CONFIG_FILES yaml++/src/Makefile" ;;
+    "yamlcpp/Makefile") CONFIG_FILES="$CONFIG_FILES yamlcpp/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
 
   *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
diff --git a/pub/configure.ac b/pub/configure.ac
index b320a6901c842114064f484261d36b9637df29e6..064197b589ee7c2e8c01c70c12f95db77827af79 100644
--- a/pub/configure.ac
+++ b/pub/configure.ac
@@ -12,7 +12,7 @@
 AC_INIT([frida],[2],[j.wuttke@fz-juelich.de])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([src/frida2.cpp]) # assure we have the right src dir
-AC_CONFIG_SRCDIR([yaml++/src/parser.cpp]) # assure we have the right src dir
+AC_CONFIG_SRCDIR([yamlcpp/parser.cpp]) # assure we have the right src dir
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
@@ -22,6 +22,8 @@ AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 ###############################################################################
 
 LT_INIT
+AC_PROG_LIBTOOL
+# AC_PROG_RANLIB
 AC_PROG_CXX
 AC_PROG_LEX   # LEX,LEXLIB = "flex","-lfl" or "lex","-ll"
 if test "$LEX" = :; then
@@ -104,5 +106,5 @@ fi
 ##  Execute                                                                  ##
 ###############################################################################
 
-AC_CONFIG_FILES([Makefile yaml++/src/Makefile src/Makefile])
+AC_CONFIG_FILES([Makefile yamlcpp/Makefile src/Makefile])
 AC_OUTPUT
diff --git a/pub/yaml++/ABOUT b/pub/yamlcpp/ABOUT
similarity index 100%
rename from pub/yaml++/ABOUT
rename to pub/yamlcpp/ABOUT
diff --git a/pub/yaml++/src/Makefile.am b/pub/yamlcpp/Makefile.am
similarity index 52%
rename from pub/yaml++/src/Makefile.am
rename to pub/yamlcpp/Makefile.am
index ed23ee938fe982da3650fdee033ba9165e38155b..412eff1492743bee231894ef96ecdc0467c6252f 100644
--- a/pub/yaml++/src/Makefile.am
+++ b/pub/yamlcpp/Makefile.am
@@ -1,6 +1,24 @@
-# AM_CXXFLAGS = 
-lib_LTLIBRARIES = libyaml++.la
-libyaml++_la_SOURCES = \
+lib_LTLIBRARIES = libyamlcpp.la
+include_HEADERS = \
+	conversion.h \
+	crt.h \
+	emitter.h \
+	emittermanip.h \
+	exceptions.h \
+	iterator.h \
+	mark.h \
+	node.h \
+	nodeimpl.h \
+	nodereadimpl.h \
+	nodeutil.h \
+	noncopyable.h \
+	null.h \
+	ostream.h \
+	parser.h \
+	parserstate.h \
+	stlemitter.h \
+	yaml.h
+libyamlcpp_la_SOURCES = \
 	aliascontent.cpp \
 	content.cpp \
 	conversion.cpp \
@@ -23,6 +41,24 @@ libyaml++_la_SOURCES = \
 	sequence.cpp \
 	simplekey.cpp \
 	stream.cpp \
+	conversion.h \
+	crt.h \
+	emitter.h \
+	emittermanip.h \
+	exceptions.h \
+	iterator.h \
+	mark.h \
+	node.h \
+	nodeimpl.h \
+	nodereadimpl.h \
+	nodeutil.h \
+	noncopyable.h \
+	null.h \
+	ostream.h \
+	parser.h \
+	parserstate.h \
+	stlemitter.h \
+	yaml.h \
 	aliascontent.h \
 	content.h \
 	emitterstate.h \
@@ -43,4 +79,3 @@ libyaml++_la_SOURCES = \
 	stream.h \
 	stringsource.h \
 	token.h
-# include_HEADERS = kww.h
diff --git a/pub/yaml++/src/Makefile.in b/pub/yamlcpp/Makefile.in
similarity index 70%
rename from pub/yaml++/src/Makefile.in
rename to pub/yamlcpp/Makefile.in
index 7049342ab06d2b12c1747a696c793000e0613ab8..1d8d500c91c4b29a976500b6becf6b8e487eccf1 100644
--- a/pub/yaml++/src/Makefile.in
+++ b/pub/yamlcpp/Makefile.in
@@ -15,6 +15,7 @@
 
 @SET_MAKE@
 
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -34,8 +35,9 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = yaml++/src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+subdir = yamlcpp
+DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -68,15 +70,28 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(libdir)"
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libyaml___la_LIBADD =
-libyaml___la_SOURCES = libyaml++.c
-libyaml___la_OBJECTS = libyaml++.lo
+libyamlcpp_la_LIBADD =
+am_libyamlcpp_la_OBJECTS = aliascontent.lo content.lo conversion.lo \
+	emitter.lo emitterstate.lo emitterutils.lo exp.lo iterator.lo \
+	map.lo node.lo null.lo ostream.lo parser.lo parserstate.lo \
+	regex.lo scalar.lo scanner.lo scanscalar.lo scantoken.lo \
+	sequence.lo simplekey.lo stream.lo
+libyamlcpp_la_OBJECTS = $(am_libyamlcpp_la_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -86,8 +101,9 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = libyaml++.c
-DIST_SOURCES = libyaml++.c
+SOURCES = $(libyamlcpp_la_SOURCES)
+DIST_SOURCES = $(libyamlcpp_la_SOURCES)
+HEADERS = $(include_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -214,13 +230,93 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+lib_LTLIBRARIES = libyamlcpp.la
+include_HEADERS = \
+	conversion.h \
+	crt.h \
+	emitter.h \
+	emittermanip.h \
+	exceptions.h \
+	iterator.h \
+	mark.h \
+	node.h \
+	nodeimpl.h \
+	nodereadimpl.h \
+	nodeutil.h \
+	noncopyable.h \
+	null.h \
+	ostream.h \
+	parser.h \
+	parserstate.h \
+	stlemitter.h \
+	yaml.h
+
+libyamlcpp_la_SOURCES = \
+	aliascontent.cpp \
+	content.cpp \
+	conversion.cpp \
+	emitter.cpp \
+	emitterstate.cpp \
+	emitterutils.cpp \
+	exp.cpp \
+	iterator.cpp \
+	map.cpp \
+	node.cpp \
+	null.cpp \
+	ostream.cpp \
+	parser.cpp \
+	parserstate.cpp \
+	regex.cpp \
+	scalar.cpp \
+	scanner.cpp \
+	scanscalar.cpp \
+	scantoken.cpp \
+	sequence.cpp \
+	simplekey.cpp \
+	stream.cpp \
+	conversion.h \
+	crt.h \
+	emitter.h \
+	emittermanip.h \
+	exceptions.h \
+	iterator.h \
+	mark.h \
+	node.h \
+	nodeimpl.h \
+	nodereadimpl.h \
+	nodeutil.h \
+	noncopyable.h \
+	null.h \
+	ostream.h \
+	parser.h \
+	parserstate.h \
+	stlemitter.h \
+	yaml.h \
+	aliascontent.h \
+	content.h \
+	emitterstate.h \
+	emitterutils.h \
+	exp.h \
+	indentation.h \
+	iterpriv.h \
+	ltnode.h \
+	map.h \
+	regex.h \
+	regeximpl.h \
+	scalar.h \
+	scanner.h \
+	scanscalar.h \
+	sequence.h \
+	setting.h \
+	streamcharsource.h \
+	stream.h \
+	stringsource.h \
+	token.h
 
-# AM_CXXFLAGS = 
-lib_LTLIBRARIES = libyaml++.la
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
+.SUFFIXES: .cpp .lo .o .obj
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -230,9 +326,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign yaml++/src/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign yamlcpp/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign yaml++/src/Makefile
+	  $(AUTOMAKE) --foreign yamlcpp/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -282,8 +378,8 @@ clean-libLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libyaml++.la: $(libyaml___la_OBJECTS) $(libyaml___la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libyaml___la_OBJECTS) $(libyaml___la_LIBADD) $(LIBS)
+libyamlcpp.la: $(libyamlcpp_la_OBJECTS) $(libyamlcpp_la_DEPENDENCIES) 
+	$(CXXLINK) -rpath $(libdir) $(libyamlcpp_la_OBJECTS) $(libyamlcpp_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -291,34 +387,75 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libyaml++.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aliascontent.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/content.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conversion.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emitter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emitterstate.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emitterutils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iterator.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/map.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/node.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/null.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ostream.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parser.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parserstate.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scalar.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scanner.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scanscalar.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scantoken.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sequence.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simplekey.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream.Plo@am__quote@
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
+install-includeHEADERS: $(include_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
+	done
+
+uninstall-includeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(includedir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -404,9 +541,9 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -457,7 +594,7 @@ info: info-am
 
 info-am:
 
-install-data-am:
+install-data-am: install-includeHEADERS
 
 install-dvi: install-dvi-am
 
@@ -503,7 +640,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-libLTLIBRARIES
+uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
 
 .MAKE: install-am install-strip
 
@@ -513,58 +650,15 @@ uninstall-am: uninstall-libLTLIBRARIES
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	install-html-am install-includeHEADERS install-info \
+	install-info-am install-libLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-libLTLIBRARIES
+	tags uninstall uninstall-am uninstall-includeHEADERS \
+	uninstall-libLTLIBRARIES
 
-libyaml++_la_SOURCES = \
-	aliascontent.cpp \
-	content.cpp \
-	conversion.cpp \
-	emitter.cpp \
-	emitterstate.cpp \
-	emitterutils.cpp \
-	exp.cpp \
-	iterator.cpp \
-	map.cpp \
-	node.cpp \
-	null.cpp \
-	ostream.cpp \
-	parser.cpp \
-	parserstate.cpp \
-	regex.cpp \
-	scalar.cpp \
-	scanner.cpp \
-	scanscalar.cpp \
-	scantoken.cpp \
-	sequence.cpp \
-	simplekey.cpp \
-	stream.cpp \
-	aliascontent.h \
-	content.h \
-	emitterstate.h \
-	emitterutils.h \
-	exp.h \
-	indentation.h \
-	iterpriv.h \
-	ltnode.h \
-	map.h \
-	regex.h \
-	regeximpl.h \
-	scalar.h \
-	scanner.h \
-	scanscalar.h \
-	sequence.h \
-	setting.h \
-	streamcharsource.h \
-	stream.h \
-	stringsource.h \
-	token.h
-# include_HEADERS = kww.h
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/pub/yaml++/src/aliascontent.cpp b/pub/yamlcpp/aliascontent.cpp
similarity index 100%
rename from pub/yaml++/src/aliascontent.cpp
rename to pub/yamlcpp/aliascontent.cpp
diff --git a/pub/yaml++/src/aliascontent.h b/pub/yamlcpp/aliascontent.h
similarity index 100%
rename from pub/yaml++/src/aliascontent.h
rename to pub/yamlcpp/aliascontent.h
diff --git a/pub/yaml++/src/content.cpp b/pub/yamlcpp/content.cpp
similarity index 100%
rename from pub/yaml++/src/content.cpp
rename to pub/yamlcpp/content.cpp
diff --git a/pub/yaml++/src/content.h b/pub/yamlcpp/content.h
similarity index 100%
rename from pub/yaml++/src/content.h
rename to pub/yamlcpp/content.h
diff --git a/pub/yaml++/src/conversion.cpp b/pub/yamlcpp/conversion.cpp
similarity index 100%
rename from pub/yaml++/src/conversion.cpp
rename to pub/yamlcpp/conversion.cpp
diff --git a/pub/yaml++/include/conversion.h b/pub/yamlcpp/conversion.h
similarity index 100%
rename from pub/yaml++/include/conversion.h
rename to pub/yamlcpp/conversion.h
diff --git a/pub/yaml++/include/crt.h b/pub/yamlcpp/crt.h
similarity index 100%
rename from pub/yaml++/include/crt.h
rename to pub/yamlcpp/crt.h
diff --git a/pub/yaml++/src/emitter.cpp b/pub/yamlcpp/emitter.cpp
similarity index 100%
rename from pub/yaml++/src/emitter.cpp
rename to pub/yamlcpp/emitter.cpp
diff --git a/pub/yaml++/include/emitter.h b/pub/yamlcpp/emitter.h
similarity index 100%
rename from pub/yaml++/include/emitter.h
rename to pub/yamlcpp/emitter.h
diff --git a/pub/yaml++/include/emittermanip.h b/pub/yamlcpp/emittermanip.h
similarity index 100%
rename from pub/yaml++/include/emittermanip.h
rename to pub/yamlcpp/emittermanip.h
diff --git a/pub/yaml++/src/emitterstate.cpp b/pub/yamlcpp/emitterstate.cpp
similarity index 100%
rename from pub/yaml++/src/emitterstate.cpp
rename to pub/yamlcpp/emitterstate.cpp
diff --git a/pub/yaml++/src/emitterstate.h b/pub/yamlcpp/emitterstate.h
similarity index 100%
rename from pub/yaml++/src/emitterstate.h
rename to pub/yamlcpp/emitterstate.h
diff --git a/pub/yaml++/src/emitterutils.cpp b/pub/yamlcpp/emitterutils.cpp
similarity index 100%
rename from pub/yaml++/src/emitterutils.cpp
rename to pub/yamlcpp/emitterutils.cpp
diff --git a/pub/yaml++/src/emitterutils.h b/pub/yamlcpp/emitterutils.h
similarity index 100%
rename from pub/yaml++/src/emitterutils.h
rename to pub/yamlcpp/emitterutils.h
diff --git a/pub/yaml++/include/exceptions.h b/pub/yamlcpp/exceptions.h
similarity index 100%
rename from pub/yaml++/include/exceptions.h
rename to pub/yamlcpp/exceptions.h
diff --git a/pub/yaml++/src/exp.cpp b/pub/yamlcpp/exp.cpp
similarity index 100%
rename from pub/yaml++/src/exp.cpp
rename to pub/yamlcpp/exp.cpp
diff --git a/pub/yaml++/src/exp.h b/pub/yamlcpp/exp.h
similarity index 100%
rename from pub/yaml++/src/exp.h
rename to pub/yamlcpp/exp.h
diff --git a/pub/yaml++/src/indentation.h b/pub/yamlcpp/indentation.h
similarity index 100%
rename from pub/yaml++/src/indentation.h
rename to pub/yamlcpp/indentation.h
diff --git a/pub/yaml++/src/iterator.cpp b/pub/yamlcpp/iterator.cpp
similarity index 100%
rename from pub/yaml++/src/iterator.cpp
rename to pub/yamlcpp/iterator.cpp
diff --git a/pub/yaml++/include/iterator.h b/pub/yamlcpp/iterator.h
similarity index 100%
rename from pub/yaml++/include/iterator.h
rename to pub/yamlcpp/iterator.h
diff --git a/pub/yaml++/src/iterpriv.h b/pub/yamlcpp/iterpriv.h
similarity index 100%
rename from pub/yaml++/src/iterpriv.h
rename to pub/yamlcpp/iterpriv.h
diff --git a/pub/yaml++/src/ltnode.h b/pub/yamlcpp/ltnode.h
similarity index 100%
rename from pub/yaml++/src/ltnode.h
rename to pub/yamlcpp/ltnode.h
diff --git a/pub/yaml++/src/map.cpp b/pub/yamlcpp/map.cpp
similarity index 100%
rename from pub/yaml++/src/map.cpp
rename to pub/yamlcpp/map.cpp
diff --git a/pub/yaml++/src/map.h b/pub/yamlcpp/map.h
similarity index 100%
rename from pub/yaml++/src/map.h
rename to pub/yamlcpp/map.h
diff --git a/pub/yaml++/include/mark.h b/pub/yamlcpp/mark.h
similarity index 100%
rename from pub/yaml++/include/mark.h
rename to pub/yamlcpp/mark.h
diff --git a/pub/yaml++/src/node.cpp b/pub/yamlcpp/node.cpp
similarity index 100%
rename from pub/yaml++/src/node.cpp
rename to pub/yamlcpp/node.cpp
diff --git a/pub/yaml++/include/node.h b/pub/yamlcpp/node.h
similarity index 100%
rename from pub/yaml++/include/node.h
rename to pub/yamlcpp/node.h
diff --git a/pub/yaml++/include/nodeimpl.h b/pub/yamlcpp/nodeimpl.h
similarity index 100%
rename from pub/yaml++/include/nodeimpl.h
rename to pub/yamlcpp/nodeimpl.h
diff --git a/pub/yaml++/include/nodereadimpl.h b/pub/yamlcpp/nodereadimpl.h
similarity index 100%
rename from pub/yaml++/include/nodereadimpl.h
rename to pub/yamlcpp/nodereadimpl.h
diff --git a/pub/yaml++/include/nodeutil.h b/pub/yamlcpp/nodeutil.h
similarity index 100%
rename from pub/yaml++/include/nodeutil.h
rename to pub/yamlcpp/nodeutil.h
diff --git a/pub/yaml++/include/noncopyable.h b/pub/yamlcpp/noncopyable.h
similarity index 100%
rename from pub/yaml++/include/noncopyable.h
rename to pub/yamlcpp/noncopyable.h
diff --git a/pub/yaml++/src/null.cpp b/pub/yamlcpp/null.cpp
similarity index 100%
rename from pub/yaml++/src/null.cpp
rename to pub/yamlcpp/null.cpp
diff --git a/pub/yaml++/include/null.h b/pub/yamlcpp/null.h
similarity index 100%
rename from pub/yaml++/include/null.h
rename to pub/yamlcpp/null.h
diff --git a/pub/yaml++/src/ostream.cpp b/pub/yamlcpp/ostream.cpp
similarity index 100%
rename from pub/yaml++/src/ostream.cpp
rename to pub/yamlcpp/ostream.cpp
diff --git a/pub/yaml++/include/ostream.h b/pub/yamlcpp/ostream.h
similarity index 100%
rename from pub/yaml++/include/ostream.h
rename to pub/yamlcpp/ostream.h
diff --git a/pub/yaml++/src/parser.cpp b/pub/yamlcpp/parser.cpp
similarity index 100%
rename from pub/yaml++/src/parser.cpp
rename to pub/yamlcpp/parser.cpp
diff --git a/pub/yaml++/include/parser.h b/pub/yamlcpp/parser.h
similarity index 100%
rename from pub/yaml++/include/parser.h
rename to pub/yamlcpp/parser.h
diff --git a/pub/yaml++/src/parserstate.cpp b/pub/yamlcpp/parserstate.cpp
similarity index 100%
rename from pub/yaml++/src/parserstate.cpp
rename to pub/yamlcpp/parserstate.cpp
diff --git a/pub/yaml++/include/parserstate.h b/pub/yamlcpp/parserstate.h
similarity index 100%
rename from pub/yaml++/include/parserstate.h
rename to pub/yamlcpp/parserstate.h
diff --git a/pub/yaml++/src/regex.cpp b/pub/yamlcpp/regex.cpp
similarity index 100%
rename from pub/yaml++/src/regex.cpp
rename to pub/yamlcpp/regex.cpp
diff --git a/pub/yaml++/src/regex.h b/pub/yamlcpp/regex.h
similarity index 100%
rename from pub/yaml++/src/regex.h
rename to pub/yamlcpp/regex.h
diff --git a/pub/yaml++/src/regeximpl.h b/pub/yamlcpp/regeximpl.h
similarity index 100%
rename from pub/yaml++/src/regeximpl.h
rename to pub/yamlcpp/regeximpl.h
diff --git a/pub/yaml++/src/scalar.cpp b/pub/yamlcpp/scalar.cpp
similarity index 100%
rename from pub/yaml++/src/scalar.cpp
rename to pub/yamlcpp/scalar.cpp
diff --git a/pub/yaml++/src/scalar.h b/pub/yamlcpp/scalar.h
similarity index 100%
rename from pub/yaml++/src/scalar.h
rename to pub/yamlcpp/scalar.h
diff --git a/pub/yaml++/src/scanner.cpp b/pub/yamlcpp/scanner.cpp
similarity index 100%
rename from pub/yaml++/src/scanner.cpp
rename to pub/yamlcpp/scanner.cpp
diff --git a/pub/yaml++/src/scanner.h b/pub/yamlcpp/scanner.h
similarity index 100%
rename from pub/yaml++/src/scanner.h
rename to pub/yamlcpp/scanner.h
diff --git a/pub/yaml++/src/scanscalar.cpp b/pub/yamlcpp/scanscalar.cpp
similarity index 100%
rename from pub/yaml++/src/scanscalar.cpp
rename to pub/yamlcpp/scanscalar.cpp
diff --git a/pub/yaml++/src/scanscalar.h b/pub/yamlcpp/scanscalar.h
similarity index 100%
rename from pub/yaml++/src/scanscalar.h
rename to pub/yamlcpp/scanscalar.h
diff --git a/pub/yaml++/src/scantoken.cpp b/pub/yamlcpp/scantoken.cpp
similarity index 100%
rename from pub/yaml++/src/scantoken.cpp
rename to pub/yamlcpp/scantoken.cpp
diff --git a/pub/yaml++/src/sequence.cpp b/pub/yamlcpp/sequence.cpp
similarity index 100%
rename from pub/yaml++/src/sequence.cpp
rename to pub/yamlcpp/sequence.cpp
diff --git a/pub/yaml++/src/sequence.h b/pub/yamlcpp/sequence.h
similarity index 100%
rename from pub/yaml++/src/sequence.h
rename to pub/yamlcpp/sequence.h
diff --git a/pub/yaml++/src/setting.h b/pub/yamlcpp/setting.h
similarity index 100%
rename from pub/yaml++/src/setting.h
rename to pub/yamlcpp/setting.h
diff --git a/pub/yaml++/src/simplekey.cpp b/pub/yamlcpp/simplekey.cpp
similarity index 100%
rename from pub/yaml++/src/simplekey.cpp
rename to pub/yamlcpp/simplekey.cpp
diff --git a/pub/yaml++/include/stlemitter.h b/pub/yamlcpp/stlemitter.h
similarity index 100%
rename from pub/yaml++/include/stlemitter.h
rename to pub/yamlcpp/stlemitter.h
diff --git a/pub/yaml++/src/stream.cpp b/pub/yamlcpp/stream.cpp
similarity index 100%
rename from pub/yaml++/src/stream.cpp
rename to pub/yamlcpp/stream.cpp
diff --git a/pub/yaml++/src/stream.h b/pub/yamlcpp/stream.h
similarity index 100%
rename from pub/yaml++/src/stream.h
rename to pub/yamlcpp/stream.h
diff --git a/pub/yaml++/src/streamcharsource.h b/pub/yamlcpp/streamcharsource.h
similarity index 100%
rename from pub/yaml++/src/streamcharsource.h
rename to pub/yamlcpp/streamcharsource.h
diff --git a/pub/yaml++/src/stringsource.h b/pub/yamlcpp/stringsource.h
similarity index 100%
rename from pub/yaml++/src/stringsource.h
rename to pub/yamlcpp/stringsource.h
diff --git a/pub/yaml++/src/token.h b/pub/yamlcpp/token.h
similarity index 100%
rename from pub/yaml++/src/token.h
rename to pub/yamlcpp/token.h
diff --git a/pub/yaml++/include/yaml.h b/pub/yamlcpp/yaml.h
similarity index 100%
rename from pub/yaml++/include/yaml.h
rename to pub/yamlcpp/yaml.h