Cleanup of makefiles

diff --git a/Makefile b/Makefile
index ad3ac27262375935cbd2c39e95c84b21d200bcf5..f1c702c66d30f73ae9c50e766f94e3aee6c2f6d6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,6 @@
 #         Developed on idea of Boris Polichtchouk (Boris.Polichtchouk@cern.ch), 15/4/2001
 
 
-##### include general path/location macros #####
-override ALICE_TARGET := $(shell root-config --arch)
-override ALICE_ROOT   := $(shell pwd)
-
 ifdef ALIVERBOSE
 MUTE:=
 else
@@ -92,7 +88,7 @@ ALIROOTMODULES := STEER PHOS TRD TPC ZDC MUON PMD FMD TOF ITS \
       CRT RICH START STRUCT EVGEN RALICE ALIFAST VZERO \
       THijing CONTAINERS MEVSIM TMEVSIM THbtp HBTP EMCAL HBTAN \
       THerwig TEPEMGEN EPEMGEN FASTSIM TPHIC RAW MONITOR DISPLAY ANALYSIS \
-      JETAN HLT
+      JETAN HLT TFluka
 
 CERNMODULES := PDF PYTHIA6 HIJING MICROCERN HERWIG
 
@@ -119,14 +115,13 @@ MODDIRS := $(MODULES)
 #      The module directory will be added by each module
 #
 
-CXXFLAGS += -I$(ALICE_ROOT)/include
-CXXFLAGS += -I$(shell root-config --incdir)
+GENINC     := -I$(ALICE_ROOT)/include -I$(shell root-config --incdir)
 
-CINTFLAGS += -I$(ALICE_ROOT)/include
-CINTFLAGS += -I$(shell root-config --incdir)
+CXXFLAGS   += $(GENINC)
+CXXFLAGSNO += $(GENINC)
+CINTFLAGS  += $(GENINC)
+DEPINC     += $(GENINC)
 
-DEPINC += -I$(ALICE_ROOT)/include
-DEPINC += -I$(shell root-config --incdir)
 #############################################################
 
 

diff --git a/RAW/Make-macros b/RAW/Make-macros
index f82998fd29d1eb26a531bfcc5e3dc3e843779a33..b100d44a0ad95f9b2e5fdeced6b9b780f652119e 100644 (file)
--- a/RAW/Make-macros
+++ b/RAW/Make-macros
@@ -59,10 +59,10 @@ hlt:            $(ALIRAW) $(ALIMDC)
 
 $(ALIRAW):      $(DICT) $(OBJS)
                rm -f $(ALIRAW)
-                ifeq ($(PLATFORM),aix)
+                ifeq ($(ALICE_ARCH),aix)
                   $(SHLD) -o $(ALIRAW) $(LIBS) -p 0 $(OBJS)
                 else
-                   ifeq ($(PLATFORM),alpha)
+                   ifeq ($(ALICE_ARCH),alpha)
                      $(SHLD) -o $(ALIRAW) $(OBJS) -lcxxstd -lcxx -lexc -lots -lc
                    else
                      $(LD) $(SOFLAGS) $(LDFLAGS) $(OBJS) -o $(ALIRAW)
@@ -73,7 +73,7 @@ $(ALIRAW):      $(DICT) $(OBJS)
 
 
 $(ALIMDC):      $(MAINO) $(ALIRAW)
-                ifeq ($(PLATFORM),aix)
+                ifeq ($(ALICE_ARCH),aix)
                   ln -fs $(ALILRAW) libAliRaw.a
                   $(LD) $(LDFLAGS) $(MAINO) libAliRaw.a \
                   $(LIBS) -o $(ALIMDC)

diff --git a/build/Makefile.alphacxx6 b/build/Makefile.alphacxx6
index 60edd7e34cc33ffc4a85ae1fdad0517a377eaae2..8e60c360bafac1a8b750c619abd3243db76ea45b 100644 (file)
--- a/build/Makefile.alphacxx6
+++ b/build/Makefile.alphacxx6
@@ -1,56 +1,52 @@
 # Makefile to build AliRoot for Alpha OSF1
 
-PLATFORM      = alpha
-
 # The compilers
 CXX           = cxx 
 F77          = f77
 
 # Global optimisation
