build: update LIBRARIES_TO_LINK lists with minimal sets

nsnam · Dec 15, 2023 · 7806ff2 · 7806ff2
1 parent 4a052dd
commit 7806ff2
Show file tree

Hide file tree

Showing 24 changed files with 25 additions and 73 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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