Warning fixed, thanks Cvetan

[u/mrichter/AliRoot.git] / Makefile

diff --git a/Makefile b/Makefile
index 250cda5ce688eefa7b1f1dfc9a3ee975d44c50ee..52e7b2a99e4871af1ec61bbd6b35de96aea01591 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,8 @@ CXX           := $(shell root-config --cxx)
 F77          := $(shell root-config --f77)
 CC           := $(shell root-config --cc)
 
+CXXWARN       =
+
 #-------------------------------------------------------------------------------
 # Include machine dependent macros
 
@@ -63,21 +65,24 @@ endif
 #-------------------------------------------------------------------------------
 # Check if DATE is installed
 
-ifneq ($(shell date-config 2>&1 | grep -i usage),)
+ifeq ($(shell which date-config 2>/dev/null),)
+DATEFLAGS := -D$(shell uname) -DDATE_SYS=$(shell uname) -Dlong32='int' \
+             -Dlong64='long long' -DdatePointer='long'
+DMONLIBS  :=
+else 
 DATEFLAGS := -DALI_DATE $(shell date-config --cflags | tr \" \')
-CXXFLAGS  += $(DATEFLAGS)
-CFLAGS    += $(DATEFLAGS)
-CINTFLAGS += $(DATEFLAGS)
-DEPINC    += $(DATEFLAGS)
 DMONLIBS  := $(shell date-config --monitorlibs)
-else
-DATEFLAGS := -D`uname` -DDATE_SYS=`uname` -Dlong32='int' \
-             -Dlong64='long long' -DdatePointer='long'
+endif
 CXXFLAGS  += $(DATEFLAGS)
 CFLAGS    += $(DATEFLAGS)
 CINTFLAGS += $(DATEFLAGS)
 DEPINC    += $(DATEFLAGS)
-DMONLIBS  :=
+
+#-------------------------------------------------------------------------------
+# Add warning flags if any
+
+ifneq ($(ALICXXWARN),no)
+CXXFLAGS  += $(CXXWARN)
 endif
 
 #-------------------------------------------------------------------------------
@@ -162,11 +167,11 @@ MODDIRS := $(MODULES)
 # Default include dirs for C++, Fortran, Cint, and dependencies
 # The module directory will be added by each module
 
-GENINC     := -I$(ALICE_ROOT)/include -I$(shell root-config --incdir)
-RCFLAGS    := $(shell root-config --cflags)
+GENINC     := -I$(ALICE_ROOT)/include -isystem$(shell root-config --incdir)
+RCFLAGS    := $(shell root-config --auxcflags) 
 RLFLAGS    := $(shell root-config --ldflags)
 CXXFLAGS   += $(GENINC) $(RCFLAGS)
-CXXFLAGSNO += $(GENINC) $(RCFLAGS)
+CXXFLAGSNO += $(GENINC) $(RCFLAGS) -Wno-write-strings
 CFLAGS     += $(GENINC) $(RCFLAGS)
 CINTFLAGS  += $(GENINC) $(RCFLAGS)
 FFLAGS    += $(RCFLAGS)
@@ -186,7 +191,7 @@ ALILIBS           := -L$(LIBDIR) -lMUON -lTPC -lPMD -lTRD -lFMD -lTOF \
 LIBS := $(ROOTCLIBS) $(ROOTPLIBS) $(SYSLIBS)
 
 ARVERSIONFILE := $(EXPORTDIR)/ARVersion.h
-SVNREV        := $(strip $(shell LANG=C svn info | grep "Last Changed Rev:" | \
+SVNREV        := $(strip $(shell LANG=C LANGUAGE=C svn info | grep "Last Changed Rev:" | \
                                 cut -d: -f2 ))
 SVNBRANCH     := $(subst //alisoft.cern.ch/AliRoot/,,$(shell svn info | grep "URL:" | cut -d: -f3 ))