From 7806ff2e857023d715195b36d5072da9a5fa0464 Mon Sep 17 00:00:00 2001 From: Gabriel Ferreira Date: Fri, 17 Nov 2023 12:55:06 -0300 Subject: [PATCH] build: update LIBRARIES_TO_LINK lists with minimal sets --- src/aodv/CMakeLists.txt | 6 ++++-- src/applications/CMakeLists.txt | 1 - src/brite/CMakeLists.txt | 4 +--- src/buildings/CMakeLists.txt | 3 +-- src/click/CMakeLists.txt | 7 ++----- src/config-store/CMakeLists.txt | 1 - src/csma-layout/CMakeLists.txt | 1 - src/dsdv/CMakeLists.txt | 3 ++- src/dsr/CMakeLists.txt | 3 +-- src/flow-monitor/CMakeLists.txt | 1 - src/internet/CMakeLists.txt | 7 ++----- src/lr-wpan/CMakeLists.txt | 7 +------ src/lte/CMakeLists.txt | 4 ---- src/mesh/CMakeLists.txt | 4 ++-- src/mpi/CMakeLists.txt | 6 ++---- src/netanim/CMakeLists.txt | 5 ----- src/network/CMakeLists.txt | 3 +-- src/propagation/CMakeLists.txt | 3 +-- src/tap-bridge/CMakeLists.txt | 5 +---- src/traffic-control/CMakeLists.txt | 1 - src/uan/CMakeLists.txt | 6 ++---- src/visualizer/CMakeLists.txt | 6 ------ src/wifi/CMakeLists.txt | 4 ---- src/wimax/CMakeLists.txt | 7 ++----- 24 files changed, 25 insertions(+), 73 deletions(-) diff --git a/src/aodv/CMakeLists.txt b/src/aodv/CMakeLists.txt index 5839e6a7c..eebb269b5 100644 --- a/src/aodv/CMakeLists.txt +++ b/src/aodv/CMakeLists.txt @@ -18,8 +18,10 @@ build_lib( model/aodv-routing-protocol.h model/aodv-rqueue.h model/aodv-rtable.h - LIBRARIES_TO_LINK ${libinternet} - ${libwifi} + LIBRARIES_TO_LINK + ${libapplications} + ${libinternet-apps} + ${libwifi} TEST_SOURCES test/aodv-id-cache-test-suite.cc test/aodv-regression.cc diff --git a/src/applications/CMakeLists.txt b/src/applications/CMakeLists.txt index 77b0993ad..21ba0aa6d 100644 --- a/src/applications/CMakeLists.txt +++ b/src/applications/CMakeLists.txt @@ -49,7 +49,6 @@ build_lib( model/udp-server.h model/udp-trace-client.h LIBRARIES_TO_LINK ${libinternet} - ${libstats} TEST_SOURCES test/three-gpp-http-client-server-test.cc test/bulk-send-application-test-suite.cc diff --git a/src/brite/CMakeLists.txt b/src/brite/CMakeLists.txt index 999eec62b..1c79e5a27 100644 --- a/src/brite/CMakeLists.txt +++ b/src/brite/CMakeLists.txt @@ -50,9 +50,7 @@ build_lib( SOURCE_FILES helper/brite-topology-helper.cc HEADER_FILES helper/brite-topology-helper.h LIBRARIES_TO_LINK - ${libnetwork} - ${libcore} - ${libinternet} + ${libapplications} ${libpoint-to-point} ${brite_LIBRARIES} TEST_SOURCES test/brite-test-topology.cc diff --git a/src/buildings/CMakeLists.txt b/src/buildings/CMakeLists.txt index 104ddb5fb..ecf2c8230 100644 --- a/src/buildings/CMakeLists.txt +++ b/src/buildings/CMakeLists.txt @@ -30,8 +30,7 @@ build_lib( model/oh-buildings-propagation-loss-model.h model/random-walk-2d-outdoor-mobility-model.h model/three-gpp-v2v-channel-condition-model.h - LIBRARIES_TO_LINK ${libmobility} - ${libpropagation} + LIBRARIES_TO_LINK ${libpropagation} TEST_SOURCES test/buildings-channel-condition-model-test.cc test/buildings-helper-test.cc diff --git a/src/click/CMakeLists.txt b/src/click/CMakeLists.txt index bc0f3a978..1c4e8e9a4 100644 --- a/src/click/CMakeLists.txt +++ b/src/click/CMakeLists.txt @@ -59,10 +59,7 @@ build_lib( helper/click-internet-stack-helper.h model/ipv4-click-routing.h model/ipv4-l3-click-protocol.h - LIBRARIES_TO_LINK - ${libcore} - ${libnetwork} - ${libinternet} - ${click_LIBRARIES} + LIBRARIES_TO_LINK ${libinternet} + ${click_LIBRARIES} TEST_SOURCES test/ipv4-click-routing-test.cc ) diff --git a/src/config-store/CMakeLists.txt b/src/config-store/CMakeLists.txt index a27af1652..ec0b6ed94 100644 --- a/src/config-store/CMakeLists.txt +++ b/src/config-store/CMakeLists.txt @@ -51,7 +51,6 @@ build_lib( model/config-store.h LIBRARIES_TO_LINK ${libcore} - ${libnetwork} ${xml2_libraries} ${gtk_libraries} ) diff --git a/src/csma-layout/CMakeLists.txt b/src/csma-layout/CMakeLists.txt index 56574078c..d985f8e9c 100644 --- a/src/csma-layout/CMakeLists.txt +++ b/src/csma-layout/CMakeLists.txt @@ -3,7 +3,6 @@ build_lib( SOURCE_FILES model/csma-star-helper.cc HEADER_FILES model/csma-star-helper.h LIBRARIES_TO_LINK - ${libnetwork} ${libinternet} ${libcsma} ${libpoint-to-point} diff --git a/src/dsdv/CMakeLists.txt b/src/dsdv/CMakeLists.txt index 11c2d95ae..6b5877b64 100644 --- a/src/dsdv/CMakeLists.txt +++ b/src/dsdv/CMakeLists.txt @@ -12,6 +12,7 @@ build_lib( model/dsdv-packet.h model/dsdv-routing-protocol.h model/dsdv-rtable.h - LIBRARIES_TO_LINK ${libinternet} + LIBRARIES_TO_LINK ${libmesh} + ${libinternet-apps} TEST_SOURCES test/dsdv-testcase.cc ) diff --git a/src/dsr/CMakeLists.txt b/src/dsr/CMakeLists.txt index 1b91253e5..6ec437d85 100644 --- a/src/dsr/CMakeLists.txt +++ b/src/dsr/CMakeLists.txt @@ -30,7 +30,6 @@ build_lib( model/dsr-routing.h model/dsr-rreq-table.h model/dsr-rsendbuff.h - LIBRARIES_TO_LINK ${libinternet} - ${libwifi} + LIBRARIES_TO_LINK ${libmesh} TEST_SOURCES test/dsr-test-suite.cc ) diff --git a/src/flow-monitor/CMakeLists.txt b/src/flow-monitor/CMakeLists.txt index fe4788a3b..1628cbb34 100644 --- a/src/flow-monitor/CMakeLists.txt +++ b/src/flow-monitor/CMakeLists.txt @@ -19,5 +19,4 @@ build_lib( model/ipv6-flow-classifier.h model/ipv6-flow-probe.h LIBRARIES_TO_LINK ${libinternet} - ${libstats} ) diff --git a/src/internet/CMakeLists.txt b/src/internet/CMakeLists.txt index 432bae34c..d5f8288c0 100644 --- a/src/internet/CMakeLists.txt +++ b/src/internet/CMakeLists.txt @@ -340,10 +340,7 @@ build_lib( SOURCE_FILES ${source_files} HEADER_FILES ${header_files} PRIVATE_HEADER_FILES ${private_header_files} - LIBRARIES_TO_LINK - ${libnetwork} - ${libcore} - ${libbridge} - ${libtraffic-control} + LIBRARIES_TO_LINK ${libbridge} + ${libtraffic-control} TEST_SOURCES ${test_sources} ) diff --git a/src/lr-wpan/CMakeLists.txt b/src/lr-wpan/CMakeLists.txt index 2fd307806..5b2cbedd0 100644 --- a/src/lr-wpan/CMakeLists.txt +++ b/src/lr-wpan/CMakeLists.txt @@ -33,12 +33,7 @@ build_lib( model/lr-wpan-phy.h model/lr-wpan-spectrum-signal-parameters.h model/lr-wpan-spectrum-value-helper.h - LIBRARIES_TO_LINK - ${libnetwork} - ${libcore} - ${libmobility} - ${libspectrum} - ${libpropagation} + LIBRARIES_TO_LINK ${libspectrum} TEST_SOURCES test/lr-wpan-ack-test.cc test/lr-wpan-cca-test.cc diff --git a/src/lte/CMakeLists.txt b/src/lte/CMakeLists.txt index 9fca0671a..8e5ba146a 100644 --- a/src/lte/CMakeLists.txt +++ b/src/lte/CMakeLists.txt @@ -349,15 +349,11 @@ build_lib( HEADER_FILES ${header_files} LIBRARIES_TO_LINK ${emu_libraries} - ${libcore} - ${libnetwork} ${libspectrum} - ${libstats} ${libbuildings} ${libvirtual-net-device} ${libpoint-to-point} ${libapplications} - ${libinternet} ${libcsma} ${libconfig-store} TEST_SOURCES ${test_sources} diff --git a/src/mesh/CMakeLists.txt b/src/mesh/CMakeLists.txt index 18f940ede..617b773f2 100644 --- a/src/mesh/CMakeLists.txt +++ b/src/mesh/CMakeLists.txt @@ -65,8 +65,8 @@ build_lib( model/mesh-wifi-beacon.h model/mesh-wifi-interface-mac-plugin.h model/mesh-wifi-interface-mac.h - LIBRARIES_TO_LINK ${libinternet} - ${libwifi} + LIBRARIES_TO_LINK ${libwifi} + ${libapplications} TEST_SOURCES test/dot11s/dot11s-test-suite.cc test/dot11s/hwmp-proactive-regression.cc diff --git a/src/mpi/CMakeLists.txt b/src/mpi/CMakeLists.txt index f5184e8ed..3df1483d2 100644 --- a/src/mpi/CMakeLists.txt +++ b/src/mpi/CMakeLists.txt @@ -21,9 +21,7 @@ build_lib( model/mpi-interface.h model/mpi-receiver.h model/parallel-communication-interface.h - LIBRARIES_TO_LINK - ${libcore} - ${libnetwork} - ${MPI_CXX_LIBRARIES} + LIBRARIES_TO_LINK ${libnetwork} + ${MPI_CXX_LIBRARIES} TEST_SOURCES ${example_as_test_suite} ) diff --git a/src/netanim/CMakeLists.txt b/src/netanim/CMakeLists.txt index bb3a8bdce..9d5ec7b6f 100644 --- a/src/netanim/CMakeLists.txt +++ b/src/netanim/CMakeLists.txt @@ -3,15 +3,10 @@ build_lib( SOURCE_FILES model/animation-interface.cc HEADER_FILES model/animation-interface.h LIBRARIES_TO_LINK - ${libinternet} - ${libmobility} ${libwimax} ${libwifi} - ${libcsma} ${liblte} ${libuan} - ${libenergy} ${liblr-wpan} - ${libpoint-to-point-layout} TEST_SOURCES test/netanim-test.cc ) diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index ba912ee3a..17266fa47 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -154,8 +154,7 @@ build_lib( LIBNAME network SOURCE_FILES ${source_files} HEADER_FILES ${header_files} - LIBRARIES_TO_LINK ${libcore} - ${libstats} + LIBRARIES_TO_LINK ${libstats} TEST_SOURCES test/bit-serializer-test.cc test/buffer-test.cc diff --git a/src/propagation/CMakeLists.txt b/src/propagation/CMakeLists.txt index 62bb29116..666b96a2e 100644 --- a/src/propagation/CMakeLists.txt +++ b/src/propagation/CMakeLists.txt @@ -30,8 +30,7 @@ build_lib( model/propagation-loss-model.h model/three-gpp-propagation-loss-model.h model/three-gpp-v2v-propagation-loss-model.h - LIBRARIES_TO_LINK ${libnetwork} - ${libmobility} + LIBRARIES_TO_LINK ${libmobility} TEST_SOURCES test/channel-condition-model-test-suite.cc test/itu-r-1411-los-test-suite.cc diff --git a/src/tap-bridge/CMakeLists.txt b/src/tap-bridge/CMakeLists.txt index f1cf8a5c5..b12c172da 100644 --- a/src/tap-bridge/CMakeLists.txt +++ b/src/tap-bridge/CMakeLists.txt @@ -28,10 +28,7 @@ build_lib( helper/tap-bridge-helper.h model/tap-bridge.h model/tap-encode-decode.h - LIBRARIES_TO_LINK - ${libcore} - ${libinternet} - ${libnetwork} + LIBRARIES_TO_LINK ${libinternet} ) add_definitions( diff --git a/src/traffic-control/CMakeLists.txt b/src/traffic-control/CMakeLists.txt index 6844029ab..088ca6f63 100644 --- a/src/traffic-control/CMakeLists.txt +++ b/src/traffic-control/CMakeLists.txt @@ -37,7 +37,6 @@ build_lib( model/tbf-queue-disc.h model/traffic-control-layer.h LIBRARIES_TO_LINK ${libnetwork} - ${libcore} TEST_SOURCES test/adaptive-red-queue-disc-test-suite.cc test/cobalt-queue-disc-test-suite.cc diff --git a/src/uan/CMakeLists.txt b/src/uan/CMakeLists.txt index 4be1f690c..97e4501ff 100644 --- a/src/uan/CMakeLists.txt +++ b/src/uan/CMakeLists.txt @@ -48,10 +48,8 @@ build_lib( model/uan-transducer-hd.h model/uan-transducer.h model/uan-tx-mode.h - LIBRARIES_TO_LINK - ${libnetwork} - ${libmobility} - ${libenergy} + LIBRARIES_TO_LINK ${libmobility} + ${libenergy} TEST_SOURCES test/uan-energy-model-test.cc test/uan-test.cc ) diff --git a/src/visualizer/CMakeLists.txt b/src/visualizer/CMakeLists.txt index 30f01c739..fe84723a3 100644 --- a/src/visualizer/CMakeLists.txt +++ b/src/visualizer/CMakeLists.txt @@ -18,15 +18,9 @@ build_lib( HEADER_FILES model/pyviz.h LIBRARIES_TO_LINK ${python_libraries} - ${libcore} ${libinternet} ${libwifi} ${libpoint-to-point} - ${libcsma} - ${libbridge} - ${libwimax} - ${liblte} - ${libmesh} ) # move visualizer folder to build/bindings/python, which allows us to add only diff --git a/src/wifi/CMakeLists.txt b/src/wifi/CMakeLists.txt index edd3689b5..874606cd0 100644 --- a/src/wifi/CMakeLists.txt +++ b/src/wifi/CMakeLists.txt @@ -324,12 +324,8 @@ build_lib( SOURCE_FILES ${source_files} HEADER_FILES ${header_files} LIBRARIES_TO_LINK - ${libnetwork} - ${libpropagation} ${libenergy} ${libspectrum} - ${libantenna} - ${libmobility} ${gsl_libraries} TEST_SOURCES test/block-ack-test-suite.cc diff --git a/src/wimax/CMakeLists.txt b/src/wimax/CMakeLists.txt index 1bc60519f..e718ccc60 100644 --- a/src/wimax/CMakeLists.txt +++ b/src/wimax/CMakeLists.txt @@ -100,11 +100,8 @@ build_lib( LIBNAME wimax SOURCE_FILES ${source_files} HEADER_FILES ${header_files} - LIBRARIES_TO_LINK - ${libnetwork} - ${libinternet} - ${libpropagation} - ${libmobility} + LIBRARIES_TO_LINK ${libinternet} + ${libpropagation} TEST_SOURCES test/mac-messages-test.cc test/phy-test.cc