-OPT           = -g 
+OPT           = -g -O
+NOOPT        = -g
 
-CXXOPTS       = $(OPT) -nostdnew -rtti -taso
+CXXOPT       = $(OPT)
+CXXNOOPT      = $(NOOPT)
 COPT         = $(OPT)
-FOPT         = $(OPT) -nofor_main -warn noinformational -taso
-CXXFLAGS      = $(CXXOPTS)
-CFLAGS       = -fPIC -pipe -mcpu=ev5 -D__osf__ -D__alpha
-
-# rootcint flags
-CINTFLAGS     = -D__DECCXX
-
-# rmkdepend flags for building dependencies of FORTRAN files
-DEPENDFFLAGS = $(filter-out -warn noinformational,$(FFLAGS))
+FOPT         = $(OPT)
 
 # CERNLIB defines
-
 CLIBDEFS      = -DCERNLIB_DECS -DCERNLIB_BLDLIB -DCERNLIB_CZ
 CLIBCXXOPTS   =
 CLIBCOPT      =
-CLIBFOPT      = -I. -warn noinformational
+CLIBFOPT      = -I. $(CLIBDEFS)
+
+# Compiler flags
+CXXFLAGS      = $(CXXOPT)   -nostdnew -rtti -taso
+CXXFLAGSNO    = $(CXXNOOPT) -nostdnew -rtti -taso
+CFLAGS       = $(COPT) -fPIC -pipe -mcpu=ev5 -D__osf__ -D__alpha
+FFLAGS        = $(FOPT) -nofor_main -warn noinformational -taso $(CLIBFOPT)
+# rmkdepend flags for building dependencies of FORTRAN files
+DEPENDFFLAGS  = $(filter-out -warn noinformational,$(FFLAGS))
 
-# Common Fortran compilation flags
-FFLAGS = $(FOPT) $(CLIBFOPT) $(CLIBDEFS)
+# rootcint flags
+CINTFLAGS     = -D__DECCXX
                
 LD            = cxx
 LDFLAGS       = 
 
 SHLD         = ld
 SOFLAGS       =  -L/usr/lib/cmplrs/cxx -rpath /usr/lib/cmplrs/cxx \
-               -expect_unresolved "*" -msym -shared \
-               /usr/lib/cmplrs/cc/crt0.o /usr/lib/cmplrs/cxx/_main.o 
-SOFLAGS += -lUfor -lfor -lFutil
-SOFLAGS += -taso
+               -expect_unresolved "*" -msym -shared -taso
+               /usr/lib/cmplrs/cc/crt0.o /usr/lib/cmplrs/cxx/_main.o
 
 SHLIB         = -lUfor -lfor -lFutil
 SOEXT        = so
 
-ROOTLIBS += 
-
 #System libraries
 SYSLIBS = -lbsd
 
 # Flags for static libraries
 AFLAGS = $(filter-out -rpath /usr/lib/cmplrs/cxx -msym -shared /usr/lib/cmplrs/cc/crt0.o,$(SOFLAGS))
+AFLAGS += $(SHLIB)
 
 # Additional flags and libraries for building aliroot executable
 EXEFLAGS += -lXm -lXt -lX11 -lPW -lUfor -lfor -lFutil -lots 

diff --git a/build/Makefile.hpuxacc b/build/Makefile.hpuxacc
index f467b367ae1f8a0ccbef80a09cd8d8d0f353479d..4da3286014ae75204b235167be985713c52a13ca 100644 (file)
--- a/build/Makefile.hpuxacc
+++ b/build/Makefile.hpuxacc
@@ -1,36 +1,34 @@
 # Makefile to build AliRoot on HP-UX
 
-PLATFORM      = hpux
-
 # The compilers
 CXX           = aCC
 F77          = f77
 CC           = cc
 
 # Global optimisation
-OPT           = -O
-
-CXXOPTS       = $(OPT) -Wc,-ansi_for_scope,on +Z -z +W70,495,740,749,823,829 -Dextname
-COPT          = $(OPT) +Z -Ae
-FOPT          = $(OPT) +ppu +Z
-
-
+OPT           = -g -O
+NOOPT         = -g
 
