Minor corrections after big transformer changes

[u/mrichter/AliRoot.git] / GEANT321 / Makefile

diff --git a/GEANT321/Makefile b/GEANT321/Makefile
index 8ae61b4664fe4c0eaa7de140137ab4693b8d8b93..a47588a5ca2af20ac1b390a5b9cc7dfef4316fe4 100644 (file)
--- a/GEANT321/Makefile
+++ b/GEANT321/Makefile
@@ -7,9 +7,9 @@ include $(ALICE_ROOT)/conf/MachineDef.$(ALICE_TARGET)
 
 PACKAGE = GEANT321
 
-GDIRS = gbase gcons gdraw geocad ggeom gheisha ghits ghrout ghutils giface \
+GDIRS := gbase gcons gdraw geocad ggeom gheisha ghits ghrout ghutils giface \
         giopa gkine gparal gphys gscan gstrag gtrak matx55 miface miguti \
-        neutron peanut fiface cgpack fluka block comad
+        neutron peanut fiface cgpack fluka block comad erdecks erpremc
 
 XDIRS = gxint cdf
 
@@ -18,9 +18,10 @@ XDIRS = gxint cdf
 SRCS          =
 ##### MACROS #####
 
-GFSRC  = $(wildcard $(patsubst %,%/*.F,$(GDIRS))) gcinit.F
-GCSRC  = $(wildcard $(patsubst %,%/*.c,$(GDIRS))) 
-GCXXSRC        = $(wildcard $(patsubst %,%/*.cxx,$(GDIRS))) 
+GFSRC  := $(wildcard $(patsubst %,%/*.F,$(GDIRS))) gcinit.F
+GFSRC  := $(filter-out gtrak/grndm%.F,$(GFSRC))
+GCSRC  := $(wildcard $(patsubst %,%/*.c,$(GDIRS))) 
+GCXXSRC        := $(wildcard $(patsubst %,%/*.cxx,$(GDIRS))) 
 
 GSRC   = $(GFSRC) $(GCSRC)
 GFOBJ  = $(patsubst %.F,tgt_$(ALICE_TARGET)/%.o,$(GFSRC))
@@ -46,15 +47,19 @@ ALLOBJS       = $(OBJS) $(FOBJS) $(COBJS) $(DICTO)
 
 # C++ compilation flags
 
-CXXFLAGS      = $(CXXOPTS) $(CLIBCXXOPTS) $(CLIBDEFS) -I.
+CXXFLAGS      := $(CXXOPTS) $(CLIBCXXOPTS) $(CLIBDEFS) -I.
+CXXFLAGS      := $(filter-out -O%,$(CXXFLAGS))  
  
 # C compilation flags
 
-CFLAGS      = $(COPT) $(CLIBCOPT) $(CLIBDEFS) -I.
+CFLAGS      := $(COPT) $(CLIBCOPT) $(CLIBDEFS) -I.
  
 # FORTRAN compilation flags
 
-FFLAGS      = $(FOPT) $(CLIBFOPT) $(CLIBDEFS) -I.
+FFLAGS      := $(FOPT) $(CLIBFOPT) $(CLIBDEFS) -I.
+ifeq ($(PLATFORM),linux)
+   FFLAGS      := $(filter-out -O%,$(FFLAGS))  
+endif
  
 ##### TARGETS #####