Adding basic testing

[u/mrichter/AliRoot.git] / Makefile

diff --git a/Makefile b/Makefile
index 2ee4e52df93db295f4b4089409364943d95d5de1..bd20e4919c1d2928f4373cc90d3da3d83e49b0a9 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),)
-DATEFLAGS := -DALI_DATE $(shell date-config --cflags | tr \" \')
-CXXFLAGS  += $(DATEFLAGS)
-CFLAGS    += $(DATEFLAGS)
-CINTFLAGS += $(DATEFLAGS)
-DEPINC    += $(DATEFLAGS)
-DMONLIBS  := $(shell date-config --monitorlibs)
-else
+ifeq ($(shell which date-config 2>/dev/null),)
 DATEFLAGS := -D`uname` -DDATE_SYS=`uname` -Dlong32='int' \
              -Dlong64='long long' -DdatePointer='long'
+DMONLIBS  :=
+else 
+DATEFLAGS := -DALI_DATE $(shell date-config --cflags | tr \" \')
+DMONLIBS  := $(shell date-config --monitorlibs)
+endif
 CXXFLAGS  += $(DATEFLAGS)
 CFLAGS    += $(DATEFLAGS)
 CINTFLAGS += $(DATEFLAGS)
 DEPINC    += $(DATEFLAGS)
-DMONLIBS  :=
+
+#-------------------------------------------------------------------------------
+# Add warning flags if any
+
+ifneq ($(ALICXXWARN),no)
+CXXFLAGS  += $(CXXWARN)
 endif
 
 #-------------------------------------------------------------------------------
@@ -123,7 +128,7 @@ ALIROOTMODULES := STEER PHOS TRD TPC ZDC MUON PMD FMD TOF ITS \
       THijing THbtp EMCAL \
       THerwig TEPEMGEN FASTSIM TPHIC RAW MONITOR ANALYSIS \
       JETAN HLT LHC ESDCheck STAT TTherminator CORRFW DPMJET TDPMjet \
-      PWG0 PWG1 PWG2 PWG3 PWG4
+      PWG0 PWG1 PWG2 PWG3 PWG4 TRIGGER
 
 # Additional generators
 ALIROOTMODULES += TUHKMgen
@@ -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     := -Iinclude -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)
@@ -181,12 +186,12 @@ DEPINC     += $(GENINC)
 
 ALILIBS              := -L$(LIBDIR) -lMUON -lTPC -lPMD -lTRD -lFMD -lTOF \
                 -lITS -lPHOS -lACORDE -lHMPID -lVZERO -lZDC -lSTRUCT \
-                -lT0 -lEVGEN -lSTEER 
+                -lT0 -lEVGEN -lSTEER -lTRIGGER
 
 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 +384,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)