1 files changed, 36 insertions, 70 deletions
diff --git a/configdefinitions/src/vespa/CMakeLists.txt b/configdefinitions/src/vespa/CMakeLists.txt
index 0673e803057..ad870ff6a87 100644
--- a/configdefinitions/src/vespa/CMakeLists.txt
+++ b/configdefinitions/src/vespa/CMakeLists.txt
@@ -4,73 +4,39 @@ vespa_add_library(configdefinitions
     INSTALL lib64
     DEPENDS
 )
-vespa_generate_config(configdefinitions application-id.def)
-install_config_definition(application-id.def cloud.config.application-id.def)
-vespa_generate_config(configdefinitions athenz-provider-service.def)
-install_config_definition(athenz-provider-service.def vespa.hosted.athenz.instanceproviderservice.config.athenz-provider-service.def)
-vespa_generate_config(configdefinitions attributes.def)
-install_config_definition(attributes.def vespa.config.search.attributes.def)
-vespa_generate_config(configdefinitions cluster-info.def)
-install_config_definition(cluster-info.def cloud.config.cluster-info.def)
-vespa_generate_config(configdefinitions cluster-list.def)
-install_config_definition(cluster-list.def cloud.config.cluster-list.def)
-vespa_generate_config(configdefinitions configserver.def)
-install_config_definition(configserver.def cloud.config.configserver.def)
-vespa_generate_config(configdefinitions dispatch.def)
-install_config_definition(dispatch.def vespa.config.search.dispatch.def)
-vespa_generate_config(configdefinitions filereferences.def)
-install_config_definition(filereferences.def cloud.config.filedistribution.filereferences.def)
-vespa_generate_config(configdefinitions fleetcontroller.def)
-install_config_definition(fleetcontroller.def vespa.config.content.fleetcontroller.def)
-vespa_generate_config(configdefinitions ilscripts.def)
-install_config_definition(ilscripts.def vespa.configdefinition.ilscripts.def)
-vespa_generate_config(configdefinitions imported-fields.def)
-install_config_definition(imported-fields.def vespa.config.search.imported-fields.def)
-vespa_generate_config(configdefinitions indexschema.def)
-install_config_definition(indexschema.def vespa.config.search.indexschema.def)
-vespa_generate_config(configdefinitions lb-services.def)
-install_config_definition(lb-services.def cloud.config.lb-services.def)
-vespa_generate_config(configdefinitions load-type.def)
-install_config_definition(load-type.def vespa.config.content.load-type.def)
-vespa_generate_config(configdefinitions logforwarder.def)
-install_config_definition(logforwarder.def cloud.config.logforwarder.def)
-vespa_generate_config(configdefinitions messagetyperouteselectorpolicy.def)
-install_config_definition(messagetyperouteselectorpolicy.def vespa.config.content.messagetyperouteselectorpolicy.def)
-vespa_generate_config(configdefinitions model.def)
-install_config_definition(model.def cloud.config.model.def)
-vespa_generate_config(configdefinitions orchestrator.def)
-install_config_definition(orchestrator.def vespa.orchestrator.config.orchestrator.def)
-vespa_generate_config(configdefinitions persistence.def)
-install_config_definition(persistence.def vespa.config.content.persistence.def)
-vespa_generate_config(configdefinitions rank-profiles.def)
-install_config_definition(rank-profiles.def vespa.config.search.rank-profiles.def)
-vespa_generate_config(configdefinitions routing-provider.def)
-install_config_definition(routing-provider.def cloud.config.routing-provider.def)
-vespa_generate_config(configdefinitions sentinel.def)
-install_config_definition(sentinel.def cloud.config.sentinel.def)
-vespa_generate_config(configdefinitions slobroks.def)
-install_config_definition(slobroks.def cloud.config.slobroks.def)
-vespa_generate_config(configdefinitions specialtokens.def)
-install_config_definition(specialtokens.def vespa.configdefinition.specialtokens.def)
-vespa_generate_config(configdefinitions stor-distribution.def)
-install_config_definition(stor-distribution.def vespa.config.content.stor-distribution.def)
-vespa_generate_config(configdefinitions stor-filestor.def)
-install_config_definition(stor-filestor.def vespa.config.content.stor-filestor.def)
-vespa_generate_config(configdefinitions summary.def)
-install_config_definition(summary.def vespa.config.search.summary.def)
-vespa_generate_config(configdefinitions summarymap.def)
-install_config_definition(summarymap.def vespa.config.search.summarymap.def)
-vespa_generate_config(configdefinitions upgrading.def)
-install_config_definition(upgrading.def vespa.config.content.upgrading.def)
-vespa_generate_config(configdefinitions ymon.def)
-install_config_definition(ymon.def cloud.config.ymon.def)
-vespa_generate_config(configdefinitions zookeeper-server.def)
-install_config_definition(zookeeper-server.def cloud.config.zookeeper-server.def)
-vespa_generate_config(configdefinitions zookeepers.def)
-install_config_definition(zookeepers.def cloud.config.zookeepers.def)
-vespa_generate_config(configdefinitions bucketspaces.def)
-install_config_definition(bucketspaces.def vespa.config.content.core.bucketspaces.def)
-vespa_generate_config(configdefinitions all-clusters-bucket-spaces.def)
-install_config_definition(all-clusters-bucket-spaces.def vespa.config.content.all-clusters-bucket-spaces.def)
-vespa_generate_config(configdefinitions stateserver.def)
-install_config_definition(stateserver.def vespa.config.core.stateserver.def)
+vespa_generate_config(configdefinitions cloud.config.application-id.def)
+vespa_generate_config(configdefinitions vespa.hosted.athenz.instanceproviderservice.config.athenz-provider-service.def)
+vespa_generate_config(configdefinitions vespa.config.search.attributes.def)
+vespa_generate_config(configdefinitions cloud.config.cluster-info.def)
+vespa_generate_config(configdefinitions cloud.config.cluster-list.def)
+vespa_generate_config(configdefinitions cloud.config.configserver.def)
+vespa_generate_config(configdefinitions vespa.config.search.dispatch.def)
+vespa_generate_config(configdefinitions cloud.config.filedistribution.filereferences.def)
+vespa_generate_config(configdefinitions vespa.config.content.fleetcontroller.def)
+vespa_generate_config(configdefinitions vespa.configdefinition.ilscripts.def)
+vespa_generate_config(configdefinitions vespa.config.search.imported-fields.def)
+vespa_generate_config(configdefinitions vespa.config.search.indexschema.def)
+vespa_generate_config(configdefinitions cloud.config.lb-services.def)
+vespa_generate_config(configdefinitions vespa.config.content.load-type.def)
+vespa_generate_config(configdefinitions cloud.config.logforwarder.def)
+vespa_generate_config(configdefinitions vespa.config.content.messagetyperouteselectorpolicy.def)
+vespa_generate_config(configdefinitions cloud.config.model.def)
+vespa_generate_config(configdefinitions vespa.orchestrator.config.orchestrator.def)
+vespa_generate_config(configdefinitions vespa.config.content.persistence.def)
+vespa_generate_config(configdefinitions vespa.config.search.rank-profiles.def)
+vespa_generate_config(configdefinitions cloud.config.routing-provider.def)
+vespa_generate_config(configdefinitions cloud.config.sentinel.def)
+vespa_generate_config(configdefinitions cloud.config.slobroks.def)
+vespa_generate_config(configdefinitions vespa.configdefinition.specialtokens.def)
+vespa_generate_config(configdefinitions vespa.config.content.stor-distribution.def)
+vespa_generate_config(configdefinitions vespa.config.content.stor-filestor.def)
+vespa_generate_config(configdefinitions vespa.config.search.summary.def)
+vespa_generate_config(configdefinitions vespa.config.search.summarymap.def)
+vespa_generate_config(configdefinitions vespa.config.content.upgrading.def)
+vespa_generate_config(configdefinitions cloud.config.ymon.def)
+vespa_generate_config(configdefinitions cloud.config.zookeeper-server.def)
+vespa_generate_config(configdefinitions cloud.config.zookeepers.def)
+vespa_generate_config(configdefinitions vespa.config.content.core.bucketspaces.def)
+vespa_generate_config(configdefinitions vespa.config.content.all-clusters-bucket-spaces.def)
+vespa_generate_config(configdefinitions vespa.config.core.stateserver.def)
+install_config_definitions(src/vespa)