EffC++ warnings corrected.

[u/mrichter/AliRoot.git] / Makefile

diff --git a/Makefile b/Makefile
index 5eab5c2d6b8cd5d433be59f1b976679546078128..783de41a00fe6724eefc194cbacdc6c8968ba2a7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,10 +23,8 @@ export CLASSPATH IRST_INSTALLDIR IRST_CONFIG_DIR
 CODE_CHECK=java rules.ALICE.ALICERuleChecker
 REV_ENG=$(IRST_INSTALLDIR)/scripts/revEng.sh
 
-#-------------------------------------------------------------------------------
-# Include library definition
+SMELL_DETECTOR_DIR=$(IRST_INSTALLDIR)/smell-detector
 
-include build/Makefile.config
 
 #-------------------------------------------------------------------------------
 # Include machine dependent macros
@@ -67,6 +65,13 @@ CXXFLAGS  += $(DATEFLAGS)
 CFLAGS    += $(DATEFLAGS)
 CINTFLAGS += $(DATEFLAGS)
 DEPINC    += $(DATEFLAGS)
+else
+DATEFLAGS  = -D`uname` -DDATE_SYS=`uname` -Dlong32='int' \
+             -Dlong64='long long' -DdatePointer='long'
+CXXFLAGS  += $(DATEFLAGS)
+CFLAGS    += $(DATEFLAGS)
+CINTFLAGS += $(DATEFLAGS)
+DEPINC    += $(DATEFLAGS)
 endif
 
 #-------------------------------------------------------------------------------
@@ -86,14 +91,30 @@ endif
 
 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 \
+      THijing MEVSIM TMEVSIM THbtp HBTP EMCAL HBTAN \
       THerwig TEPEMGEN EPEMGEN FASTSIM TPHIC RAW MONITOR DISPLAY ANALYSIS \
-      JETAN HLT LHC
+      JETAN HLT LHC EVE
 
 ifeq ($(findstring TFluka,$(MAKECMDGOALS)),TFluka)
 ALIROOTMODULES += TFluka
 endif
 
+ifeq ($(findstring PWG0,$(MAKECMDGOALS)),PWG0)
+ALIROOTMODULES += PWG0
+endif
+
+ifeq ($(findstring PWG2,$(MAKECMDGOALS)),PWG2)
+ALIROOTMODULES += PWG2
+endif
+
+ifeq ($(findstring PWG3,$(MAKECMDGOALS)),PWG3)
+ALIROOTMODULES += PWG3
+endif
+
+ifeq ($(findstring SHUTTLE,$(MAKECMDGOALS)),SHUTTLE)
+ALIROOTMODULES += SHUTTLE
+endif
+
 ifeq ($(findstring Flugg,$(MAKECMDGOALS)),Flugg)
 ALIROOTMODULES += Flugg
 endif
@@ -117,8 +138,17 @@ DEPINC     += $(GENINC)
 #-------------------------------------------------------------------------------
 # Libraries to link binaries against
 # Libraries will be linked against SHLIB
+# ROOT libraries 
+
+ROOTCLIBS     := $(shell root-config --glibs) -lThread -lMinuit -lHtml -lVMC -lEG -lGeom
+
+ROOTPLIBS     := -lEGPythia6
 
-LIBS := $(GLIBS) $(ROOTLIBS) $(SYSLIBS)
+ALILIBS              := -L$(LIBDIR) -lMUON -lTPC -lPMD -lTRD -lFMD -lTOF \
+                -lITS -lPHOS -lCRT -lRICH -lVZERO -lZDC -lSTRUCT \
+                -lSTART -lEVGEN -lSTEER
+
+LIBS := $(ROOTCLIBS) $(ROOTPLIBS) $(SYSLIBS)
 
 #-------------------------------------------------------------------------------
 # default target
@@ -126,6 +156,8 @@ LIBS := $(GLIBS) $(ROOTLIBS) $(SYSLIBS)
 default:
        $(MUTE)$(MAKE) aliroot
 
+FORCE:
+
 #-------------------------------------------------------------------------------
 # Each module will add to these macros
 
@@ -138,7 +170,7 @@ EXPORTFILES  :=
 #-------------------------------------------------------------------------------
 # Dependencies of module.mk files if not cleaning
 
-ifeq ($CLEAN),)
+ifeq ($(CLEAN),)
 include build/module.dep
 endif
 
@@ -204,6 +236,11 @@ endif
 
 aliroot: alilibs $(BINPATH) $(ALLEXECS) 
 
+alimdc-static: $(LIBPATH) $(RAWDatabaseALIB) $(MDCALIB) $(ESDALIB)
+        $(MUTE)rm -rf $(LIBPATH)/libAliMDC.a
+        $(MUTE)rm -rf junk
+        mkdir junk && cd junk && ar x ../$(RAWDatabaseALIB) && ar x ../$(MDCALIB) && ar x ../$(ESDALIB) && ar r ../$(LIBPATH)/libAliMDC.a *.o && cd .. && rm -rf junk
+
 #-------------------------------------------------------------------------------
 # Single Makefile "distribution": Makefile + modules + mkdepend scripts
 makedistr: $(MODULES)
@@ -288,6 +325,8 @@ reveng-all:   $(patsubst %,%/module.mk,$(CHECKMODULES)) $(patsubst %,reveng-%,$(
 
 revdisp-all:  $(patsubst %,%/module.mk,$(CHECKMODULES)) $(patsubst %,revdisp-%,$(CHECKMODULES))
 
+smell-all:    $(patsubst %,%/module.mk,$(CHECKMODULES)) $(patsubst %,smell-%,$(CHECKMODULES))
+
 clean-dicts:
 ifndef ALIQUIET
        @echo "***** Cleaning up G__ files *****"