Compilation of Root dictionaries without optimization (I.Hrivnacova)

diff --git a/conf/Geant4.gmk b/conf/Geant4.gmk
index d572d5f0b6c4c24d4831bca77bbb9c66f2bace85..ffda71319caec8e1c9a7c6b18115b5b7b73b2002 100644 (file)
--- a/conf/Geant4.gmk
+++ b/conf/Geant4.gmk
@@ -9,14 +9,6 @@ ifdef AG4_VISUALIZE
   CPPFLAGS  += -DALICE_VISUALIZE
 endif
 
-ifdef AG4_STACKING
-  CPPFLAGS  += -DALICE_STACKING
-endif
-
-ifdef AG4_NOPHYSICS
-  CPPFLAGS  += -DALICE_EMPTY_PHYSICS_LIST
-endif  
-
 #
 # C++ compilation flags
 #
@@ -58,6 +50,14 @@ ifeq ($(ALICE_TARGET),OSF1)
 
 endif  
 
+ifeq ($(ALICE_TARGET),SunOS)
+
+  # Excluded of +w option 
+  # in order to exclude warnings from G4 
+  CXXOPTS := $(filter-out +w,$(CXXOPTS))
+
+endif  
+
 #
 # Geant4 include paths
 #

diff --git a/conf/GeneralDef b/conf/GeneralDef
index aff47c746cd855881af5d3e065ea421cdefafd9d..751f98ace807ce5d50d21fc54d8ef93e6d62fef2 100644 (file)
--- a/conf/GeneralDef
+++ b/conf/GeneralDef
@@ -17,7 +17,17 @@ $(ALICE_ROOT)/include/%.h : %.h
        @[ -d $(dir $@) ] || mkdir $(dir $@)
        @cp -p $? $(ALICE_ROOT)/include
  
+tgt_$(ALICE_TARGET)/%Cint.o : %Cint.cxx
+       @echo $*Cint.cxx
+       @[ -d $(dir $@) ] || mkdir -p $(dir $@)
+ifeq ($(CXXVERBOSE),)
+       @$(CXX) $(filter-out -O%, $(CXXFLAGS)) -c $*Cint.cxx -o tgt_$(ALICE_TARGET)/$*Cint.o
+else
+       $(CXX) $(filter-out -O%, $(CXXFLAGS)) -c $*Cint.cxx -o tgt_$(ALICE_TARGET)/$*Cint.o
+endif
+
 tgt_$(ALICE_TARGET)/%.o : %.cxx
+       @echo $*.cxx
        @[ -d $(dir $@) ] || mkdir -p $(dir $@)
 ifeq ($(CXXVERBOSE),)
        @$(CXX) $(CXXFLAGS) -c $*.cxx -o tgt_$(ALICE_TARGET)/$*.o
@@ -35,14 +45,17 @@ check/%.viol : check/%.i
        @$(CODE_CHECK) check/$*.i ./ > check/$*.viol
 
 tgt_$(ALICE_TARGET)/%.o : %.c
+       @echo %.c
        @[ -d $(dir $@) ] || mkdir -p $(dir $@)
        @$(CC) $(CFLAGS) -c $*.c -o tgt_$(ALICE_TARGET)/$*.o
 
 tgt_$(ALICE_TARGET)/%.o : %.f
+       @echo %.f
        @[ -d $(dir $@) ] || mkdir -p $(dir $@)
        @$(F77) $(FFLAGS) -c $*.f -o tgt_$(ALICE_TARGET)/$*.o
 
 tgt_$(ALICE_TARGET)/%.o : %.F
+       @echo %.F
        @[ -d $(dir $@) ] || mkdir -p $(dir $@)
        @$(F77) $(FFLAGS) -c $*.F -o tgt_$(ALICE_TARGET)/$*.o
 

diff --git a/conf/MachineDef.Linux b/conf/MachineDef.Linux
index c328074da6b22efe01a6f321ca2b253760e2d7eb..1c41bf34d1801e9f83f751e41283af7291da7cc2 100644 (file)
--- a/conf/MachineDef.Linux
+++ b/conf/MachineDef.Linux
@@ -4,9 +4,9 @@
 PLATFORM      = linux
 
 # The compilers
-CXX           = echo $*.cxx ; g++ 
-F77          = echo $*.F ; g77
-CC           = echo $*.c ; gcc
+CXX           = g++ 
+F77          = g77
+CC           = gcc
 
 # Global optimisation
 OPT           = -O -g

diff --git a/conf/MachineDef.OSF1 b/conf/MachineDef.OSF1
index a0f05688653bffe385048832fb8e914bb5c5528b..55842093e3303ac6d4d90168640737bece41253d 100644 (file)
--- a/conf/MachineDef.OSF1
+++ b/conf/MachineDef.OSF1
@@ -4,8 +4,8 @@
 PLATFORM      = alpha
 
 # The compilers
-CXX           = echo $*.cxx ; cxx
-F77          = echo $*.F ; f77
+CXX           = cxx
+F77          = f77
 
 # Global optimisation
 OPT          = -O2

diff --git a/conf/MachineDef.SunOS b/conf/MachineDef.SunOS
index 257e864e9f3b38417ccd68393c47de4118a51134..06a47e29f6544e6f1e0c263531941973947ab78f 100644 (file)
--- a/conf/MachineDef.SunOS
+++ b/conf/MachineDef.SunOS
@@ -18,7 +18,7 @@ SL          = so
 AWK          = /usr/xpg4/bin/awk
 
 # The options
-CXXOPTS       = $(OPT) +w -KPIC
+CXXOPTS       = $(OPT) +w -KPIC -features=rtti
 COPT         = $(OPT) -KPIC -erroff=%none
 FOPT         = $(OPT) -KPIC