Merged some of the changes in master.

3 files changed, 4 insertions, 31 deletions

diff --git a/config-model/src/Makefile b/config-model/src/Makefile
deleted file mode 100644
index 5e7024ccff9..00000000000
--- a/config-model/src/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#all: services.xsd hosts.xsd
-
-trangjar=../../target/trang.jar
-
-all: resources/schema/services.rng resources/schema/hosts.rng resources/schema/container-include.rng resources/schema/services.xsd resources/schema/hosts.xsd resources/schema/container-include.xsd
-
-resources/schema/services.rng: resources/schema/services.rnc resources/schema/common.rnc resources/schema/admin.rnc resources/schema/clients.rnc resources/schema/docproc.rnc resources/schema/routing.rnc resources/schema/clients-v2.rnc resources/schema/content.rnc resources/schema/genericmodule.rnc resources/schema/legacygenericcluster.rnc resources/schema/genericcluster.rnc resources/schema/legacygenericmodule.rnc resources/schema/containercluster.rnc
-	java -jar $(trangjar) -I rnc -O rng resources/schema/services.rnc resources/schema/services.rng
-
-resources/schema/services.xsd: resources/schema/services.rng
-	java -jar $(trangjar) -I rng -O xsd resources/schema/services.rng resources/schema/services.xsd
-
-
-resources/schema/container-include.rng: resources/schema/common.rnc resources/schema/containercluster.rnc
-	java -jar $(trangjar) -I rnc -O rng resources/schema/container-include.rnc resources/schema/container-include.rng
-
-resources/schema/container-include.xsd: resources/schema/container-include.rng
-	java -jar $(trangjar) -I rng -O xsd resources/schema/container-include.rng resources/schema/container-include.xsd
-
-
-resources/schema/hosts.rng: resources/schema/hosts.rnc
-	java -jar $(trangjar) -I rnc -O rng resources/schema/hosts.rnc resources/schema/hosts.rng
-
-resources/schema/hosts.xsd: resources/schema/hosts.rng
-	java -jar $(trangjar) -I rng -O xsd resources/schema/hosts.rng resources/schema/hosts.xsd
-
-clean:
-	rm -f resources/schema/*.rng
-	rm -f resources/schema/*.xsd
diff --git a/functions.cmake b/functions.cmake
index 88aa4edfb9b..c75a454923b 100644
--- a/functions.cmake
+++ b/functions.cmake
@@ -143,6 +143,9 @@ function(vespa_generate_config TARGET RELATIVE_CONFIG_DEF_PATH)
     # This is used within the generated config-<name>.cpp
     # TODO: Should modify configgen to use #include <vespa/<modulename>/config-<name>.h> instead
     target_include_directories(${TARGET} PRIVATE ${CONFIG_DEST_PARENT_DIR})
+
+    # Needed to be able to do a #include <config-<name>.h> for this target
+    # This is used within some unit tests
     target_include_directories(${TARGET} PRIVATE ${CONFIG_DEST_DIR})
 endfunction()
 
diff --git a/staging_vespalib/src/vespa/vespalib/util/CMakeLists.txt b/staging_vespalib/src/vespa/vespalib/util/CMakeLists.txt
index a8d28bf9809..8cf7e2239ad 100644
--- a/staging_vespalib/src/vespa/vespalib/util/CMakeLists.txt
+++ b/staging_vespalib/src/vespa/vespalib/util/CMakeLists.txt
@@ -5,7 +5,6 @@ vespa_add_library(staging_vespalib_vespalib_util OBJECT
     clock.cpp
     cpu.cpp
     crc.cpp
-    document_runnable.cpp
     doom.cpp
     growablebytebuffer.cpp
     jsonstream.cpp
@@ -15,6 +14,7 @@ vespa_add_library(staging_vespalib_vespalib_util OBJECT
     process_memory_stats.cpp
     programoptions.cpp
     programoptions_testutils.cpp
+    document_runnable.cpp
     rusage.cpp
     shutdownguard.cpp
     timer.cpp