From 762d0f8c1966cd65a4f5b14b0a6fa1d88006c3fe Mon Sep 17 00:00:00 2001 From: Geng Chen Date: Thu, 18 Sep 2014 12:42:05 +0200 Subject: [PATCH] New one --- plugins/Makefile | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/plugins/Makefile b/plugins/Makefile index c518c0a..06007cd 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -1,7 +1,6 @@ GCCFLAGS=-Wall -g ROOTFLAGS=`root-config --cflags --libs` -<<<<<<< HEAD TOOLSFLAGS=$(GCCFLAGS) -I$(ROOTSYS)/include -c SELECTORFLAGS=$(GCCFLAGS) $(ROOTFLAGS) -lProof FIGURESFLAGS=$(GCCFLAGS) $(ROOTFLAGS) @@ -22,23 +21,3 @@ fit: SingleBuToKMuMuFitters.cc clean: rm -rf sel fig fit -======= -SELECTORFLAGS=$(GCCFLAGS) $(ROOTFLAGS) -lProof -FIGURESFLAGS=$(GCCFLAGS) $(ROOTFLAGS) -FITFLAGS=$(GCCFLAGS) $(ROOTFLAGS) -lRooFit -lRooFitCore - -all: sel fig fit - @echo "Full build successful." - -sel: SingleBuToKMuMuSelector.cc - g++ $(SELECTORFLAGS) $< -o $@ - -fig: SingleBuToKMuMuFigures.cc - g++ $(FIGURESFLAGS) $< -o $@ - -fit: SingleBuToKMuMuFitters.cc - g++ $(FITFLAGS) $< -o $@ - -clean: - rm -rf sel fig fit ->>>>>>> 079f0fc10915ff5ec232d76f56b47756c1255c32