-CXXFLAGS      = $(CXXOPTS)
-CFLAGS       = $(COPT)
-
-# rootcint flags
-CINTFLAGS     = 
+CXXOPT        = $(OPT)
+CXXNOOPT      = $(NOOPT)
+COPT          = $(OPT)
+FOPT          = $(OPT)
 
 # CERNLIB defines
-
 CLIBDEFS      = -DCERNLIB_HPUX -DCERNLIB_BLDLIB -DCERNLIB_CZ
 CLIBCXXOPTS   =
 CLIBCOPT      = +z -Ae 
-CLIBFOPT      = -WF,-P
+CLIBFOPT      = $(CLIBDEFS) -WF,-P
 
-# Common Fortran compilation flags
-FFLAGS = $(CLIBFOPT)  $(CLIBDEFS) $(FOPT)
+CXXFLAGS      = $(CXXOPT)   -Wc,-ansi_for_scope,on +Z -z +W70,495,740,749,823,829 -Dextname
+CXXFLAGSNO    = $(CXXNOOPT) -Wc,-ansi_for_scope,on +Z -z +W70,495,740,749,823,829 -Dextname
+CFLAGS       = $(COPT) +Z -Ae
+FFLAGS        = $(CLIBFOPT) $(FOPT) +ppu +Z
+# rmkdepend flags for building dependencies of FORTRAN files
+DEPENDFFLAGS  = $(FFLAGS)
+
+# rootcint flags
+CINTFLAGS     = 
 
 LD            = aCC
 LDFLAGS       = $(OPT) -z -Wl,+s -Wl,-E
@@ -43,9 +41,6 @@ SOEXT               = sl
 # additional ROOT libraries
 ROOTLIBS  += -lcrypt 
 
-# rmkdepend flags for building dependencies of FORTRAN files
-DEPENDFFLAGS = $(FFLAGS)
-
 GLIBS         = -L/usr/lib/X11R6 -lX11 
 
 # System libraries
@@ -53,4 +48,3 @@ GLIBS         = -L/usr/lib/X11R6 -lX11
 
 
 
-

diff --git a/build/Makefile.linux b/build/Makefile.linux
index dced5509d92199a64cd884d58f1e4ff00f8d0a78..5c7bc06095b16a498794eca84e894e65a4e1d748 100644 (file)
--- a/build/Makefile.linux
+++ b/build/Makefile.linux
@@ -1,39 +1,43 @@
 # Makefile to build AliRoot for Linux
 
-PLATFORM      = linux
-
 # The compilers
 CXX           = g++ 
 F77          = g77
 CC           = gcc
 CCMAJORV      = $(shell $(CC) -dumpversion | cut -d. -f1)
+CCMINORV      = $(shell $(CC) -dumpversion | cut -d. -f2)
 
 # Global optimisation
 OPT           = -O -g
+NOOPT         = -g
 
-ifeq ($(CCMAJORV),2)
-CXXOPTS       = $(OPT) -W -Wall -fPIC -pipe
-else
-CXXOPTS       = $(OPT) -W -Wall -Werror -fPIC -pipe -fmessage-length=0 -Wno-long-long -pedantic-errors -ansi
-endif
+CXXOPT        = $(OPT)
+CXXNOOPT      = $(NOOPT)
 COPT         = $(OPT)
-FOPT         = $(OPT) -fno-second-underscore
-CXXFLAGS      = $(CXXOPTS)
-CFLAGS       = $(OPT) -Wall -Werror -fPIC -pipe -Wno-long-long -pedantic-errors -ansi
-
-# rootcint flags
-CINTFLAGS     = 
+FOPT         = $(OPT)
 
 # CERNLIB defines
-
 CLIBDEFS      = -DCERNLIB_LINUX -DCERNLIB_BLDLIB -DCERNLIB_CZ
 CLIBCXXOPTS   =
 CLIBCOPT      =
