Skip to content
Snippets Groups Projects
Commit a32a21e8 authored by Eckhard von Toerne's avatar Eckhard von Toerne
Browse files

adjusting makefile to reflect move of include directory, updating Version.h

git-svn-id: http://root.cern.ch/svn/root/trunk@39846 27541ba8-7e3a-0410-8455-c3a389f83636
parent 1fbc42b6
Branches
Tags
No related merge requests found
......@@ -57,10 +57,10 @@ DICTH4 := TNeuron.h TSynapse.h TActivationChooser.h TActivation.h TActivat
TNeuronInputSqSum.h TNeuronInputAbs.h Types.h Ranking.h RuleFit.h RuleFitAPI.h IMethod.h MsgLogger.h \
VariableTransformBase.h VariableIdentityTransform.h VariableDecorrTransform.h VariablePCATransform.h \
VariableGaussTransform.h VariableNormalizeTransform.h VariableRearrangeTransform.h
DICTH1 := $(patsubst %,inc/%,$(DICTH1))
DICTH2 := $(patsubst %,inc/%,$(DICTH2))
DICTH3 := $(patsubst %,inc/%,$(DICTH3))
DICTH4 := $(patsubst %,inc/%,$(DICTH4))
DICTH1 := $(patsubst %,inc/TMVA/%,$(DICTH1))
DICTH2 := $(patsubst %,inc/TMVA/%,$(DICTH2))
DICTH3 := $(patsubst %,inc/TMVA/%,$(DICTH3))
DICTH4 := $(patsubst %,inc/TMVA/%,$(DICTH4))
DICTH := $(DICTH1) $(DICTH2) $(DICTH3) $(DICTH4)
......@@ -76,7 +76,7 @@ UNAME = $(shell uname)
default: shlib linklib
# List of all source files to build
HLIST = $(filter-out $(SKIPHLIST),$(wildcard inc/*.h))
HLIST = $(filter-out $(SKIPHLIST),$(wildcard inc/TMVA/*.h))
CPPLIST = $(filter-out $(SKIPCPPLIST),$(patsubst src/%,%,$(wildcard src/*.$(SrcSuf))))
# List of all object files to build
......@@ -87,12 +87,12 @@ DEPLIST=$(foreach var,$(CPPLIST:.$(SrcSuf)=.d),$(DEPDIR)/$(var))
# Implicit rule to compile all classes
sl:
if [[ ( ! -e TMVA ) ]]; then \
ln -sf inc TMVA; \
ln -sf inc/TMVA TMVA; \
fi
$(OBJDIR)/%.o : src/%.cxx
if [[ ( ! -e TMVA ) ]]; then \
ln -sf inc TMVA; \
ln -sf inc/TMVA TMVA; \
fi
@printf "Compiling $< ... "
@mkdir -p $(OBJDIR)
......@@ -167,7 +167,7 @@ endif
$(DEPDIR)/%.d: src/%.$(SrcSuf)
@mkdir -p $(DEPDIR)
if [[ ( ! -e TMVA ) ]]; then \
ln -sf inc TMVA; \
ln -sf inc/TMVA TMVA; \
fi
if test -f $< ; then \
printf "Building $(@F) ... "; \
......
......@@ -41,10 +41,10 @@
// //
//////////////////////////////////////////////////////////////////////////
#define TMVA_RELEASE "4.1.1"
#define TMVA_RELEASE_DATE "Apr 21, 2011"
#define TMVA_RELEASE_TIME "12:00:00"
#define TMVA_VERSION_CODE 262401
#define TMVA_RELEASE "4.1.2"
#define TMVA_RELEASE_DATE "Jun 21, 2011"
#define TMVA_RELEASE_TIME "11:02:58"
#define TMVA_VERSION_CODE 262402
#define TMVA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
#endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment