Merge pull request #13815 from vespa-engine/toregge/use-module-source-depedencies

Use module source dependencies.

46 files changed, 0 insertions, 113 deletions

diff --git a/document/src/tests/CMakeLists.txt b/document/src/tests/CMakeLists.txt
index e203fc4b464..1602763c6e6 100644
--- a/document/src/tests/CMakeLists.txt
+++ b/document/src/tests/CMakeLists.txt
@@ -35,8 +35,6 @@ vespa_add_executable(document_gtest_runner_app TEST
     DEPENDS
     document
     GTest::GTest
-    AFTER
-    document_documentconfig
 )
 
 vespa_add_test(
diff --git a/document/src/tests/annotation/CMakeLists.txt b/document/src/tests/annotation/CMakeLists.txt
index f0f205c2676..ba22bcc6e23 100644
--- a/document/src/tests/annotation/CMakeLists.txt
+++ b/document/src/tests/annotation/CMakeLists.txt
@@ -4,7 +4,5 @@ vespa_add_executable(document_annotation_test_app TEST
     annotation_test.cpp
     DEPENDS
     document
-    AFTER
-    document_documentconfig
 )
 vespa_add_test(NAME document_annotation_test_app COMMAND document_annotation_test_app)
diff --git a/document/src/tests/base/CMakeLists.txt b/document/src/tests/base/CMakeLists.txt
index da751679c36..3ea52034d95 100644
--- a/document/src/tests/base/CMakeLists.txt
+++ b/document/src/tests/base/CMakeLists.txt
@@ -4,8 +4,6 @@ vespa_add_executable(document_documentid_test_app TEST
     documentid_test.cpp
     DEPENDS
     document
-    AFTER
-    document_documentconfig
 )
 vespa_add_test(NAME document_documentid_test_app COMMAND document_documentid_test_app)
 vespa_add_executable(document_documentid_benchmark_app
@@ -13,7 +11,5 @@ vespa_add_executable(document_documentid_benchmark_app
     documentid_benchmark.cpp
     DEPENDS
     document
-    AFTER
-    document_documentconfig
 )
 vespa_add_test(NAME document_documentid_benchmark_app COMMAND document_documentid_benchmark_app BENCHMARK)
diff --git a/document/src/tests/datatype/CMakeLists.txt b/document/src/tests/datatype/CMakeLists.txt
index 173a877be72..7b82d234a89 100644
--- a/document/src/tests/datatype/CMakeLists.txt
+++ b/document/src/tests/datatype/CMakeLists.txt
@@ -4,8 +4,6 @@ vespa_add_executable(document_datatype_test_app TEST
     datatype_test.cpp
     DEPENDS
     document
-    AFTER
-    document_documentconfig
 )
 vespa_add_test(NAME document_datatype_test_app COMMAND document_datatype_test_app)
 
@@ -14,7 +12,5 @@ vespa_add_executable(document_referencedatatype_test_app TEST
     referencedatatype_test.cpp
     DEPENDS
     document
-    AFTER
-    document_documentconfig
 )
 vespa_add_test(NAME document_referencedatatype_test_app COMMAND document_referencedatatype_test_app)
diff --git a/document/src/tests/document_type_repo_factory/CMakeLists.txt b/document/src/tests/document_type_repo_factory/CMakeLists.txt
index c872559c3b5..9a9bf04fa4a 100644
--- a/document/src/tests/document_type_repo_factory/CMakeLists.txt
+++ b/document/src/tests/document_type_repo_factory/CMakeLists.txt
@@ -4,7 +4,5 @@ vespa_add_executable(document_document_type_repo_factory_test_app TEST
     document_type_repo_factory_test.cpp
     DEPENDS
     document
-    AFTER
-    document_documentconfig
 )
 vespa_add_test(NAME document_document_type_repo_factory_test_app COMMAND document_document_type_repo_factory_test_app)
diff --git a/document/src/tests/fieldvalue/CMakeLists.txt b/document/src/tests/fieldvalue/CMakeLists.txt
index e213df4a58f..cc544847de7 100644
--- a/document/src/tests/fieldvalue/CMakeLists.txt
+++ b/document/src/tests/fieldvalue/CMakeLists.txt
@@ -4,8 +4,6 @@ vespa_add_executable(document_document_test_app TEST
     document_test.cpp
     DEPENDS
     document
-    AFTER
-    document_documentconfig
 )
 vespa_add_test(NAME document_document_test_app COMMAND document_document_test_app)
 vespa_add_executable(document_fieldvalue_test_app TEST
@@ -13,8 +11,6 @@ vespa_add_executable(document_fieldvalue_test_app TEST
     fieldvalue_test.cpp
     DEPENDS
     document
-    AFTER
-    document_documentconfig
 )
 vespa_add_test(NAME document_fieldvalue_test_app COMMAND document_fieldvalue_test_app)
 vespa_add_executable(document_predicatefieldvalue_test_app TEST
@@ -22,8 +18,6 @@ vespa_add_executable(document_predicatefieldvalue_test_app TEST
     predicatefieldvalue_test.cpp
     DEPENDS
     document
-    AFTER
-    document_documentconfig
 )
 vespa_add_test(NAME document_predicatefieldvalue_test_app COMMAND document_predicatefieldvalue_test_app)
 
@@ -32,7 +26,5 @@ vespa_add_executable(document_referencefieldvalue_test_app TEST
     referencefieldvalue_test.cpp
     DEPENDS
     document
-    AFTER
-    document_documentconfig
 )
 vespa_add_test(NAME document_referencefieldvalue_test_app COMMAND document_referencefieldvalue_test_app)
diff --git a/document/src/tests/predicate/CMakeLists.txt b/document/src/tests/predicate/CMakeLists.txt
index 2d5098dfe11..682e8ab2329 100644
--- a/document/src/tests/predicate/CMakeLists.txt
+++ b/document/src/tests/predicate/CMakeLists.txt
@@ -4,8 +4,6 @@ vespa_add_executable(document_predicate_test_app TEST
     predicate_test.cpp
     DEPENDS
     document
-    AFTER
-    document_documentconfig
 )
 vespa_add_test(NAME document_predicate_test_app COMMAND document_predicate_test_app)
 vespa_add_executable(document_predicate_builder_test_app TEST
@@ -13,8 +11,6 @@ vespa_add_executable(document_predicate_builder_test_app TEST
     predicate_builder_test.cpp
     DEPENDS
     document
-    AFTER
-    document_documentconfig
 )
 vespa_add_test(NAME document_predicate_builder_test_app COMMAND document_predicate_builder_test_app)
 vespa_add_executable(document_predicate_printer_test_app TEST
@@ -22,7 +18,5 @@ vespa_add_executable(document_predicate_printer_test_app TEST
     predicate_printer_test.cpp
     DEPENDS
     document
-    AFTER
-    document_documentconfig
 )
 vespa_add_test(NAME document_predicate_printer_test_app COMMAND document_predicate_printer_test_app)
diff --git a/document/src/tests/repo/CMakeLists.txt b/document/src/tests/repo/CMakeLists.txt
index 762d3106dbc..57e814ccc27 100644
--- a/document/src/tests/repo/CMakeLists.txt
+++ b/document/src/tests/repo/CMakeLists.txt
@@ -4,7 +4,5 @@ vespa_add_executable(document_documenttyperepo_test_app TEST
     documenttyperepo_test.cpp
     DEPENDS
     document
-    AFTER
-    document_documentconfig
 )
 vespa_add_test(NAME document_documenttyperepo_test_app COMMAND document_documenttyperepo_test_app)
diff --git a/document/src/tests/serialization/CMakeLists.txt b/document/src/tests/serialization/CMakeLists.txt
index e1ce43b12d4..42531e4709b 100644
--- a/document/src/tests/serialization/CMakeLists.txt
+++ b/document/src/tests/serialization/CMakeLists.txt
@@ -4,8 +4,6 @@ vespa_add_executable(document_vespadocumentserializer_test_app TEST
     vespadocumentserializer_test.cpp
     DEPENDS
     document
-    AFTER
-    document_documentconfig
 )
 vespa_add_test(NAME document_vespadocumentserializer_test_app COMMAND document_vespadocumentserializer_test_app)
 vespa_add_executable(document_annotationserializer_test_app TEST
@@ -13,7 +11,5 @@ vespa_add_executable(document_annotationserializer_test_app TEST
     annotationserializer_test.cpp
     DEPENDS
     document
-    AFTER
-    document_documentconfig
 )
 vespa_add_test(NAME document_annotationserializer_test_app COMMAND document_annotationserializer_test_app)
diff --git a/document/src/tests/struct_anno/CMakeLists.txt b/document/src/tests/struct_anno/CMakeLists.txt
index 7a4f19be647..1f70bc4420a 100644
--- a/document/src/tests/struct_anno/CMakeLists.txt
+++ b/document/src/tests/struct_anno/CMakeLists.txt
@@ -4,7 +4,5 @@ vespa_add_executable(document_struct_anno_test_app TEST
     struct_anno_test.cpp
     DEPENDS
     document
-    AFTER
-    document_documentconfig
 )
 vespa_add_test(NAME document_struct_anno_test_app COMMAND document_struct_anno_test_app)
diff --git a/document/src/tests/tensor_fieldvalue/CMakeLists.txt b/document/src/tests/tensor_fieldvalue/CMakeLists.txt
index 0c80f5af704..3886a4c8e8e 100644
--- a/document/src/tests/tensor_fieldvalue/CMakeLists.txt
+++ b/document/src/tests/tensor_fieldvalue/CMakeLists.txt
@@ -4,7 +4,5 @@ vespa_add_executable(document_tensor_fieldvalue_test_app TEST
     tensor_fieldvalue_test.cpp
     DEPENDS
     document
-    AFTER
-    document_documentconfig
 )
 vespa_add_test(NAME document_tensor_fieldvalue_test_app COMMAND document_tensor_fieldvalue_test_app)
diff --git a/document/src/vespa/document/annotation/CMakeLists.txt b/document/src/vespa/document/annotation/CMakeLists.txt
index 68a0f6fe5b0..b68a4c2950a 100644
--- a/document/src/vespa/document/annotation/CMakeLists.txt
+++ b/document/src/vespa/document/annotation/CMakeLists.txt
@@ -8,6 +8,4 @@ vespa_add_library(document_annotation OBJECT
     spannode.cpp
     spantree.cpp
     DEPENDS
-    AFTER
-    document_documentconfig
 )
diff --git a/document/src/vespa/document/base/CMakeLists.txt b/document/src/vespa/document/base/CMakeLists.txt
index fe048bab533..2abeee9950f 100644
--- a/document/src/vespa/document/base/CMakeLists.txt
+++ b/document/src/vespa/document/base/CMakeLists.txt
@@ -12,6 +12,4 @@ vespa_add_library(document_base OBJECT
     testdocman.cpp
     testdocrepo.cpp
     DEPENDS
-    AFTER
-    document_documentconfig
 )
diff --git a/document/src/vespa/document/bucket/CMakeLists.txt b/document/src/vespa/document/bucket/CMakeLists.txt
index 5e3bc02595a..7704fe94bd0 100644
--- a/document/src/vespa/document/bucket/CMakeLists.txt
+++ b/document/src/vespa/document/bucket/CMakeLists.txt
@@ -10,6 +10,4 @@ vespa_add_library(document_bucket OBJECT
     bucketspace.cpp
     fixed_bucket_spaces.cpp
     DEPENDS
-    AFTER
-    document_documentconfig
 )
diff --git a/document/src/vespa/document/datatype/CMakeLists.txt b/document/src/vespa/document/datatype/CMakeLists.txt
index 8e527677b50..b9277e2ce05 100644
--- a/document/src/vespa/document/datatype/CMakeLists.txt
+++ b/document/src/vespa/document/datatype/CMakeLists.txt
@@ -18,6 +18,4 @@ vespa_add_library(document_datatypes OBJECT
     weightedsetdatatype.cpp
     referencedatatype.cpp
     DEPENDS
-    AFTER
-    document_documentconfig
 )
diff --git a/document/src/vespa/document/fieldset/CMakeLists.txt b/document/src/vespa/document/fieldset/CMakeLists.txt
index f179dc0a687..7604c814019 100644
--- a/document/src/vespa/document/fieldset/CMakeLists.txt
+++ b/document/src/vespa/document/fieldset/CMakeLists.txt
@@ -4,6 +4,4 @@ vespa_add_library(document_fieldset OBJECT
     fieldsetrepo.cpp
     fieldsets.cpp
     DEPENDS
-    AFTER
-    document_documentconfig
 )
diff --git a/document/src/vespa/document/fieldvalue/CMakeLists.txt b/document/src/vespa/document/fieldvalue/CMakeLists.txt
index dcef1bc8305..dd92217ef27 100644
--- a/document/src/vespa/document/fieldvalue/CMakeLists.txt
+++ b/document/src/vespa/document/fieldvalue/CMakeLists.txt
@@ -28,6 +28,4 @@ vespa_add_library(document_fieldvalues OBJECT
     weightedsetfieldvalue.cpp
     referencefieldvalue.cpp
     DEPENDS
-    AFTER
-    document_documentconfig
 )
diff --git a/document/src/vespa/document/predicate/CMakeLists.txt b/document/src/vespa/document/predicate/CMakeLists.txt
index 9c28041eec4..d6370e023ae 100644
--- a/document/src/vespa/document/predicate/CMakeLists.txt
+++ b/document/src/vespa/document/predicate/CMakeLists.txt
@@ -7,6 +7,4 @@ vespa_add_library(document_predicate OBJECT
     predicate_slime_builder.cpp
     predicate_slime_visitor.cpp
     DEPENDS
-    AFTER
-    document_documentconfig
 )
diff --git a/document/src/vespa/document/repo/CMakeLists.txt b/document/src/vespa/document/repo/CMakeLists.txt
index 48265ca15b2..accd204b4ad 100644
--- a/document/src/vespa/document/repo/CMakeLists.txt
+++ b/document/src/vespa/document/repo/CMakeLists.txt
@@ -6,6 +6,4 @@ vespa_add_library(document_repo OBJECT
     document_type_repo_factory.cpp
     fixedtyperepo.cpp
     DEPENDS
-    AFTER
-    document_documentconfig
 )
diff --git a/document/src/vespa/document/select/CMakeLists.txt b/document/src/vespa/document/select/CMakeLists.txt
index e0adfe2b2d9..476440c1dbd 100644
--- a/document/src/vespa/document/select/CMakeLists.txt
+++ b/document/src/vespa/document/select/CMakeLists.txt
@@ -42,8 +42,6 @@ vespa_add_library(document_select OBJECT
     parser_limits.cpp
     ${BISON_DocSelParser_OUTPUTS}
     ${FLEX_DocSelLexer_OUTPUTS}
-    AFTER
-    document_documentconfig
 )
 
 #TODO Remove once we have a recently new flex compiler. At least 2.5.38/39 or 2.6
diff --git a/document/src/vespa/document/serialization/CMakeLists.txt b/document/src/vespa/document/serialization/CMakeLists.txt
index 9b6adbeda38..91090119667 100644
--- a/document/src/vespa/document/serialization/CMakeLists.txt
+++ b/document/src/vespa/document/serialization/CMakeLists.txt
@@ -7,6 +7,4 @@ vespa_add_library(document_serialization OBJECT
     vespadocumentserializer.cpp
     vespadocumentdeserializer.cpp
     DEPENDS
-    AFTER
-    document_documentconfig
 )
diff --git a/document/src/vespa/document/update/CMakeLists.txt b/document/src/vespa/document/update/CMakeLists.txt
index 83374adefbc..a587d8e3e2d 100644
--- a/document/src/vespa/document/update/CMakeLists.txt
+++ b/document/src/vespa/document/update/CMakeLists.txt
@@ -18,6 +18,4 @@ vespa_add_library(document_updates OBJECT
     tensor_remove_update.cpp
     valueupdate.cpp
     DEPENDS
-    AFTER
-    document_documentconfig
 )
diff --git a/document/src/vespa/document/util/CMakeLists.txt b/document/src/vespa/document/util/CMakeLists.txt
index 48ca7bd36d7..9ad7d4cff06 100644
--- a/document/src/vespa/document/util/CMakeLists.txt
+++ b/document/src/vespa/document/util/CMakeLists.txt
@@ -6,6 +6,4 @@ vespa_add_library(document_util OBJECT
     serializableexceptions.cpp
     stringutil.cpp
     DEPENDS
-    AFTER
-    document_documentconfig
 )
diff --git a/searchcorespi/src/tests/plugin/CMakeLists.txt b/searchcorespi/src/tests/plugin/CMakeLists.txt
index b4f3528b518..da785b09b6a 100644
--- a/searchcorespi/src/tests/plugin/CMakeLists.txt
+++ b/searchcorespi/src/tests/plugin/CMakeLists.txt
@@ -16,9 +16,6 @@ vespa_add_executable(searchcorespi_plugin_test_app TEST
     plugin_test.cpp
     DEPENDS
     searchcorespi
-    AFTER
-    searchcorespi_tplugin
-    searchcorespi_illegal-plugin
 )
 vespa_add_test(
     NAME searchcorespi_plugin_test_app
diff --git a/searchlib/src/vespa/searchlib/transactionlog/CMakeLists.txt b/searchlib/src/vespa/searchlib/transactionlog/CMakeLists.txt
index d964c88fe29..bc889ec356d 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/CMakeLists.txt
+++ b/searchlib/src/vespa/searchlib/transactionlog/CMakeLists.txt
@@ -12,6 +12,4 @@ vespa_add_library(searchlib_transactionlog OBJECT
     translogserverapp.cpp
     DEPENDS
     searchlib_sconfig
-    AFTER
-    searchlib_common
 )
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/CMakeLists.txt b/searchsummary/src/vespa/searchsummary/docsummary/CMakeLists.txt
index b5ce0a0619c..ccda57e820c 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/CMakeLists.txt
+++ b/searchsummary/src/vespa/searchsummary/docsummary/CMakeLists.txt
@@ -30,6 +30,4 @@ vespa_add_library(searchsummary_docsummary OBJECT
     summaryfieldconverter.cpp
     textextractordfw.cpp
     tokenizer.cpp
-    AFTER
-    searchsummary_config
 )
diff --git a/searchsummary/src/vespa/searchsummary/test/CMakeLists.txt b/searchsummary/src/vespa/searchsummary/test/CMakeLists.txt
index e79a75de5a2..f5becfce3ae 100644
--- a/searchsummary/src/vespa/searchsummary/test/CMakeLists.txt
+++ b/searchsummary/src/vespa/searchsummary/test/CMakeLists.txt
@@ -2,6 +2,4 @@
 vespa_add_library(searchsummary_test
     SOURCES
     mock_attribute_manager.cpp
-    AFTER
-    searchsummary_config
 )
diff --git a/storage/src/vespa/storage/bucketdb/CMakeLists.txt b/storage/src/vespa/storage/bucketdb/CMakeLists.txt
index abf310d9bae..048cc25ec95 100644
--- a/storage/src/vespa/storage/bucketdb/CMakeLists.txt
+++ b/storage/src/vespa/storage/bucketdb/CMakeLists.txt
@@ -14,8 +14,6 @@ vespa_add_library(storage_bucketdb OBJECT
     storagebucketdbinitializer.cpp
     storbucketdb.cpp
     DEPENDS
-    AFTER
-    storage_storageconfig
 )
 vespa_generate_config(storage_bucketdb stor-bucketdb.def)
 install_config_definition(stor-bucketdb.def vespa.config.content.core.stor-bucketdb.def)
diff --git a/storage/src/vespa/storage/common/CMakeLists.txt b/storage/src/vespa/storage/common/CMakeLists.txt
index c53aead2ba2..20b73987bf3 100644
--- a/storage/src/vespa/storage/common/CMakeLists.txt
+++ b/storage/src/vespa/storage/common/CMakeLists.txt
@@ -16,6 +16,4 @@ vespa_add_library(storage_common OBJECT
     storagelink.cpp
     storagelinkqueued.cpp
     DEPENDS
-    AFTER
-    storage_storageconfig
 )
diff --git a/storage/src/vespa/storage/common/hostreporter/CMakeLists.txt b/storage/src/vespa/storage/common/hostreporter/CMakeLists.txt
index 1a03165801d..5c98e4fa7da 100644
--- a/storage/src/vespa/storage/common/hostreporter/CMakeLists.txt
+++ b/storage/src/vespa/storage/common/hostreporter/CMakeLists.txt
@@ -5,6 +5,4 @@ vespa_add_library(storage_hostreporter OBJECT
     kernelmetrictool.cpp
     versionreporter.cpp
     DEPENDS
-    AFTER
-    storage_storageconfig
 )
diff --git a/storage/src/vespa/storage/distributor/CMakeLists.txt b/storage/src/vespa/storage/distributor/CMakeLists.txt
index 944df6e1708..7fc13046b3f 100644
--- a/storage/src/vespa/storage/distributor/CMakeLists.txt
+++ b/storage/src/vespa/storage/distributor/CMakeLists.txt
@@ -47,6 +47,4 @@ vespa_add_library(storage_distributor
     INSTALL lib64
     DEPENDS
     storage
-    AFTER
-    storage_storageconfig
 )
diff --git a/storage/src/vespa/storage/distributor/bucketdb/CMakeLists.txt b/storage/src/vespa/storage/distributor/bucketdb/CMakeLists.txt
index a7b98e2749b..baa4073a76f 100644
--- a/storage/src/vespa/storage/distributor/bucketdb/CMakeLists.txt
+++ b/storage/src/vespa/storage/distributor/bucketdb/CMakeLists.txt
@@ -3,6 +3,4 @@ vespa_add_library(storage_distributor_bucketdb OBJECT
     SOURCES
     bucketdbmetricupdater.cpp
     DEPENDS
-    AFTER
-    storage_storageconfig
 )
diff --git a/storage/src/vespa/storage/distributor/maintenance/CMakeLists.txt b/storage/src/vespa/storage/distributor/maintenance/CMakeLists.txt
index 3e72a03b4b9..ee2651c4c04 100644
--- a/storage/src/vespa/storage/distributor/maintenance/CMakeLists.txt
+++ b/storage/src/vespa/storage/distributor/maintenance/CMakeLists.txt
@@ -7,6 +7,4 @@ vespa_add_library(storage_distributormaintenance OBJECT
     simplebucketprioritydatabase.cpp
     simplemaintenancescanner.cpp
     DEPENDS
-    AFTER
-    storage_storageconfig
 )
diff --git a/storage/src/vespa/storage/distributor/operations/CMakeLists.txt b/storage/src/vespa/storage/distributor/operations/CMakeLists.txt
index 011ceb99071..4b970b0e9bc 100644
--- a/storage/src/vespa/storage/distributor/operations/CMakeLists.txt
+++ b/storage/src/vespa/storage/distributor/operations/CMakeLists.txt
@@ -3,6 +3,4 @@ vespa_add_library(storage_distributoroperation OBJECT
     SOURCES
     operation.cpp
     DEPENDS
-    AFTER
-    storage_storageconfig
 )
diff --git a/storage/src/vespa/storage/distributor/operations/external/CMakeLists.txt b/storage/src/vespa/storage/distributor/operations/external/CMakeLists.txt
index 998fc22b1d7..bb2992034f7 100644
--- a/storage/src/vespa/storage/distributor/operations/external/CMakeLists.txt
+++ b/storage/src/vespa/storage/distributor/operations/external/CMakeLists.txt
@@ -12,6 +12,4 @@ vespa_add_library(storage_distributoroperationexternal OBJECT
     updateoperation.cpp
     visitoroperation.cpp
     DEPENDS
-    AFTER
-    storage_storageconfig
 )
diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/CMakeLists.txt b/storage/src/vespa/storage/distributor/operations/idealstate/CMakeLists.txt
index 255c177161d..43a157f7d90 100644
--- a/storage/src/vespa/storage/distributor/operations/idealstate/CMakeLists.txt
+++ b/storage/src/vespa/storage/distributor/operations/idealstate/CMakeLists.txt
@@ -11,6 +11,4 @@ vespa_add_library(storage_distributoroperationidealstate OBJECT
     setbucketstateoperation.cpp
     splitoperation.cpp
     DEPENDS
-    AFTER
-    storage_storageconfig
 )
diff --git a/storage/src/vespa/storage/frameworkimpl/component/CMakeLists.txt b/storage/src/vespa/storage/frameworkimpl/component/CMakeLists.txt
index 7122bd488fe..cfac0c25686 100644
--- a/storage/src/vespa/storage/frameworkimpl/component/CMakeLists.txt
+++ b/storage/src/vespa/storage/frameworkimpl/component/CMakeLists.txt
@@ -5,6 +5,4 @@ vespa_add_library(storage_component OBJECT
     servicelayercomponentregisterimpl.cpp
     storagecomponentregisterimpl.cpp
     DEPENDS
-    AFTER
-    storage_storageconfig
 )
diff --git a/storage/src/vespa/storage/frameworkimpl/status/CMakeLists.txt b/storage/src/vespa/storage/frameworkimpl/status/CMakeLists.txt
index 4cb43b86a09..46d89aad714 100644
--- a/storage/src/vespa/storage/frameworkimpl/status/CMakeLists.txt
+++ b/storage/src/vespa/storage/frameworkimpl/status/CMakeLists.txt
@@ -3,6 +3,4 @@ vespa_add_library(storage_status OBJECT
     SOURCES
     statuswebserver.cpp
     DEPENDS
-    AFTER
-    storage_storageconfig
 )
diff --git a/storage/src/vespa/storage/frameworkimpl/thread/CMakeLists.txt b/storage/src/vespa/storage/frameworkimpl/thread/CMakeLists.txt
index 6cc60e53780..17cdf431a57 100644
--- a/storage/src/vespa/storage/frameworkimpl/thread/CMakeLists.txt
+++ b/storage/src/vespa/storage/frameworkimpl/thread/CMakeLists.txt
@@ -5,6 +5,4 @@ vespa_add_library(storage_thread OBJECT
     deadlockdetector.cpp
     htmltable.cpp
     DEPENDS
-    AFTER
-    storage_storageconfig
 )
diff --git a/storage/src/vespa/storage/persistence/CMakeLists.txt b/storage/src/vespa/storage/persistence/CMakeLists.txt
index 08e98e9a58e..6b57477fa23 100644
--- a/storage/src/vespa/storage/persistence/CMakeLists.txt
+++ b/storage/src/vespa/storage/persistence/CMakeLists.txt
@@ -14,6 +14,4 @@ vespa_add_library(storage_spersistence OBJECT
     testandsethelper.cpp
     types.cpp
     DEPENDS
-    AFTER
-    storage_storageconfig
 )
diff --git a/storage/src/vespa/storage/persistence/filestorage/CMakeLists.txt b/storage/src/vespa/storage/persistence/filestorage/CMakeLists.txt
index 704ad434386..d394ec3a5cf 100644
--- a/storage/src/vespa/storage/persistence/filestorage/CMakeLists.txt
+++ b/storage/src/vespa/storage/persistence/filestorage/CMakeLists.txt
@@ -8,6 +8,4 @@ vespa_add_library(storage_filestorpersistence OBJECT
     mergestatus.cpp
     modifiedbucketchecker.cpp
     DEPENDS
-    AFTER
-    storage_storageconfig
 )
diff --git a/storage/src/vespa/storage/storageutil/CMakeLists.txt b/storage/src/vespa/storage/storageutil/CMakeLists.txt
index df942a049fb..b2f6016a341 100644
--- a/storage/src/vespa/storage/storageutil/CMakeLists.txt
+++ b/storage/src/vespa/storage/storageutil/CMakeLists.txt
@@ -3,6 +3,4 @@ vespa_add_library(storage_storageutil OBJECT
     SOURCES
     bloomfilter.cpp
     DEPENDS
-    AFTER
-    storage_storageconfig
 )
diff --git a/storage/src/vespa/storage/tools/CMakeLists.txt b/storage/src/vespa/storage/tools/CMakeLists.txt
index 4bdcc7272db..44b041f97e0 100644
--- a/storage/src/vespa/storage/tools/CMakeLists.txt
+++ b/storage/src/vespa/storage/tools/CMakeLists.txt
@@ -4,22 +4,16 @@ vespa_add_executable(storage_getidealstate_app
     getidealstate.cpp
     DEPENDS
     storage
-    AFTER
-    storage_storageconfig
 )
 vespa_add_executable(storage_generatedistributionbits_app
     SOURCES
     generatedistributionbits.cpp
     DEPENDS
     storage
-    AFTER
-    storage_storageconfig
 )
 vespa_add_executable(storage_storage-cmd_app
     SOURCES
     storage-cmd.cpp
     OUTPUT_NAME vespa-storage-cmd
     DEPENDS
-    AFTER
-    storage_storageconfig
 )
diff --git a/storage/src/vespa/storage/visiting/CMakeLists.txt b/storage/src/vespa/storage/visiting/CMakeLists.txt
index 358cdaa140e..05097163479 100644
--- a/storage/src/vespa/storage/visiting/CMakeLists.txt
+++ b/storage/src/vespa/storage/visiting/CMakeLists.txt
@@ -12,8 +12,6 @@ vespa_add_library(storage_visitor OBJECT
     visitormetrics.cpp
     visitorthread.cpp
     DEPENDS
-    AFTER
-    storage_storageconfig
 )
 vespa_generate_config(storage_visitor stor-visitor.def)
 install_config_definition(stor-visitor.def vespa.config.content.core.stor-visitor.def)
diff --git a/vsm/src/vespa/vsm/searcher/CMakeLists.txt b/vsm/src/vespa/vsm/searcher/CMakeLists.txt
index cecdd2c5ca9..22c89299721 100644
--- a/vsm/src/vespa/vsm/searcher/CMakeLists.txt
+++ b/vsm/src/vespa/vsm/searcher/CMakeLists.txt
@@ -17,6 +17,4 @@ vespa_add_library(vsm_vsmsearcher OBJECT
     utf8exactstringfieldsearcher.cpp
     DEPENDS
     vsm_vconfig
-    AFTER
-    vsm_vconfig
 )
diff --git a/vsm/src/vespa/vsm/vsm/CMakeLists.txt b/vsm/src/vespa/vsm/vsm/CMakeLists.txt
index 203e8a12973..df7d2e52b8c 100644
--- a/vsm/src/vespa/vsm/vsm/CMakeLists.txt
+++ b/vsm/src/vespa/vsm/vsm/CMakeLists.txt
@@ -11,6 +11,4 @@ vespa_add_library(vsm_vsmbase OBJECT
     docsumconfig.cpp
     DEPENDS
     vsm_vconfig
-    AFTER
-    vsm_vconfig
 )