-CLIBFOPT      =
+CLIBFOPT      = $(CLIBDEFS)
+
+# Compiler flags
+ifeq ($(CCMAJORV),2)
+CXXFLAGS       = $(OPT) -W -Wall -fPIC -pipe
+CXXFLAGSNO     = $(NOOPT) -W -Wall -fPIC -pipe
+else
+CXXFLAGS       = $(OPT) -W -Wall -Werror -fPIC -pipe -fmessage-length=0 -Wno-long-long -pedantic-errors -ansi
+CXXFLAGSNO     = $(NOOPT) -W -Wall -Werror -fPIC -pipe -fmessage-length=0 -Wno-long-long -pedantic-errors -ansi
+endif
+CFLAGS        = $(OPT) -Wall -Werror -fPIC -pipe -Wno-long-long -pedantic-errors -ansi
+FFLAGS         = $(CLIBFOPT) $(FOPT) -fno-second-underscore
+# rmkdepend flags for building dependencies of FORTRAN files
+DEPENDFFLAGS   = $(FFLAGS)
+
+# rootcint flags
+CINTFLAGS     = 
 
-# Common Fortran compilation flags
-FFLAGS = $(CLIBFOPT)  $(CLIBDEFS) $(FOPT)
-               
 LD            = g++
 LDFLAGS       = $(OPT) 
 
@@ -50,9 +54,6 @@ AEXT        = a
 # additional ROOT libraries
 ROOTLIBS  += -lcrypt 
 
-# rmkdepend flags for building dependencies of FORTRAN files
-DEPENDFFLAGS = $(FFLAGS)
-
 LIBNOVER      = `find /lib -name 'libNoVersion*.so' | xargs --replace basename {} .so | sed -e 's/lib/ -l/'`
 GLIBS         = -L/usr/X11R6/lib -lX11  $(LIBNOVER)
 

diff --git a/build/Makefile.linuxia64ecc b/build/Makefile.linuxia64ecc
index 07beda5913ab7da9742ef0bc306e3df02e5bbedf..c1aebf4f2591e44791d17d46b52b16022738ef93 100644 (file)
--- a/build/Makefile.linuxia64ecc
+++ b/build/Makefile.linuxia64ecc
@@ -1,7 +1,5 @@
 # Makefile for AliRoot for Itanium/Linux with Intel icc compiler
 
-PLATFORM      = linux
-
 # The compilers
 CXX           = ecc 
 F77          = efc
@@ -9,25 +7,29 @@ CC          = ecc
 
 # Global optimisation
 OPT           = -g #-O
+NOOPT         = -g
 
-CXXOPTS       = $(OPT)
+CXXOPT        = $(OPT)
+CXXNOOPT      = $(OPT)
 COPT         = $(OPT)
 FOPT         = $(OPT)
-CXXFLAGS      = $(CXXOPTS)
-CFLAGS       = $(COPT)
-
-# rootcint flags
-CINTFLAGS     = 
 
 # CERNLIB defines
-
 CLIBDEFS      = -DCERNLIB_LXIA64 -DCERNLIB_BLDLIB -DCERNLIB_CZ
 CLIBCXXOPTS   =
 CLIBCOPT      =
-CLIBFOPT      =
+CLIBFOPT      = $(CLIBDEFS)
 
-# Common Fortran compilation flags
-FFLAGS = $(CLIBFOPT)  $(CLIBDEFS) $(FOPT)
+# Compiler flags
+CXXFLAGS      = $(CXXOPT)
+CXXFLAGSNO    = $(CXXNOOPT)
+CFLAGS       = $(COPT)
+FFLAGS        = $(CLIBFOPT) $(FOPT)
+# rmkdepend flags for building dependencies of FORTRAN files
+DEPENDFFLAGS  = $(FFLAGS)
+
+# rootcint flags
+CINTFLAGS     = 
 
 LD            = ecc
 LDFLAGS       = $(OPT) 
@@ -45,9 +47,6 @@ AEXT        = a
 # additional ROOT libraries
 ROOTLIBS  += -lcrypt 
 
-# rmkdepend flags for building dependencies of FORTRAN files
-DEPENDFFLAGS = $(FFLAGS)
-
 LIBNOVER      = `find /lib -name 'libNoVersion*.so' | xargs --replace basename {} .so | sed -e 's/lib/ -l/'`
 GLIBS         = $(LIBNOVER)
 

