fixing warnings

[u/mrichter/AliRoot.git] / Makefile

diff --git a/Makefile b/Makefile
index 91ee0e26efda85e0645d4f60ddd4effb628b991f..2cf5490c3859fe050dd8533616dab169be1d18e6 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,7 +65,7 @@ endif
 #-------------------------------------------------------------------------------
 # Check if DATE is installed
 
-ifneq ($(shell date-config 2>&1 | grep -i usage),)
+ifneq ($(shell which date-config | grep "^/"),)
 DATEFLAGS := -DALI_DATE $(shell date-config --cflags | tr \" \')
 CXXFLAGS  += $(DATEFLAGS)
 CFLAGS    += $(DATEFLAGS)
@@ -80,6 +82,13 @@ DEPINC    += $(DATEFLAGS)
 DMONLIBS  :=
 endif
 
+#-------------------------------------------------------------------------------
+# Add warning flags if any
+
+ifneq ($(ALICXXWARN),no)
+CXXFLAGS  += $(CXXWARN)
+endif
+
 #-------------------------------------------------------------------------------
 # ROOT Stuff
 ROOTCONFIG    := root-config
@@ -186,7 +195,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 ))
 
@@ -379,7 +388,7 @@ alimdc-static: $(LIBPATH) $(BINPATH) $(RAWDatabaseALIB) $(MDCALIB) $(ESDALIB) $(
         $(LIBPATH)/libAliMDC.a \
         $(ROOTALIBDIR)/libRoot.a \
         $(ROOTALIBDIR)/libfreetype.a $(ROOTALIBDIR)/libpcre.a \
-        -pthread -ldl
+        -pthread -ldl -lcurses
 
 alilibs-static: $(LIBPATH) modules $(ALLALIBS)