Changeset aafe927 in git for Makefile

Timestamp:

Aug 28, 2020, 5:29:36 PM (4 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

f0f1443

Parents:

d192152 (diff), a643a7f (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.

git-author:

Aleksander Filip Żarnecki <zarnecki@…> (08/28/20 17:29:36)

git-committer:

GitHub <noreply@…> (08/28/20 17:29:36)

Message:

Merge pull request #1 from delphes/master

Updating my fork

File:

• Makefile (modified) (5 diffs)

Makefile

@@ -89 +89 @@
 DISPLAYLIB = libDelphesDisplay.lib
 
-VERSION = $(shell cat VERSION)
+VERSION = x.y.z
 DISTDIR = Delphes-$(VERSION)
 DISTTAR = $(DISTDIR).tar.gz
@@ -174 +174 @@
 tmp/examples/Example1.$(ObjSuf): \
         examples/Example1.cpp \
-        classes/DelphesClasses.h \
-        external/ExRootAnalysis/ExRootResult.h \
-        external/ExRootAnalysis/ExRootTreeBranch.h \
-        external/ExRootAnalysis/ExRootTreeReader.h \
-        external/ExRootAnalysis/ExRootTreeWriter.h \
-        external/ExRootAnalysis/ExRootUtilities.h
-DelphesValidation$(ExeSuf): \
-        tmp/validation/DelphesValidation.$(ObjSuf)
-
-tmp/validation/DelphesValidation.$(ObjSuf): \
-        validation/DelphesValidation.cpp \
         classes/DelphesClasses.h \
         external/ExRootAnalysis/ExRootResult.h \
@@ -199 +188 @@
         stdhep2pileup$(ExeSuf) \
         CaloGrid$(ExeSuf) \
-        Example1$(ExeSuf) \
-        DelphesValidation$(ExeSuf)
+        Example1$(ExeSuf)
 
 EXECUTABLE_OBJ +=  \
@@ -210 +198 @@
         tmp/converters/stdhep2pileup.$(ObjSuf) \
         tmp/examples/CaloGrid.$(ObjSuf) \
-        tmp/examples/Example1.$(ObjSuf) \
-        tmp/validation/DelphesValidation.$(ObjSuf)
+        tmp/examples/Example1.$(ObjSuf)
 
 DelphesHepMC$(ExeSuf): \
@@ -2434 +2421 @@
         @echo ">> Building $(DISTTAR)"
         @mkdir -p $(DISTDIR)
-        @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)
+        @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)
         @find $(DISTDIR) -depth -name .\* -exec rm -rf {} \;
         @tar -czf $(DISTTAR) $(DISTDIR)