diff --git a/build/Makefile.linuxia64gcc b/build/Makefile.linuxia64gcc
index e1fca3f2016a56aac56cf6e6b5ef32d8c3e8f843..0cf212ded8a33126aea5900f3b07097b6fcdd7c9 100644 (file)
--- a/build/Makefile.linuxia64gcc
+++ b/build/Makefile.linuxia64gcc
@@ -1,7 +1,5 @@
 # Makefile for AliRoot for Itanium/Linux with gcc
 
-PLATFORM      = linux
-
 # The compilers
 CXX           = g++ 
 F77          = g77
@@ -9,32 +7,35 @@ CC          = gcc
 
 # Global optimisation
 OPT           = -g #-O
+NOOPT         = -g
 
-CXXOPTS       = $(OPT) -Wall -fPIC -pipe
+CXXOPT        = $(OPT)
+CXXNOOPT      = $(NOOPT)
 COPT         = $(OPT)
-FOPT         = $(OPT) -fno-second-underscore
-CXXFLAGS      = $(CXXOPTS)
-CFLAGS       = -Wall -fPIC -pipe
-
-# rootcint flags
-CINTFLAGS     = 
+FOPT         = $(OPT)
 
 # CERNLIB defines
-
 CLIBDEFS      = -DCERNLIB_LXIA64 -DCERNLIB_BLDLIB -DCERNLIB_CZ
 CLIBCXXOPTS   =
 CLIBCOPT      =
-CLIBFOPT      =
+CLIBFOPT      = $(CLIBDEFS)
+
+# Compiler flags
+CXXFLAGS      = $(CXXOPT)  -Wall -fPIC -pipe
+CXXFLAGSNO    = $(CXXNOOPT)  -Wall -fPIC -pipe
+CFLAGS       = -Wall -fPIC -pipe
+FFLAGS        = $(CLIBFOPT) $(FOPT) -fno-second-underscore
+# rmkdepend flags for building dependencies of FORTRAN files
+DEPENDFFLAGS = $(FFLAGS)
+
+# rootcint flags
+CINTFLAGS     = 
 
-# Common Fortran compilation flags
-FFLAGS = $(CLIBFOPT)  $(CLIBDEFS) $(FOPT)
-               
 LD            = g++
 LDFLAGS       = $(OPT) -Wl,-Map -Wl,$@.map
 
 SHLD         = $(LD)
 SOFLAGS       = -shared -Wl #-O2
-#SHLIB         = -lg2c
 SOEXT        = so
 
 ALLD         = ar
@@ -45,9 +46,6 @@ AEXT        = a
 # additional ROOT libraries
 ROOTLIBS  += -lcrypt 
 
-# rmkdepend flags for building dependencies of FORTRAN files
-DEPENDFFLAGS = $(FFLAGS)
-
 LIBNOVER      = `find /lib -name 'libNoVersion*.so' | xargs --replace basename {} .so | sed -e 's/lib/ -l/'`
 GLIBS         = -L/usr/X11R6/lib -lX11  $(LIBNOVER)
 

diff --git a/build/Makefile.linuxicc b/build/Makefile.linuxicc
index 7db7211efc0199cb87e4bac677858046755bbd34..b19f5cee5c61f73fc6459ccb29fd2ea6277072af 100644 (file)
--- a/build/Makefile.linuxicc
+++ b/build/Makefile.linuxicc
@@ -1,18 +1,14 @@
 # Makefile for AliRoot for Linux with the Intel icc compiler
 
-PLATFORM      = linux
-
-# The C/C++ compilers
-CXX           = icc
-CC            = icc
-
 # Compiler version:
 ICC_MAJOR    := $(shell $(CXX) -V 2>&1 | awk '{ if (NR==1) print $$8 }' | \
                 cut -d'.' -f1)
 ICC_MINOR    := $(shell $(CXX) -V 2>&1 | awk '{ if (NR==1) print $$8 }' | \
                 cut -d'.' -f2)
 
-# The Fortran compiler
+# The compilers
+CXX           = icc
+CC            = icc
 ifeq ($(ICC_MAJOR),8)
 F77           = ifort
 else
@@ -21,25 +17,29 @@ endif
 
 # Global optimisation
 OPT           = -O -g
+NOOPT         = -g -O0
 
-CXXOPTS       = $(OPT)
+CXXOPT        = $(OPT)
+CXXNOOPT      = $(NOOPT)
 COPT          = $(OPT)
 FOPT          = $(OPT)
