summaryrefslogtreecommitdiffstats
path: root/vsm
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-09-10 19:54:48 +0200
committerHarald Musum <musum@verizonmedia.com>2020-09-10 19:54:48 +0200
commit9b948718144e5d556cc6ea49d2ff6bbf05f00b0e (patch)
treeba85cd69adb80f4eb2b885d792f4ff5ecf01ef93 /vsm
parent2f6d5764a8ac5fea80e44fc3d022a6b0b47ba890 (diff)
Use full name in config definition file names
Diffstat (limited to 'vsm')
-rw-r--r--vsm/src/vespa/vsm/config/CMakeLists.txt10
-rw-r--r--vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsm.def (renamed from vsm/src/vespa/vsm/config/vsm.def)0
-rw-r--r--vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsmfields.def (renamed from vsm/src/vespa/vsm/config/vsmfields.def)0
-rw-r--r--vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsmsummary.def (renamed from vsm/src/vespa/vsm/config/vsmsummary.def)0
4 files changed, 4 insertions, 6 deletions
diff --git a/vsm/src/vespa/vsm/config/CMakeLists.txt b/vsm/src/vespa/vsm/config/CMakeLists.txt
index e3bd2db68e2..ce84c569c0a 100644
--- a/vsm/src/vespa/vsm/config/CMakeLists.txt
+++ b/vsm/src/vespa/vsm/config/CMakeLists.txt
@@ -3,9 +3,7 @@ vespa_add_library(vsm_vconfig OBJECT
SOURCES
DEPENDS
)
-vespa_generate_config(vsm_vconfig vsmfields.def)
-install_config_definition(vsmfields.def vespa.config.search.vsm.vsmfields.def)
-vespa_generate_config(vsm_vconfig vsm.def)
-install_config_definition(vsm.def vespa.config.search.vsm.vsm.def)
-vespa_generate_config(vsm_vconfig vsmsummary.def)
-install_config_definition(vsmsummary.def vespa.config.search.vsm.vsmsummary.def)
+vespa_generate_config(vsm_vconfig vespa.config.search.vsm.vsmfields.def)
+vespa_generate_config(vsm_vconfig vespa.config.search.vsm.vsm.def)
+vespa_generate_config(vsm_vconfig vespa.config.search.vsm.vsmsummary.def)
+install_config_definitions(src/vespa/vsm/config)
diff --git a/vsm/src/vespa/vsm/config/vsm.def b/vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsm.def
index c446efe5588..c446efe5588 100644
--- a/vsm/src/vespa/vsm/config/vsm.def
+++ b/vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsm.def
diff --git a/vsm/src/vespa/vsm/config/vsmfields.def b/vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsmfields.def
index ca48692b526..ca48692b526 100644
--- a/vsm/src/vespa/vsm/config/vsmfields.def
+++ b/vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsmfields.def
diff --git a/vsm/src/vespa/vsm/config/vsmsummary.def b/vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsmsummary.def
index 4664371faba..4664371faba 100644
--- a/vsm/src/vespa/vsm/config/vsmsummary.def
+++ b/vsm/src/vespa/vsm/config/vespa.config.search.vsm.vsmsummary.def