Fork me on GitHub

Changeset 25291dd in git for Makefile


Ignore:
Timestamp:
Oct 17, 2020, 4:05:03 AM (4 years ago)
Author:
Stephen Sekula <sekula@…>
Children:
44f4a4e
Parents:
4e5ed02 (diff), be1a3be (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge remote-tracking branch 'upstream/master'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    r4e5ed02 r25291dd  
    8989DISPLAYLIB = libDelphesDisplay.lib
    9090
    91 VERSION = $(shell cat VERSION)
     91VERSION = x.y.z
    9292DISTDIR = Delphes-$(VERSION)
    9393DISTTAR = $(DISTDIR).tar.gz
     
    174174tmp/examples/Example1.$(ObjSuf): \
    175175        examples/Example1.cpp \
    176         classes/DelphesClasses.h \
    177         external/ExRootAnalysis/ExRootResult.h \
    178         external/ExRootAnalysis/ExRootTreeBranch.h \
    179         external/ExRootAnalysis/ExRootTreeReader.h \
    180         external/ExRootAnalysis/ExRootTreeWriter.h \
    181         external/ExRootAnalysis/ExRootUtilities.h
    182 DelphesValidation$(ExeSuf): \
    183         tmp/validation/DelphesValidation.$(ObjSuf)
    184 
    185 tmp/validation/DelphesValidation.$(ObjSuf): \
    186         validation/DelphesValidation.cpp \
    187176        classes/DelphesClasses.h \
    188177        external/ExRootAnalysis/ExRootResult.h \
     
    199188        stdhep2pileup$(ExeSuf) \
    200189        CaloGrid$(ExeSuf) \
    201         Example1$(ExeSuf) \
    202         DelphesValidation$(ExeSuf)
     190        Example1$(ExeSuf)
    203191
    204192EXECUTABLE_OBJ +=  \
     
    210198        tmp/converters/stdhep2pileup.$(ObjSuf) \
    211199        tmp/examples/CaloGrid.$(ObjSuf) \
    212         tmp/examples/Example1.$(ObjSuf) \
    213         tmp/validation/DelphesValidation.$(ObjSuf)
     200        tmp/examples/Example1.$(ObjSuf)
    214201
    215202DelphesHepMC$(ExeSuf): \
     
    24342421        @echo ">> Building $(DISTTAR)"
    24352422        @mkdir -p $(DISTDIR)
    2436         @cp -a AUTHORS CHANGELOG CMakeLists.txt COPYING DelphesEnv.sh LICENSE NOTICE README README_4LHCb VERSION Makefile MinBias.pileup configure cards classes converters display doc examples external modules python readers validation $(DISTDIR)
     2423        @cp -a AUTHORS CHANGELOG CMakeLists.txt COPYING DelphesEnv.sh LICENSE NOTICE README README_4LHCb Makefile MinBias.pileup configure cards classes converters display doc examples external modules python readers validation $(DISTDIR)
    24372424        @find $(DISTDIR) -depth -name .\* -exec rm -rf {} \;
    24382425        @tar -czf $(DISTTAR) $(DISTDIR)
Note: See TracChangeset for help on using the changeset viewer.