-CXXFLAGS      = $(CXXOPTS)
-CFLAGS        = $(COPT)
-
-# rootcint flags
-CINTFLAGS     =
 
 # CERNLIB defines
-
 CLIBDEFS      = -DCERNLIB_LINUX -DCERNLIB_BLDLIB -DCERNLIB_CZ
 CLIBCXXOPTS   =
 CLIBCOPT      =
-CLIBFOPT      =
+CLIBFOPT      = $(CLIBDEFS)
+
+# Compiler flags
+CXXFLAGS      = $(CXXOPT)
+CXXFLAGSNO    = $(CXXNOOPT)
+CFLAGS        = $(COPT)
+FFLAGS        = $(CLIBFOPT) $(FOPT)
+# rmkdepend flags for building dependencies of FORTRAN files
+DEPENDFFLAGS  = $(FFLAGS)
 
-# Common Fortran compilation flags
-FFLAGS = $(CLIBFOPT) $(CLIBDEFS) $(FOPT)
+# rootcint flags
+CINTFLAGS     =
 
 LD            = icc
 LDFLAGS       = $(OPT)
@@ -57,9 +57,6 @@ AEXT        = a
 # additional ROOT libraries
 ROOTLIBS     += -lcrypt
 
-# rmkdepend flags for building dependencies of FORTRAN files
-DEPENDFFLAGS  = $(FFLAGS)
-
 LIBNOVER      = `find /lib -name 'libNoVersion*.so' | xargs --replace basename {} .so | sed -e 's/lib/ -l/'`
 GLIBS         = $(LIBNOVER)
 

diff --git a/build/Makefile.macosx b/build/Makefile.macosx
index 671a1af2c3ede442ee7c7e6b1f265b38302b2955..340381b15c5098dab39bb0630d5b02e83a30347e 100644 (file)
--- a/build/Makefile.macosx
+++ b/build/Makefile.macosx
@@ -1,7 +1,5 @@
 # Makefile for AliRoot for MacOS X with gcc
 
-PLATFORM      = macosx
-
 # The compilers
 CXX           = g++ 
 F77          = g77
@@ -9,26 +7,30 @@ CC          = gcc
 
 # Global optimisation
 OPT           = -O -g
+NOOPT         = -g
 
-CXXOPTS       = $(OPT) -Wall -W -pipe -fsigned-char -fno-common -fweak-coalesced -fmessage-length=0
-COPT         = $(OPT) -Wall -W -fno-common -fweak-coalesced
+CXXOPT        = $(OPT) 
+CXXNOOPT      = $(NOOPT) 
+COPT         = $(OPT)
 FOPT         = $(OPT) -fno-second-underscore 
-CXXFLAGS      = $(CXXOPTS) -I/sw/include
-CFLAGS       = -Wall -pipe -I/sw/include
-
-# rootcint flags
-CINTFLAGS     = 
 
 # CERNLIB defines
-
 CLIBDEFS      = -DCERNLIB_LINUX -DCERNLIB_BLDLIB -DCERNLIB_CZ
 CLIBCXXOPTS   =
 CLIBCOPT      =
-CLIBFOPT      =
+CLIBFOPT      = $(CLIBDEFS)
+
+# Compiler flags
+CXXFLAGS      = $(CXXOPT) -Wall -W -pipe -fsigned-char -fno-common -fweak-coalesced -fmessage-length=0 -I/sw/include
+CXXFLAGSNO    = $(CXXNOOPT) -Wall -W -pipe -fsigned-char -fno-common -fweak-coalesced -fmessage-length=0 -I/sw/include
+CFLAGS       = $(COPT) -Wall -W -fno-common -fweak-coalesced -pipe -I/sw/include
+FFLAGS        = $(CLIBFOPT) $(FOPT)
+# rmkdepend flags for building dependencies of FORTRAN files
+DEPENDFFLAGS  = $(FFLAGS)
+
+# rootcint flags
+CINTFLAGS     = 
 
-# Common Fortran compilation flags
-FFLAGS = $(CLIBFOPT)  $(CLIBDEFS) $(FOPT)
-               
 LD            = export MACOSX_DEPLOYMENT_TARGET=10.3 ; \
                unset LD_PREBIND ; \
                g++
