Adding comments

[u/mrichter/AliRoot.git] / Makefile

diff --git a/Makefile b/Makefile
index 6c8636f4fff80ab8678be89ef6115c8f89984821..590a18f32a91888d4b99ab7d9607fb55f0043f62 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ else
 MUTE:=@
 endif
 
-CLEAN=$(findstring clean,$(patsubst %clean%,clean,$(MAKECMDGOALS)))
+CLEAN=$(findstring clean,$(MAKECMDGOALS))
 
 #-------------------------------------------------------------------------------
 # IRST coding rule check
@@ -23,11 +23,6 @@ export CLASSPATH IRST_INSTALLDIR IRST_CONFIG_DIR
 CODE_CHECK=java rules.ALICE.ALICERuleChecker
 REV_ENG=$(IRST_INSTALLDIR)/scripts/revEng.sh
 
-#-------------------------------------------------------------------------------
-# Include library definition
-
-include build/Makefile.config
-
 #-------------------------------------------------------------------------------
 # Include machine dependent macros
 
@@ -80,15 +75,15 @@ BINLIBDIRS   := -L$(ALICE_ROOT)/$(LIBPATH)
 #-------------------------------------------------------------------------------
 # Modules to build
 
-ifdef ALIVERBOSE
+ifeq (ALIVERBOSE,2)
 $(warning MAKECMDGOALS=$(MAKECMDGOALS))
 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
+      JETAN HLT LHC
 
 ifeq ($(findstring TFluka,$(MAKECMDGOALS)),TFluka)
 ALIROOTMODULES += TFluka
@@ -117,8 +112,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 +130,8 @@ LIBS := $(GLIBS) $(ROOTLIBS) $(SYSLIBS)
 default:
        $(MUTE)$(MAKE) aliroot
 
+FORCE:
+
 #-------------------------------------------------------------------------------
 # Each module will add to these macros
 
@@ -136,9 +142,11 @@ BINLIBS      :=
 EXPORTFILES  :=
 
 #-------------------------------------------------------------------------------
-# Dependencies of module.mk files
+# Dependencies of module.mk files if not cleaning
 
+ifeq ($(CLEAN),)
 include build/module.dep
+endif
 
 #-------------------------------------------------------------------------------
 # Check if module.mk is present for the library
@@ -170,7 +178,7 @@ ifeq ($(CLEAN),)
 ifneq ($(MAKECMDGOALS),depend)
 ifneq ($(MAKECMDGOALS),)
 
-ifdef ALIVERBOSE
+ifeq (ALIVERBOSE,2)
 $(warning INCLUDEFILES=$(INCLUDEFILES))
 endif
 -include $(INCLUDEFILES)