diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/CMakeLists.txt b/MuonSpectrometer/MuonCnv/MuonByteStream/CMakeLists.txt
index 4a347e181a64759ff189a310d9736a3c1afba660..86adbf907fa96c8c30b997f9ba905f264fe12b3f 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStream/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/CMakeLists.txt
@@ -5,29 +5,6 @@
# Declare the package name:
atlas_subdir( MuonByteStream )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- DetectorDescription/IRegionSelector
- Database/AthenaPOOL/AthenaPoolUtilities
- Event/ByteStreamCnvSvcBase
- Event/ByteStreamData
- GaudiKernel
- MuonSpectrometer/MuonCnv/MuonCSC_CnvTools
- MuonSpectrometer/MuonCnv/MuonCnvToolInterfaces
- Trigger/TrigEvent/TrigSteeringEvent
- PRIVATE
- Control/StoreGate
- Control/AthViews
- Trigger/TrigSteer/ViewAlgs
- MuonSpectrometer/MuonCablings/CSCcabling
- MuonSpectrometer/MuonCablings/RPCcablingInterface
- MuonSpectrometer/MuonCnv/MuonMDT_CnvTools
- MuonSpectrometer/MuonCnv/MuonRPC_CnvTools
- MuonSpectrometer/MuonIdHelpers
- MuonSpectrometer/MuonAlignment/MuonAlignmentData
- MuonSpectrometer/MuonRDO )
-
# External dependencies:
find_package( tdaq-common )
find_package( CLHEP )
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/CMakeLists.txt b/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/CMakeLists.txt
index 76d83a689fe9156649d8472e54599963cd5450bb..fd7fb5d00af806d5534f37bedaf549ddf6319a36 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/CMakeLists.txt
@@ -5,34 +5,6 @@
# Declare the package name:
atlas_subdir( MuonByteStreamCnvTest )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/StoreGate
- GaudiKernel
- MuonSpectrometer/MuonCablings/RPCcablingInterface
- MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools
- MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
- MuonSpectrometer/MuonDigitization/MuonDigToolInterfaces
- MuonSpectrometer/MuonRDO
- Trigger/TrigT1/TrigT1RPChardware
- Trigger/TrigT1/TrigT1RPClogic
- PRIVATE
- Event/EventInfoMgt
- MuonSpectrometer/MuonCablings/MuonMDT_Cabling
- MuonSpectrometer/MuonCablings/TGCcablingInterface
- MuonSpectrometer/MuonCnv/MuonCSC_CnvTools
- MuonSpectrometer/MuonCnv/MuonMDT_CnvTools
- MuonSpectrometer/MuonCnv/MuonRPC_CnvTools
- MuonSpectrometer/MuonCnv/MuonTGC_CnvTools
- MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools
- MuonSpectrometer/MuonCnv/MuonMM_CnvTools
- MuonSpectrometer/MuonDigitContainer
- MuonSpectrometer/MuonIdHelpers
- MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData
- MuonSpectrometer/MuonConditions/MuonCondCabling/RPC_CondCabling
- MuonSpectrometer/MuonCablings/MuonCablingData )
-
# Component(s) in the package:
atlas_add_library( MuonByteStreamCnvTestLib
src/*.cxx
diff --git a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/CMakeLists.txt b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/CMakeLists.txt
index ee7ffa0002b0d10c11522b5310d4192fcc9bf959..64a678329edad85e28ddedd1ac47eaf1a9ce3cd6 100644
--- a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/CMakeLists.txt
@@ -5,29 +5,6 @@
# Declare the package name:
atlas_subdir( MuonCSC_CnvTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Event/ByteStreamData
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- DetectorDescription/Identifier
- Event/ByteStreamCnvSvcBase
- Event/EventInfo
- Event/EventPrimitives
- MuonSpectrometer/MuonCablings/CSCcabling
- MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools
- MuonSpectrometer/MuonCnv/MuonCnvToolInterfaces
- MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
- MuonSpectrometer/MuonDigitContainer
- MuonSpectrometer/MuonDigitization/MuonDigToolInterfaces
- MuonSpectrometer/MuonIdHelpers
- MuonSpectrometer/MuonRDO
- MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData
- Tracking/TrkDetDescr/TrkSurfaces )
-
# External dependencies:
find_package( CLHEP )
find_package( tdaq-common COMPONENTS eformat_write DataWriter )
diff --git a/MuonSpectrometer/MuonCnv/MuonCnvToolInterfaces/CMakeLists.txt b/MuonSpectrometer/MuonCnv/MuonCnvToolInterfaces/CMakeLists.txt
index 4b2e8e5c0c4bfe1a72cb03753c36aba876220d09..78c3b25d3f6eb4ec01b0b2d7d15848a31b42026c 100644
--- a/MuonSpectrometer/MuonCnv/MuonCnvToolInterfaces/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCnv/MuonCnvToolInterfaces/CMakeLists.txt
@@ -5,15 +5,6 @@
# Declare the package name:
atlas_subdir( MuonCnvToolInterfaces )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Control/AthContainers
- DetectorDescription/Identifier
- Event/ByteStreamCnvSvcBase
- Event/ByteStreamData
- GaudiKernel )
-
# External dependencies:
find_package( tdaq-common )
find_package( ROOT )
diff --git a/MuonSpectrometer/MuonCnv/MuonEventCnvTools/CMakeLists.txt b/MuonSpectrometer/MuonCnv/MuonEventCnvTools/CMakeLists.txt
index 798927efa842b85619c5257360c5f2ea7968bafa..07f3747bdc817db62616214b9aa3b443c6a2b215 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventCnvTools/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCnv/MuonEventCnvTools/CMakeLists.txt
@@ -5,23 +5,6 @@
# Declare the package name:
atlas_subdir( MuonEventCnvTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Tracking/TrkEventCnv/TrkEventCnvTools
- PRIVATE
- Control/StoreGate
- DetectorDescription/Identifier
- Event/EventPrimitives
- GaudiKernel
- MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
- MuonSpectrometer/MuonIdHelpers
- MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData
- MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonRIO_OnTrack
- Tracking/TrkDetDescr/TrkDetElementBase
- Tracking/TrkEvent/TrkPrepRawData
- Tracking/TrkEvent/TrkRIO_OnTrack )
-
# Component(s) in the package:
atlas_add_component( MuonEventCnvTools
src/*.cxx
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/CMakeLists.txt b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/CMakeLists.txt
index e97334a2c1563f1b9520dc3a97cc8d13b1851bc3..46cba3be2fabf8db175e23f807fab61b9f17f79b 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/CMakeLists.txt
@@ -6,54 +6,6 @@
# Declare the package name:
atlas_subdir( MuonEventTPCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthAllocators
- Control/AthLinks
- Control/DataModelAthenaPool
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/Identifier
- GaudiKernel
- Generators/GeneratorObjectsTPCnv
- MuonSpectrometer/MuonDigitContainer
- MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonChamberT0s
- MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonCompetingRIOsOnTrack
- MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData
- MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonRIO_OnTrack
- MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonSegment
- MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonTrigCoinData
- MuonSpectrometer/MuonRDO
- MuonSpectrometer/MuonSimData
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkEvent/TrkRIO_OnTrack
- Tracking/TrkEventCnv/TrkEventCnvTools
- Tracking/TrkEventCnv/TrkEventTPCnv
- PRIVATE
- AtlasTest/TestTools
- Control/AthenaKernel
- Control/StoreGate
- Database/TPTools
- DetectorDescription/AGDD/AGDDKernel
- DetectorDescription/AtlasDetDescr
- DetectorDescription/GeoPrimitives
- DetectorDescription/IdDict
- DetectorDescription/IdDictDetDescr
- DetectorDescription/IdDictParser
- Event/EventPrimitives
- InnerDetector/InDetDetDescr/InDetIdentifier
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- InnerDetector/InDetDetDescr/PixelReadoutGeometry
- InnerDetector/InDetDetDescr/SCT_ReadoutGeometry
- InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
- MuonSpectrometer/MuonDetDescr/MuonAGDDDescription
- MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
- MuonSpectrometer/MuonIdHelpers
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkMeasurementBase
- Tracking/TrkEvent/TrkPseudoMeasurementOnTrack )
-
find_package( GeoModelCore )
# Component(s) in the package:
diff --git a/MuonSpectrometer/MuonCnv/MuonIdCnv/CMakeLists.txt b/MuonSpectrometer/MuonCnv/MuonIdCnv/CMakeLists.txt
index 8ee78d734ff548c81e38ef48542d13dc45726f67..89ced18a6eee73b829043fae494151f2e585d2da 100644
--- a/MuonSpectrometer/MuonCnv/MuonIdCnv/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCnv/MuonIdCnv/CMakeLists.txt
@@ -5,14 +5,6 @@
# Declare the package name:
atlas_subdir( MuonIdCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Control/StoreGate
- DetectorDescription/DetDescrCnvSvc
- DetectorDescription/IdDictDetDescr
- GaudiKernel
- MuonSpectrometer/MuonIdHelpers )
-
# Component(s) in the package:
atlas_add_component( MuonIdCnv
src/*.cxx
diff --git a/MuonSpectrometer/MuonCnv/MuonJiveXML/CMakeLists.txt b/MuonSpectrometer/MuonCnv/MuonJiveXML/CMakeLists.txt
index ccd608d7755e9b786913a703c8d5c630e44e28b6..1249272f11666f7c3523a51319e3365fa86a358a 100644
--- a/MuonSpectrometer/MuonCnv/MuonJiveXML/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCnv/MuonJiveXML/CMakeLists.txt
@@ -5,21 +5,6 @@
# Declare the package name:
atlas_subdir( MuonJiveXML )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
- graphics/JiveXML
- PRIVATE
- GaudiKernel
- MuonSpectrometer/MuonCablings/RPCcablingInterface
- MuonSpectrometer/MuonCnv/MuonRPC_CnvTools
- MuonSpectrometer/MuonIdHelpers
- MuonSpectrometer/MuonRDO
- MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData
- MuonSpectrometer/MuonConditions/MuonCondCabling/RPC_CondCabling
- PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent )
-
# External dependencies:
find_package( CLHEP )
@@ -28,7 +13,7 @@ atlas_add_component( MuonJiveXML
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps MuonReadoutGeometry JiveXMLLib GaudiKernel RPCcablingInterfaceLib MuonIdHelpersLib MuonRDO MuonPrepRawData AnalysisTriggerEvent RPC_CondCablingLib)
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps MuonRPC_CnvToolsLib MuonReadoutGeometry JiveXMLLib GaudiKernel RPCcablingInterfaceLib MuonIdHelpersLib MuonRDO MuonPrepRawData AnalysisTriggerEvent RPC_CondCablingLib)
# Install files from the package:
atlas_install_headers( MuonJiveXML )