diff --git a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/CMakeLists.txt b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/CMakeLists.txt
index cea1c3fbb00e3f110ea9b912917f22c12bb6e44c..cc436b64173ebf0894648e6ee957a41653ed56c4 100644
--- a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/CMakeLists.txt
+++ b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/CMakeLists.txt
@@ -1,30 +1,8 @@
-################################################################################
-# Package: AnalysisJiveXML
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AnalysisJiveXML )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- GaudiKernel
- Reconstruction/MuonIdentification/muonEvent
- Reconstruction/egamma/egammaEvent
- Reconstruction/tauEvent
- Trigger/TrigEvent/TrigCaloEvent
- graphics/JiveXML
- PRIVATE
- Calorimeter/CaloEvent
- Calorimeter/CaloGeoHelpers
- Control/AthLinks
- Control/AthContainers
- PhysicsAnalysis/AnalysisCommon/CompositeParticleEvent
- PhysicsAnalysis/TruthParticleID/McParticleEvent
- Reconstruction/Jet/JetEvent
- Reconstruction/Particle
- Tracking/TrkEvent/TrkEventPrimitives )
-
# External dependencies:
find_package( CLHEP )
@@ -33,9 +11,7 @@ atlas_add_component( AnalysisJiveXML
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps GaudiKernel muonEvent egammaEvent tauEvent TrigCaloEvent JiveXMLLib CaloEvent CaloGeoHelpers AthLinks AthContainers McParticleEvent JetEvent Particle TrkEventPrimitives )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps CaloEvent CaloGeoHelpers CompositeParticleEvent GaudiKernel JetEvent JiveXMLLib McParticleEvent Particle TrigCaloEvent TrkEventPrimitives egammaEvent muonEvent tauEvent )
# Install files from the package:
-atlas_install_headers( AnalysisJiveXML )
atlas_install_joboptions( share/*.py )
-
diff --git a/PhysicsAnalysis/AnalysisEventDisplay/xAODJiveXML/CMakeLists.txt b/PhysicsAnalysis/AnalysisEventDisplay/xAODJiveXML/CMakeLists.txt
index fdcaafb62686dcf123d0b56fa0c1dbc96dffcdd9..ebb3ec2e3c5a9640650fd91fce98fd1d56a507dc 100644
--- a/PhysicsAnalysis/AnalysisEventDisplay/xAODJiveXML/CMakeLists.txt
+++ b/PhysicsAnalysis/AnalysisEventDisplay/xAODJiveXML/CMakeLists.txt
@@ -1,27 +1,8 @@
-################################################################################
-# Package: xAODJiveXML
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( xAODJiveXML )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODJet
- Event/xAOD/xAODMissingET
- Event/xAOD/xAODMuon
- Event/xAOD/xAODTau
- GaudiKernel
- graphics/JiveXML
- PRIVATE
- Control/AthenaKernel
- Calorimeter/CaloGeoHelpers
- Event/xAOD/xAODBTagging
- Event/xAOD/xAODTracking )
-
# External dependencies:
find_package( CLHEP )
@@ -30,9 +11,7 @@ atlas_add_component( xAODJiveXML
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps xAODCaloEvent xAODEgamma xAODJet xAODMissingET xAODMuon xAODTau GaudiKernel JiveXMLLib CaloGeoHelpers xAODBTagging xAODTracking )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel CaloEvent CaloGeoHelpers JiveXMLLib TrkTrack xAODBTagging xAODCaloEvent xAODEgamma xAODJet xAODMissingET xAODMuon xAODTau xAODTracking )
# Install files from the package:
-atlas_install_headers( xAODJiveXML )
atlas_install_joboptions( share/*.py )
-