New one

cms-bph · Sep 18, 2014 · 762d0f8 · 762d0f8
1 parent d129f64
commit 762d0f8
Showing 1 changed file with 0 additions and 21 deletions.
diff --git 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