8000 Merge updated repo from svn repository by sudoankit · Pull Request #2 · skluth/RooUnfold · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Merge updated repo from svn repository #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Merge updated repo from svn repository #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 46 additions & 30 deletions GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#===============================================================================
# File and Version Information:
# $Id$
# $Id: GNUmakefile 352 2015-04-14 11:00:05Z T.J.Adye@rl.ac.uk $
#
# Description:
# Makefile for the RooUnfold package
Expand All @@ -19,13 +19,14 @@
# - Add NOROOFIT=1 to link without RooFit (this is default if RooFit is not available).
# - Add SHARED=1 to link test executables with shared library (libRooUnfold.so).
# Otherwise links with static library (libRooUnfold.a).
# To used the shared library: export LD_LIBRARY_PATH="$PWD:$LD_LIBRARY_PATH"
# - Add ROOTBUILD=debug for debug version.
# - Add VERBOSE=1 to show commands as they are executed.
#
# Build targets:
# help - give brief help
# shlib - make libRooUnfold.so (default target)
# include - make dependency files (*.d)
# depend - make dependency files (*.d)
# lib - make libRooUnfold.a
# bin - make lib and example programs
# commands- show commands to make each type of target
Expand All @@ -40,15 +41,15 @@

# === ROOT setup ===============================================================

RC0 := root-config
ROOTSYS0 := $(shell $(RC0) --prefix 2>/dev/null)
RC := root-config
ROOTSYS0 := $(shell $(RC) --prefix 2>/dev/null)
ifeq ($(ROOTSYS0),)
ifeq ($(ROOTSYS),)
$(error $(RC0) not found and $$ROOTSYS is not defined)
$(error $(RC) not found and $$ROOTSYS is not defined)
endif
ETC := $(ROOTSYS)/etc $(ROOTSYS)/test
else
ETC := $(shell $(RC0) --etcdir 2>/dev/null)
ETC := $(shell $(RC) --etcdir 2>/dev/null)
ifeq ($(ETC),)
ETC := $(ROOTSYS0)/etc $(ROOTSYS0)/test
else
Expand All @@ -58,8 +59,11 @@ endif

ROOT_MAKEFILE=$(firstword $(wildcard $(addsuffix /Makefile.arch,$(ETC))))
ifeq ($(ROOT_MAKEFILE),)
ifeq ($(MAKE_RESTARTS),)
$(warning Could not find Makefile.arch under $(word 1,$(ETC)) or $(word 2,$(ETC)) - trying a basic Linux config)
endif
else
RC :=
-include $(ROOT_MAKEFILE)
ifeq ($(ARCH),)
$(warning $(ROOT_MAKEFILE) setup failed (no $$ARCH) - trying a basic Linux config)
Expand Down Expand Up @@ -103,12 +107,18 @@ endif
ROOTINCDIR = $(shell $(RC) --incdir)
ROOTLIBDIR = $(shell $(RC) --libdir)
ROOTINCLUDES = -I$(ROOTINCDIR)
ifeq ($(ROOTCINT)$(ROOTCLING),)
ifeq ($(shell $(RC) --has-cling),yes)
ifeq ($(ROOTCLING),)
ROOTCLING = rootcling
endif
else
ifeq ($(ROOTCINT),)
ROOTCINT = rootcint
endif
ifeq ($(RLIBMAP),)
RLIBMAP = rlibmap
endif
endif
ifeq ($(VERBOSE),1)
_ =
else
Expand Down Expand Up @@ -225,7 +235,7 @@ LINKDEFMAP = $(WORKDIR)$(PACKAGE)Map_LinkDef
HLIST = $(filter-out $(addprefix $(INCDIR),$(EXCLUDE)) $(LINKDEF),$(wildcard $(INCDIR)*.h)) $(LINKDEF)
CINTFILE = $(WORKDIR)$(PACKAGE)Dict.cxx
ifneq ($(ROOTCLING),)
CLINGDICT = $(CURDIR)/$(PACKAGE)Dict_rdict.pcm
CLINGDICT = $(SHLIBDIR)/$(PACKAGE)Dict_rdict.pcm
endif
CINTOBJ = $(OBJDIR)$(PACKAGE)Dict.$(ObjSuf)
LIBNAME = $(PACKAGE)
Expand All @@ -237,7 +247,7 @@ ROOTMAP = $(SHLIBDIR)lib$(LIBNAME).rootmap
ifeq ($(MAKECMDGOALS),)
GOALS = default
else
GOALS = $(filter-out clean cleanbin help,$(MAKECMDGOALS))
GOALS = $(filter-out clean cleanbin help commands,$(MAKECMDGOALS))
endif