@@ -50,10 +52,6 @@ ALFLAGS       = cr
 ALLIB         = 
 AEXT         = a
 
-
-# rmkdepend flags for building dependencies of FORTRAN files
-DEPENDFFLAGS = $(FFLAGS)
-
 DEPENDCXXFLAGS = $(CXXFLAGS) -I/usr/include/sys
 
 GLIBS         = -L/usr/X11R6/lib -lX11

diff --git a/build/Makefile.macosxxlc b/build/Makefile.macosxxlc
index 5ae368b2d5a8ee75f784b2754ab5ba08ba851ac8..15adebf7e95c0fc6738d3919ca27fae5f652f54a 100644 (file)
--- a/build/Makefile.macosxxlc
+++ b/build/Makefile.macosxxlc
@@ -1,7 +1,5 @@
 # Makefile for AliRoot for MacOS X using the IBM xlc compiler
 
-PLATFORM      = macosx
-
 # The compilers
 CXX           = xlC
 F77          = xlf
@@ -9,28 +7,34 @@ CC          = xlc
 
 # Global optimisation
 OPT           = -qnoopt #-O3 -g
+NOOPT         = -qnoopt
 
-CXXOPTS       = $(OPT) -qpic \
-                -qflttrap=overflow:zerodivide:invalid:inexact:enable
-COPT         = $(OPT) -qpic \
-                -qflttrap=overflow:zerodivide:invalid:inexact:enable
-FOPT         = $(OPT) -qpic -qextname \
-                -qflttrap=overflow:zerodivide:invalid:inexact:enable
-CXXFLAGS      = $(CXXOPTS) -I/sw/include
-CFLAGS       = 
-
-# rootcint flags
-CINTFLAGS     = 
+CXXOPT        = $(OPT) 
+CXXNOOPT      = $(NOOPT) 
+COPT         = $(OPT)
+FOPT         = $(OPT) 
 
 # CERNLIB defines
-
 CLIBDEFS      = -DCERNLIB_LINUX -DCERNLIB_BLDLIB -DCERNLIB_CZ
 CLIBCXXOPTS   =
 CLIBCOPT      =
-CLIBFOPT      =
+CLIBFOPT      = $(shell echo $(CLIBDEFS) | sed -e's/-D/-WF,-D/g')
+
+# Compiler flags
+CXXFLAGS      = $(CXXOPT) -qpic -I/sw/include \
+                -qflttrap=overflow:zerodivide:invalid:inexact:enable
+CXXFLAGSNO    = $(CXXNOOPT) -qpic -I/sw/include \
+                -qflttrap=overflow:zerodivide:invalid:inexact:enable
+CFLAGS       = -qpic -qextname \
+                -qflttrap=overflow:zerodivide:invalid:inexact:enable
+FFLAGS        = $(CLIBFOPT)  $(FOPT) -qpic \
+                -qflttrap=overflow:zerodivide:invalid:inexact:enable
+# rmkdepend flags for building dependencies 
+DEPENDFFLAGS  = $(FFLAGS)
+DEPENDCXXFLAGS = $(CXXFLAGS) -I/usr/include/sys
 
-# Common Fortran compilation flags
-FFLAGS = $(CLIBFOPT)  $(shell echo $(CLIBDEFS) | sed -e's/-D/-WF,-D/g') $(FOPT)
+# rootcint flags
+CINTFLAGS     = 
                
 LD            = xlC
 LDFLAGS       = $(OPT) 
@@ -55,12 +59,6 @@ ALFLAGS       = cr
 ALLIB         = 
 AEXT         = a
 
-
-# rmkdepend flags for building dependencies of FORTRAN files
-DEPENDFFLAGS = $(FFLAGS)
-
-DEPENDCXXFLAGS = $(CXXFLAGS) -I/usr/include/sys
-
 GLIBS         = -L/usr/X11R6/lib -lX11
 
 #System libraries

diff --git a/build/Makefile.solarisCC5 b/build/Makefile.solarisCC5
index 289fb3cc6d600120915004eaaa361522fbe14058..74e860ffab2ff7492222b24bbc927966bc701a4b 100644 (file)
--- a/build/Makefile.solarisCC5
+++ b/build/Makefile.solarisCC5
@@ -6,24 +6,31 @@ CC          = /opt/SUNWspro/bin/cc
 F77          = f77
 
 # Global optimisation
