# Sources
-SRCS:= TFluka.cxx AliFluka.cxx \
- source.cxx
-FSRCS:= FLUKA_input.f
+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:= $(filter-out source.h,$(SRCS:.cxx=.h) )
+HDRS:= TFluka.h TFlukaMCGeometry.h TFlukaCerenkov.h TFlukaConfigOption.h \
+ TFlukaScoringOption.h
+
+FSRCS:= FLUKA_input.f crnkvp.f
# ROOT Dictionary
-DHDR:= TFlukaLinkDef.h
+DHDR:= TFlukaLinkDef.h
# Extra includes and libraries
-EINCLUDE:= Flugg geant4_vmc/include $(G4INSTALL)/include $(CLHEP_BASE_DIR)/include
+EINCLUDE:= $(FLUPRO)/flukapro $(FLUPRO)/emfadd $(FLUPRO)/flukaadd
ELIBSDIR:= $(FLUPRO)
ELIBS := flukahp
-CXXFLAGS += -fno-for-scope -DGNU_GCC -DGEOMETRY_DEBUG -DG4OPTIMISE -DG4USE_STL -DG4USE_STD_NAMESPACE -DG4VERBOSE -DG4_STORE_TRAJECTORY
+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
+
+endif
+
+