CPPFLAGS += -DMAKEBUILD
Expand Down Expand Up @@ -293,7 +303,7 @@ endif
endif

ifeq ($(NOROOFIT),)
ifeq ($(DLIST),)
ifeq ($(wildcard $(DLIST)),)
# Since we can't check the dependencies, include RooFit on all binaries
ROOFITCLIENTS = $(patsubst %.cxx,$(OBJDIR)%.$(ObjSuf),$(MAIN))
else
Expand All @@ -316,7 +326,7 @@ $(DEPDIR)%.d : $(SRCDIR)%.cxx
@mkdir -p $(DEPDIR)
@rm -f $@
$(_)set -e; \
$(CXX) $(MFLAGS) $(CPPFLAGS) $(INCLUDES) $(ROOTINCLUDES) $< \
$(CXX) $(MFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) $< \
| sed 's,\($(notdir $*)\.$(ObjSuf)\) *:,$(OBJDIR)\1 $@ :,g' > $@; \
[ -s $@ ] || rm -f $@

Expand All @@ -325,7 +335,7 @@ $(DEPDIR)%.d : $(EXESRC)%.cxx
@mkdir -p $(DEPDIR)
@rm -f $@
$(_)set -e; \
$(CXX) $(MFLAGS) $(CPPFLAGS) $(INCLUDES) $(ROOTINCLUDES) $< \
$(CXX) $(MFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) $< \
| sed 's,\($(notdir $*)\.$(ObjSuf)\) *:,$(OBJDIR)\1 $@ :,g' > $@; \
[ -s $@ ] || rm -f $@

Expand Down Expand Up @@ -383,30 +393,34 @@ help :
@echo "Some TARGETs are: 'bin', 'html', 'clean', and 'commands'"

# Rule to make ROOTCINT output file
$(CINTFILE) $(CLINGDICT) : $(HLIST)
ifeq ($(ROOTCLING),)
$(CINTFILE) : $(HLIST)
@mkdir -p $(WORKDIR)
@mkdir -p $(OBJDIR)
@echo "Generating dictionary from $(LINKDEF)"
ifeq ($(ROOTCLING),)
$(_)$(ROOTCINT) -f $(CINTFILE) -c -p $(CPPFLAGS) $(INCLUDES) $(HLIST)
else
$(_)$(ROOTCLING) -f $(CINTFILE) $(CPPFLAGS) $(INCLUDES) $(HLIST)
$(_)mv -f $(dir $(CINTFILE))$(notdir $(CLINGDICT)) $(CLINGDICT)
endif
@echo "Generating CINT dictionary $(CINTFILE)"
$(_)$(ROOTCINT) -f $(CINTFILE) -c -p $(CPPFLAGS) $(INCLUDES) $(HLIST)

$(ROOTMAP) : $(SHLIBFILE) $(LINKDEF)
@echo "Making $@"
@echo "Making CINT $@"
$(_)echo TObject.h TMemberInspector.h $(HLIST) | tr ' ' '\n' | sed 's/^\(.*\)$$/#include "\1"/' > $(LINKDEFMAP).cxx
$(_)$(CXX) -E -D__MAKECINT__ -D__CINT__ -o $(LINKDEFMAP).h $(CPPFLAGS) $(INCLUDES) $(ROOTINCLUDES) $(LINKDEFMAP).cxx
$(_)$(RLIBMAP) -o $@ -l $< -d $(ROOTLIBFILES) -c $(LINKDEFMAP).h
else
$(CINTFILE) $(CLINGDICT) $(ROOTMAP) : $(HLIST)
@mkdir -p $(WORKDIR)
@mkdir -p $(OBJDIR)
@echo "Generating CLING dictionary files $(CINTFILE), $(CLINGDICT), and $(ROOTMAP)"
$(_)$(ROOTCLING) -f $(CINTFILE) -rml $(notdir $(SHLIBFILE)) -rmf $(ROOTMAP) $(CPPFLAGS) $(INCLUDES) $(HLIST)
$(_)mv -f $(dir $(CINTFILE))$(notdir $(CLINGDICT)) $(CLINGDICT)
endif

