Flattened the src directory, and added back yaml.h (since it used to be generated)

.hgignore

 syntax: glob
-include/yaml-cpp/yaml.h
+

CMakeLists.txt

@@ -56,26 +56,12 @@ option(MSVC_STHREADED_RT "MSVC: Build with single-threaded static runtime libs (
 ###
 set(header_directory "include/yaml-cpp/")
 
-file(GLOB common_sources "src/[a-zA-Z]*.cpp")
-file(GLOB new_api_sources 
-	"src/node/[a-zA-Z]*.cpp"
-	"src/node/detail/[a-zA-Z]*.cpp"
-)
-
-file(GLOB common_public_headers "include/yaml-cpp/[a-zA-Z]*.h")
-file(GLOB new_api_public_headers
-	"include/yaml-cpp/node/[a-zA-Z]*.h"
-	"include/yaml-cpp/node/detail/[a-zA-Z]*.h"
-)
-
-file(GLOB common_private_headers "src/[a-zA-Z]*.h")
-file(GLOB new_api_private_headers "src/node/[a-zA-Z]*.h")
+file(GLOB sources "src/[a-zA-Z]*.cpp")
+file(GLOB_RECURSE public_headers "include/yaml-cpp/[a-zA-Z]*.h")
+file(GLOB private_headers "src/[a-zA-Z]*.h")
 
 find_package(Boost REQUIRED)
 include_directories(${Boost_INCLUDE_DIRS})
-list(APPEND sources ${common_sources} ${new_api_sources})
-list(APPEND public_headers ${common_public_headers} ${new_api_public_headers})
-list(APPEND private_headers ${common_private_headers} ${new_api_private_headers})
 
 if(YAML_CPP_BUILD_CONTRIB)
 	file(GLOB contrib_sources "src/contrib/[a-zA-Z]*.cpp")

include/yaml-cpp/yaml.h

+#ifndef YAML_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+#define YAML_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+
+#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
+#pragma once
+#endif
+
+#include "yaml-cpp/parser.h"
+#include "yaml-cpp/emitter.h"
+#include "yaml-cpp/stlemitter.h"
+#include "yaml-cpp/exceptions.h"
+
+#include "yaml-cpp/node/node.h"
+#include "yaml-cpp/node/impl.h"
+#include "yaml-cpp/node/convert.h"
+#include "yaml-cpp/node/iterator.h"
+#include "yaml-cpp/node/detail/impl.h"
+#include "yaml-cpp/node/parse.h"
+#include "yaml-cpp/node/emit.h"
+
+#endif // YAML_H_62B23520_7C8E_11DE_8A39_0800200C9A66