-OPT           = -O 
+OPT           = -g -O 
+NOOPT         = -g
 
-CXXOPTS       = $(OPT) +w -KPIC -features=rtti
-COPT         = $(OPT) -KPIC -erroff=%none
-FOPT         = $(OPT) -KPIC
-CXXFLAGS      = $(CXXOPTS)
-CFLAGS       = 
-
-# rootcint flags
-CINTFLAGS     = 
+CXXOPT        = $(OPT)
+CXXNOOPT      = $(NOOPT)
+COPT         = $(OPT)
+FOPT         = $(OPT)
 
 # CERNLIB defines
-
 CLIBDEFS      = -DCERNLIB_SUN -DCERNLIB_BLDLIB -DCERNLIB_CZ
 CLIBCXXOPTS   =
 CLIBCOPT      =
-CLIBFOPT      = -xpp=cpp
+CLIBFOPT      = $(CLIBDEFS) -xpp=cpp
                
+# Compiler flags
+CXXFLAGS      = $(CXXOPT) +w -KPIC -features=rtti
+CXXFLAGSNO    = $(CXXNOOPT) +w -KPIC -features=rtti
+CFLAGS       = $(COPT) -KPIC -erroff=%none
+FFLAGS        = $(FOPT) $(CLIBFOPT) $(CLIBDEFS)  -KPIC
+# rmkdepend flags for building dependencies of FORTRAN files
+DEPENDFFLAGS  = $(FFLAGS) 
+
+# rootcint flags
+CINTFLAGS     = 
+
 SHLIB         =  -L/opt/SUNWspro/lib -lF77 -lM77 /opt/SUNWspro/lib/libsunmath.so.1
 SOEXT        = so
 
@@ -33,12 +40,6 @@ LDFLAGS       = $(OPT) -Qoption ld -t
 SHLD         = $(LD)
 SOFLAGS       = -G $(LDFLAGS) $(SHLIB)  
 
-# Common Fortran compilation flags
-FFLAGS = $(FOPT) $(CLIBFOPT) $(CLIBDEFS) 
-
-# rmkdepend flags for building dependencies of FORTRAN files
-DEPENDFFLAGS = $(FFLAGS) 
-
 ROOTLIBS += -lm -ldl -lnsl -lsocket
 
 # Additional flags and libraries for building aliroot executable

diff --git a/build/module.tpl b/build/module.tpl
index a4897a5cea43ef453beb3ed99828f74647b4f101..841c8b54b3d673bb6dae80e0915cd13709306010 100644 (file)
--- a/build/module.tpl
+++ b/build/module.tpl
@@ -34,11 +34,7 @@ endif
 endif
 
 ifndef PACKDCXXFLAGS
-ifeq ($(ALICE_TARGET),linuxicc)
-@PACKAGE@DCXXFLAGS:=$(filter-out -O%,$(CXXFLAGS)) -O0
-else
-@PACKAGE@DCXXFLAGS:=$(filter-out -O%,$(CXXFLAGS))
-endif
+@PACKAGE@DCXXFLAGS:=$(CXXFLAGSNO)
 else
 @PACKAGE@DCXXFLAGS:=$(PACKDCXXFLAGS)
 endif
@@ -263,13 +259,6 @@ endif
 depend-@PACKAGE@: $(@PACKAGE@DEP)
 
 # determination of object files
-$(MODDIRO)/%.o: $(MODDIRO)/%.cxx $(MODDIRO)/%.d 
-ifndef ALIQUIET
-       @echo "***** Compiling $< *****";
-endif
-       @(if [ ! -d '$(dir $@)' ]; then echo "***** Making directory $(dir $@) *****"; mkdir -p $(dir $@); fi;)
-       $(MUTE)$(CXX) $(@PACKAGE@DEFINE) -c $(@PACKAGE@INC)   $< -o $@ $(@PACKAGE@CXXFLAGS)
-
 $(MODDIRO)/%.o: $(MODDIR)/%.cxx $(MODDIRO)/%.d 
 ifndef ALIQUIET
        @echo "***** Compiling $< *****";