Added preprocessor conditionals to support ROOT > 5.11.2.

[u/mrichter/AliRoot.git] / TFluka / libTFluka.pkg

diff --git a/TFluka/libTFluka.pkg b/TFluka/libTFluka.pkg
index 7b3bd956eda49898382f9f39aa765ca3439725ab..04fe1653c980728ed75f5f3b329c32909fad6c93 100644 (file)
--- a/TFluka/libTFluka.pkg
+++ b/TFluka/libTFluka.pkg
@@ -1,71 +1,49 @@
 # Sources
-ifndef WITH_ROOT
-SRCS:=  TFluka.cxx \
-        magfld.cxx source.cxx mgdraw.cxx bxdraw.cxx eedraw.cxx \
-       endraw.cxx sodraw.cxx usdraw.cxx FlukaVolume.cxx stupre.cxx \
-       stuprf.cxx \
-       abscff.cxx dffcff.cxx queffc.cxx rflctv.cxx rfrndx.cxx TFlukaCerenkov.cxx
-
-# Headers
-HDRS:= TFluka.h FlukaVolume.h TFlukaCerenkov.h
-else
-SRCS:=  TFlukaGeo.cxx TFlukaMCGeometry.cxx TFlukaCerenkov.cxx \
+SRCS:=  TFluka.cxx TFlukaMCGeometry.cxx TFlukaCerenkov.cxx \
+       TFlukaConfigOption.cxx TFlukaScoringOption.cxx\
         magfld.cxx source.cxx mgdraw.cxx bxdraw.cxx eedraw.cxx \
        endraw.cxx sodraw.cxx usdraw.cxx stupre.cxx stuprf.cxx \
        abscff.cxx dffcff.cxx queffc.cxx rflctv.cxx rfrndx.cxx
 
 # Headers
-HDRS:= TFlukaGeo.h TFlukaMCGeometry.h TFlukaCerenkov.h
-endif
+HDRS:= TFluka.h TFlukaMCGeometry.h TFlukaCerenkov.h TFlukaConfigOption.h \
+       TFlukaScoringOption.h
 
 FSRCS:= FLUKA_input.f crnkvp.f
 
 # ROOT Dictionary
-ifndef WITH_ROOT
 DHDR:= TFlukaLinkDef.h
-else
-DHDR:= TFlukaMCLinkDef.h
-endif
 
 # Extra includes and libraries
-ifndef WITH_ROOT
-EINCLUDE:= Flugg $(ALICE)/geant4_vmc/include $(G4INSTALL)/include $(CLHEP_BASE_DIR)/include $(FLUPRO)/flukapro
-else
-EINCLUDE:= $(FLUPRO)/flukapro
-endif
+EINCLUDE:= $(FLUPRO)/flukapro $(FLUPRO)/emfadd $(FLUPRO)/flukaadd
 ELIBSDIR:= $(FLUPRO)
 ELIBS   := flukahp
 
-######################
-#Handle Geant4 flags
-######################
+ifeq (g95,$(findstring g95,$(ROOTBUILD)))
+ELIBS        += f95
+ELIBSDIR      += $(shell find /sw/lib -name libf95.a | xargs dirname)
+PACKDYFLAGS   := $(DYFLAGS)     \
+        -Wl,-u,_bdandi \
+        -Wl,-u,_bdevap \
+        -Wl,-u,_bdhdr1 \
+        -Wl,-u,_bdhdr2 \
+        -Wl,-u,_bdhdr3 \
+        -Wl,-u,_bdinpt \
+        -Wl,-u,_bdmuls \
+        -Wl,-u,_bdnopt \
+        -Wl,-u,_bdpart \
+        -Wl,-u,_bdphfl \
+        -Wl,-u,_bdprdc \
+        -Wl,-u,_bdpwxs \
+        -Wl,-u,_bdrndm \
+        -Wl,-u,_bdsqzi \
+        -Wl,-u,_bdtrns \
+        -Wl,-u,_countr \
+        -Wl,-u,_elproi \
+        -Wl,-u,_hadini \
+        -Wl,-u,_bdgtfr \
+        -Wl,-u,_bdpree 
 
-# If G4DEBUG or G4NO_OPTIMISE are not specified,
-# the default compilation is optimised ...
-#
-ifndef WITH_ROOT
-ifdef G4DEBUG
-  CXXFLAGS += -DG4DEBUG
-else
-  ifndef G4NO_OPTIMISE
-    CXXFLAGS += -DG4OPTIMISE
-  endif
-endif
-# Verbosity code can be left out (for better performance)
-# by defining G4_NO_VERBOSE.
-#
-ifndef G4_NO_VERBOSE
-  CXXFLAGS += -DG4VERBOSE
-endif
-# Trajectory related classes can be left out (for better performance)
-# by defining G4_NO_STORE_TRAJECTORY.
-#
-ifndef G4_NO_STORE_TRAJECTORY
-  CPPFLAGS += -DG4_STORE_TRAJECTORY
 endif
 
-PACKCXXFLAGS:= $(CXXFLAGS) -DGNU_GCC -DG4USE_STL -DG4USE_STD_NAMESPACE
-else 
-PACKCXXFLAGS:= $(CXXFLAGS) -DWITH_ROOT
-endif