# Rule to combine objects into a library
$(LIBFILE) : $(OLIST) $(CINTOBJ)
@echo "Making $@"
@mkdir -p $(LIBDIR)
@rm -f $@
$(_)ar q $@ $^
@ranlib $@
$(_)ar cq $@ $^
$(_)ranlib $@

# Make symlink to static library so we can refer to that without picking up shared library.
# Assumes $(LIBFILE) and $(STATICLIBFILE) are in the same directory
Expand All @@ -422,18 +436,20 @@ $(SHLIBFILE) : $(OLIST) $(CINTOBJ)
$(_)$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt)$@ $(ROOTLIBS) $(GCCLIBS)

# Useful build targets
include: $(DLIST)
depend: $(DLIST)
include: depend
lib: $(LIBFILE)
shlib: $(SHLIBFILE) $(ROOTMAP) $(CLINGDICT)
bin: shlib $(MAINEXE)
exe: $(MAINEXE)
bin: shlib exe

commands :
@echo "Make $(DEPDIR)%.d: $(CXX) $(MFLAGS) $(CPPFLAGS) $(INCLUDES) $(ROOTINCLUDES) $(SRCDIR)%.cxx | sed 's,\(%\.$(ObjSuf)\) *:,$(OBJDIR)\1 $(DEPDIR)%.d :,g' > $(DEPDIR)%.d"
@echo "Make $(DEPDIR)%.d: $(CXX) $(MFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) $(SRCDIR)%.cxx | sed 's,\(%\.$(ObjSuf)\) *:,$(OBJDIR)\1 $(DEPDIR)%.d :,g' > $(DEPDIR)%.d"
@echo
ifeq ($(ROOTCLING),)
@echo "Make dictionary: $(ROOTCINT) -f $(CINTFILE) -c -p $(CPPFLAGS) $(INCLUDES) $(HLIST)"
@echo "Make dictionary: $(ROOTCINT) -f $(CINTFILE) -c -p $(CPPFLAGS) $(INCLUDES) $(HLIST)"
else
@echo "Make dictionary: $(ROOTCLING) -f $(CINTFILE) $(CPPFLAGS) $(INCLUDES) $(HLIST)"
@echo "Make dictionary: $(ROOTCLING) -f $(CINTFILE) -rml $(notdir $(SHLIBFILE)) -rmf $(ROOTMAP) $(CPPFLAGS) $(INCLUDES) $(HLIST)"
endif
@echo
@echo "Compile $(SRCDIR)%.cxx: $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(SRCDIR)%.cxx -o $(OBJDIR)%.$(ObjSuf) $(INCLUDES)"
Expand Down Expand Up @@ -463,11 +479,11 @@ $(HTMLDOC)/index.html : $(SHLIBFILE)
echo 'h.SetOutputDir("$(HTMLDOC)");'; \
echo 'h.MakeAll();'; \
echo '.q' ) \
| root -l -b
| ROOT_HIST=0 root -n -l -b

html : $(HTMLDOC)/index.html

.PHONY : include shlib lib bin default clean cleanbin html help
.PHONY : include depend shlib lib exe bin default clean cleanbin html help

ifneq ($(GOALS),)
ifneq ($(DLIST),)
Expand Down
13 changes: 12 additions & 1 deletion History
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
History of RooUnfold $Id$
History of RooUnfold $Id: History 352 2015-04-14 11:00:05Z T.J.Adye@rl.ac.uk $
====================

Tim Adye 14-Apr-2015
o Make sure RooUnfoldDict_rdict.pcm is in same directory as libRooUnfold.so.
o Update "make commands".

Tim Adye 13-Apr-2015
More GNUmakefile fixes for ROOT6:
o Use rootcling (instead of rlibmap) to make libRooUnfold.rootmap.
o Include $(CXXFLAGS) (notably -std=c++11) in dependency file creation.
o Fallback if dependency file creation fails.
o Fallback if no Makefile.arch, also for ROOT installed in default location.

Tim Adye 7-Oct-2014
o Fix GNUmakefile for old ROOT (5.30 and before) which defined ROOTCONFIG
instead of RC [Bug reported by Linda Finco.]
Expand Down
2 changes: 1 addition & 1 deletion README
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RooUnfold $Id$
RooUnfold $Id: README 247 2010-10-04 22:04:21Z T.J.Adye $
=========

RooUnfold is a framework for unfolding (AKA "deconvolution" or "unsmearing").
Expand Down
0