Corrected names and order of libraries

[u/mrichter/AliRoot.git] / Makefile

diff --git a/Makefile b/Makefile
index 7929ed1bccc8f05703f087e041225f18d905a918..43e7973bdde56c6e134a849980f4d3f469f015b6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -28,14 +28,6 @@ REV_ENG=$(IRST_INSTALLDIR)/scripts/revEng.sh
 
 include build/Makefile.config
 
-#-------------------------------------------------------------------------------
-# Location where to install libraries and binaries and common header files
-
-LIBPATH      := lib/tgt_$(ALICE_TARGET)
-BINPATH      := bin/tgt_$(ALICE_TARGET)
-EXPORTDIR    := $(ALICE_ROOT)/include
-BINLIBDIRS   := -L$(ALICE_ROOT)/$(LIBPATH)
-
 #-------------------------------------------------------------------------------
 # Include machine dependent macros
 
@@ -47,8 +39,8 @@ BINLIBDIRS   := -L$(ALICE_ROOT)/$(LIBPATH)
 ifeq ($(ALIDEBUG),YES)
 override ALICE_TARGET := $(ALICE_TARGET)DEBUG
 FFLAGS   := -g $(filter-out -O%,$(FFLAGS))
-CXXFLAGS := -g $(filter-out -O%,$(CXXLAGS))
-CFLAGS   := -g $(filter-out -O%,$(CLAGS))
+CXXFLAGS := -g $(filter-out -O%,$(CXXFLAGS))
+CFLAGS   := -g $(filter-out -O%,$(CFLAGS))
 SOFLAGS  := -g $(filter-out -O%,$(SOFLAGS))
 LDFLAGS  := -g $(filter-out -O%,$(LDFLAGS))
 endif
@@ -70,17 +62,25 @@ endif
 
 ifdef DATE_ROOT
 DATEFLAGS  = -DALI_DATE -D${DATE_SYS} -DDATE_SYS=${DATE_SYS} -Dlong32=${DATE_LONG32} \
-             -Dlong64=${DATE_LONG64} -DdatePointer=${DATE_POINTER}
+             -Dlong64='${DATE_LONG64}' -DdatePointer=${DATE_POINTER} -I${DATE_COMMON_DEFS}
 CXXFLAGS  += $(DATEFLAGS)
 CFLAGS    += $(DATEFLAGS)
 CINTFLAGS += $(DATEFLAGS)
 DEPINC    += $(DATEFLAGS)
 endif
 
+#-------------------------------------------------------------------------------
+# Location where to install libraries and binaries and common header files
+
+LIBPATH      := lib/tgt_$(ALICE_TARGET)
+BINPATH      := bin/tgt_$(ALICE_TARGET)
+EXPORTDIR    := $(ALICE_ROOT)/include
+BINLIBDIRS   := -L$(ALICE_ROOT)/$(LIBPATH)
+
 #-------------------------------------------------------------------------------
 # Modules to build
 
-ifdef ALIVERBOSE
+ifeq (ALIVERBOSE,2)
 $(warning MAKECMDGOALS=$(MAKECMDGOALS))
 endif
 
@@ -88,7 +88,7 @@ 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 \
       THerwig TEPEMGEN EPEMGEN FASTSIM TPHIC RAW MONITOR DISPLAY ANALYSIS \
-      JETAN HLT
+      JETAN HLT LHC
 
 ifeq ($(findstring TFluka,$(MAKECMDGOALS)),TFluka)
 ALIROOTMODULES += TFluka
@@ -123,7 +123,8 @@ LIBS := $(GLIBS) $(ROOTLIBS) $(SYSLIBS)
 #-------------------------------------------------------------------------------
 # default target
 
-default: aliroot
+default:
+       $(MUTE)$(MAKE) aliroot
 
 #-------------------------------------------------------------------------------
 # Each module will add to these macros
@@ -169,7 +170,7 @@ ifeq ($(CLEAN),)
 ifneq ($(MAKECMDGOALS),depend)
 ifneq ($(MAKECMDGOALS),)
 
-ifdef ALIVERBOSE
+ifeq (ALIVERBOSE,2)
 $(warning INCLUDEFILES=$(INCLUDEFILES))
 endif
 -include $(INCLUDEFILES)
@@ -215,13 +216,13 @@ debug:
 ifndef ALIQUIET
        @echo "***** Entering DEBUG mode. *****"
 endif
-       @(export ALIDEBUG=YES && $(MAKE))
+       @(export ALIDEBUG=YES && $(MAKE) aliroot)
 
 profile:
 ifndef ALIQUIET
        @echo "***** Entering PROFILE mode. *****"
 endif
-       @(export ALIPROFILE=YES && $(MAKE))
+       @(export ALIPROFILE=YES && $(MAKE) aliroot)
 
 $(MODULES):
 ifndef ALIQUIET