Changeset 91ef0b8 in git for Makefile

Timestamp:

Mar 7, 2021, 9:48:26 AM (4 years ago)

Author:

Franco BEDESCHI <bed@…>

Branches:

master

Children:

bd33fce

Parents:

0d65492 (diff), 363e269 (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:

Fixed conflicts and Reginv3

File:

• Makefile (modified) (2 diffs)

Makefile

@@ -660 +660 @@
 tmp/external/TrackCovariance/TrkUtil.$(ObjSuf): \
         external/TrackCovariance/TrkUtil.$(SrcSuf)
+tmp/external/TrackCovariance/VertexFit.$(ObjSuf): \
+        external/TrackCovariance/VertexFit.$(SrcSuf)
 tmp/modules/AngularSmearing.$(ObjSuf): \
         modules/AngularSmearing.$(SrcSuf) \
@@ -1168 +1170 @@
         tmp/external/TrackCovariance/SolTrack.$(ObjSuf) \
         tmp/external/TrackCovariance/TrkUtil.$(ObjSuf) \
+        tmp/external/TrackCovariance/VertexFit.$(ObjSuf) \
         tmp/modules/AngularSmearing.$(ObjSuf) \
         tmp/modules/BTagging.$(ObjSuf) \