X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=Makefile;h=246971eb7f20eaa8b8f4ced1fa33aab76f5f681a;hb=b812d3933c65941608b9d3e8bdaa23f8071732e9;hp=9f0072f213f8aa04eb18efef655f1d5a5b4b32b3;hpb=c7fd5c1c2a8fdd5cf157a0439636a046d4f9e1e4;p=u%2Fmrichter%2FAliRoot.git

diff --git a/Makefile b/Makefile
index 9f0072f213f..246971eb7f2 100644
--- a/Makefile
+++ b/Makefile
@@ -3,9 +3,7 @@
 # Author: Jan-Erik Revsbech (revsbech@fys.ku.dk)
 #         Developed on idea of Boris Polichtchouk (Boris.Polichtchouk@cern.ch), 15/4/2001
 
-
-##### include general path/location macros #####
-override ALICE_ROOT=$(shell pwd)
+# /* $Id$ */
 
 ifdef ALIVERBOSE
 MUTE:=
@@ -13,7 +11,11 @@ else
 MUTE:=@
 endif
 
+CLEAN=$(findstring clean,$(MAKECMDGOALS))
+
+#-------------------------------------------------------------------------------
 # IRST coding rule check
+
 IRST_INSTALLDIR=$(ALICE)/local/IRST
 IRST_CONFIG_DIR=$(IRST_INSTALLDIR)/userConfig/ALICE
 CLASSPATH=$(IRST_INSTALLDIR)
@@ -21,227 +23,214 @@ export CLASSPATH IRST_INSTALLDIR IRST_CONFIG_DIR
 CODE_CHECK=java rules.ALICE.ALICERuleChecker
 REV_ENG=$(IRST_INSTALLDIR)/scripts/revEng.sh
 
-
-include build/Makefile.config
-################################################################## 
-# 
-#            Where to install libraries and binaries 
-#                 and common header files
-
-LIBPATH=lib/tgt_$(ALICE_TARGET)
-BINPATH=bin/tgt_$(ALICE_TARGET)
-EXPORTDIR = $(ALICE_ROOT)/include
-##################################################################
-
-##################################################################
-# include machine dependent macros 
+#-------------------------------------------------------------------------------
+# Include machine dependent macros
 
 -include build/Makefile.$(ALICE_TARGET)
-##################################################################
 
-##################################################################
-# 
-#               Check if called with debug
+#-------------------------------------------------------------------------------
+# Check if called with debug
 
 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))
-SOFLAGS := -g $(filter-out -O%,$(SOFLAGS))
-LDFLAGS := -g $(filter-out -O%,$(LDFLAGS))
+override ALICE_TARGET := $(ALICE_TARGET)DEBUG
+FFLAGS   := -g $(filter-out -O%,$(FFLAGS))
+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
-##################################################################
 
-##################################################################
-# 
-#               Check if called with profile
+#-------------------------------------------------------------------------------
+# Check if called with profile
 
 ifeq ($(ALIPROFILE),YES)
-override ALICE_TARGET:=$(ALICE_TARGET)PROF
-FFLAGS += -pg
+override ALICE_TARGET := $(ALICE_TARGET)PROF
+FFLAGS   += -pg
 CXXFLAGS += -pg
-CFLAGS += -pg
-SOFLAGS += -pg
-LDFLAGS += -pg
+CFLAGS   += -pg
+SOFLAGS  += -pg
+LDFLAGS  += -pg
 endif
-##################################################################
 
-##################################################################
-#
-#                   Modules to build 
+#-------------------------------------------------------------------------------
+# Check if DATE is installed
 
-# Uncomment to show some output
-#$(warning MAKECMDGOALS=$(MAKECMDGOALS))
+ifdef DATE_ROOT
+DATEFLAGS  = -DALI_DATE -D${DATE_SYS} -DDATE_SYS=${DATE_SYS} -Dlong32=${DATE_LONG32} \
+             -Dlong64='${DATE_LONG64}' -DdatePointer=${DATE_POINTER} -I${DATE_COMMON_DEFS}
+CXXFLAGS  += $(DATEFLAGS)
+CFLAGS    += $(DATEFLAGS)
+CINTFLAGS += $(DATEFLAGS)
+DEPINC    += $(DATEFLAGS)
+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 \
-      THerwig TEPEMGEN EPEMGEN FASTSIM
+#-------------------------------------------------------------------------------
+# Location where to install libraries and binaries and common header files
 
-CERNMODULES:= PDF PYTHIA6 HIJING MICROCERN HERWIG
+LIBPATH      := lib/tgt_$(ALICE_TARGET)
+BINPATH      := bin/tgt_$(ALICE_TARGET)
+EXPORTDIR    := $(ALICE_ROOT)/include
+BINLIBDIRS   := -L$(ALICE_ROOT)/$(LIBPATH)
 
-MODULES:=$(ALIROOTMODULES) $(CERNMODULES) 
+#-------------------------------------------------------------------------------
+# Modules to build
+
+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 \
+      THerwig TEPEMGEN EPEMGEN FASTSIM TPHIC RAW MONITOR DISPLAY ANALYSIS \
+      JETAN HLT LHC
 
 ifeq ($(findstring TFluka,$(MAKECMDGOALS)),TFluka)
-MODULES += TFluka
+ALIROOTMODULES += TFluka
 endif
 
 ifeq ($(findstring Flugg,$(MAKECMDGOALS)),Flugg)
-MODULES += Flugg
+ALIROOTMODULES += Flugg
 endif
 
-##################################################################
+CERNMODULES := PDF PYTHIA6 HIJING MICROCERN HERWIG
 
-MODULES += ALIROOT 
+MODULES := $(ALIROOTMODULES) $(CERNMODULES) ALIROOT
 
 MODDIRS := $(MODULES)
 
-#############################################################
-# 
-#               Default include dirs for 
-#          C++, Fortran, Cint, and dependencies 
-#      The module directory will be added by each module
-#
+#-------------------------------------------------------------------------------
+# Default include dirs for C++, Fortran, Cint, and dependencies
+# The module directory will be added by each module
 
-CXXFLAGS += -I$(ALICE_ROOT)/include
-CXXFLAGS += $(patsubst %,-I%,$(ROOTSYS)/include)
+GENINC     := -I$(ALICE_ROOT)/include -I$(shell root-config --incdir)
+CXXFLAGS   += $(GENINC)
+CXXFLAGSNO += $(GENINC)
+CINTFLAGS  += $(GENINC)
+DEPINC     += $(GENINC)
 
-CINTFLAGS += -I$(ALICE_ROOT)/include
-CINTFLAGS += $(patsubst %,-I%,$(ROOTSYS)/include)
+#-------------------------------------------------------------------------------
+# Libraries to link binaries against
+# Libraries will be linked against SHLIB
+# ROOT libraries 
 
-DEPINC  += -I$(ALICE_ROOT)/include
-DEPINC += $(patsubst %,-I%,$(ROOTSYS)/include)
-#############################################################
+ROOTCLIBS     := $(shell root-config --glibs) -lThread -lMinuit -lHtml -lVMC -lEG -lGeom
 
+ROOTPLIBS     := -lEGPythia6
 
-#############################################################
-#
-#             Libraries to link binaries against
-#            Libraries will be linked againstSHLIB
-LIBS := $(GLIBS) $(ROOTLIBS) $(SYSLIBS)
-#############################################################
+ALILIBS	      := -L$(LIBDIR) -lMUON -lTPC -lPMD -lTRD -lFMD -lTOF \
+                -lITS -lPHOS -lCRT -lRICH -lVZERO -lZDC -lSTRUCT \
+                -lSTART -lEVGEN -lSTEER -lCONTAINERS
 
+LIBS := $(ROOTCLIBS) $(ROOTPLIBS) $(SYSLIBS)
 
+#-------------------------------------------------------------------------------
 # default target
-default:     alilibs  aliroot
 
+default:
+	$(MUTE)$(MAKE) aliroot
 
-#############################################################
-#
-#            Each module will add to this
+FORCE:
+
+#-------------------------------------------------------------------------------
+# Each module will add to these macros
 
 ALLLIBS      :=
 ALLEXECS     :=
 INCLUDEFILES :=
-BINLIBS      := 
-EXPORTFILES  := 
-#############################################################
-
-BINLIBDIRS   := -L$(ALICE_ROOT)/$(LIBPATH)
-
+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
 
-#############################################################
-# 
-#        Check if module.mk is present for the library
-%.mk: build/module.tpl
+%.mk: build/module.tpl build/header.tpl build/clean.tpl share/alibtool
 ifndef ALIQUIET
 	@echo "***** Creating $@ file *****";
 endif
 	@share/alibtool mkmodule  $(patsubst %/module.mk,%,$@) > $@;
-#############################################################
 
-# **************************************************************************
-#
-#               If cleaning, do not include 
-#             dependencies or module.mk files.
+#-------------------------------------------------------------------------------
+# If making modules, not not include anything
 
-ifeq ($(findstring $(MAKECMDGOALS), clean clean-all clean-dicts clean-modules clean-depend clean-objects clean-libs clean-bins),)
+ifeq ($(findstring modules,$(MAKECMDGOALS)),)
 
-#            If making modules, not not include
-#                       anything
+#-------------------------------------------------------------------------------
+# Include the modules
 
-ifneq ($(findstring modules,$(MAKECMDGOALS)),modules)
+-include $(patsubst %,%/module.mk,$(MODULES))
 
-#############################################################
-# 
-#                Include the modules
--include $(patsubst %,%/module.mk,$(MODULES)) 
+#-------------------------------------------------------------------------------
+# If cleaning, do not include dependencies or module.mk files.
 
-#
-#
-#############################################################
+ifeq ($(CLEAN),)
 
-#############################################################
-#
-#          include dependencies if not making them!
-ifneq ($(MAKECMDGOALS),depend )
-#           Don't include if cleaning of any sort
-ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
-#$(warning INCLUDEFILES=$(INCLUDEFILES))
-include $(INCLUDEFILES)
-endif
+#-------------------------------------------------------------------------------
+# Include dependencies if not making them!
+
+ifneq ($(MAKECMDGOALS),depend)
+ifneq ($(MAKECMDGOALS),)
+
+ifeq (ALIVERBOSE,2)
+$(warning INCLUDEFILES=$(INCLUDEFILES))
 endif
-#############################################################
+-include $(INCLUDEFILES)
 
 endif
 endif
-# **************************************************************************
-
-#############################################################
-#
-#              include dummy dependency file
-#               *MUST* be last includefile
-include build/dummy.d
-#############################################################
+endif
+endif
 
+#-------------------------------------------------------------------------------
+# Include dummy dependency file *MUST* be last includefile
 
-# targets
+include build/dummy.d
 
-.PHONY:		alilibs aliroot makedistr clean htmldoc profile
 
-modules: $(patsubst %,%/module.mk,$(MODULES)) 	
+#-------------------------------------------------------------------------------
+# Targets
 
+.PHONY:		alilibs aliroot makedistr clean distclean clean-all \
+		htmldoc profile modules depend
 
-aliroot: $(BINPATH) $(ALLEXECS) alilibs bin
+modules: $(patsubst %,%/module.mk,$(MODULES)) 
 
 ifeq ($(ALIPROFILE),YES)
-alilibs: $(LIBPATH) $(ALLLIBS) $(ALLALIBS) lib modules
+alilibs: $(LIBPATH) modules $(ALLLIBS) $(ALLALIBS)
 else
-alilibs: $(LIBPATH) $(ALLLIBS) lib modules
+alilibs: $(LIBPATH) modules $(ALLLIBS)
 endif
 
+aliroot: alilibs $(BINPATH) $(ALLEXECS) 
+
+#-------------------------------------------------------------------------------
 # Single Makefile "distribution": Makefile + modules + mkdepend scripts
-makedistr: $(MODULES)	 
+makedistr: $(MODULES)
 	 tar -cvf MakeDistr.tar $(patsubst %,%/*.pkg,$(MODULES)) \
-		Makefile create build/* 
+		Makefile create build/*
 
 all: aliroot
 
-
-depend: $(INCLUDEFILES) 
+depend: $(INCLUDEFILES)
 
 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))
-lib: 
-	@mkdir lib
-	@mkdir lib/tgt_$(ALICE_TARGET)
-
-bin: 
-	@mkdir bin
-	@mkdir bin/tgt_$(ALICE_TARGET)
+	@(export ALIPROFILE=YES && $(MAKE) aliroot)
 
 $(MODULES):
 ifndef ALIQUIET
@@ -267,11 +256,12 @@ build/dummy.d: $(EXPORTFILES)
 	fi)
 
 clean:
-	@echo "***** No targen clean, use one of these *****"
+	@echo "***** No target clean, use one of these *****"
 	@echo "	clean-aliroot     : Clean up all aliroot libraries"
 	@echo "	clean-MODULENAME  : Clean everything from module MODULENAME"
 	@echo "	clean-all         : Cleans up everything, including cern libraires"
-	@echo "	clean-modules     : Clean all module.mk file in all modules"
+	@echo "	distclean         : Like clean-all + clean all tgt_*'s"
+	@echo "	clean-modules     : Clean all module.mk files in all modules"
 	@echo "	clean-libs        : Clean all libraries (not object files)"
 	@echo "********************************************"
 
@@ -282,20 +272,27 @@ endif
 	$(MUTE)rm -rf $(patsubst %,%/tgt_$(ALICE_TARGET),$(MODULES))
 	$(MUTE)rm -rf $(EXPORTDIR)
 
-#This cleans only libraries that are not CERN-libraries
+distclean: clean-all
+	$(MUTE)rm -rf */tgt_* bin lib
+
+#-------------------------------------------------------------------------------
+# This cleans only libraries that are not CERN-libraries
 
 clean-aliroot:   $(patsubst %,%/module.mk,$(ALIROOTMODULES)) $(patsubst %,clean-%,$(ALIROOTMODULES))
 
-CHECKMODULES := $(ALIROOTMODULES)
+CHECKMODULES := $(MODULES)
 CHECKMODULES := $(filter-out HBTP,$(CHECKMODULES))
 CHECKMODULES := $(filter-out MEVSIM,$(CHECKMODULES))
 CHECKMODULES := $(filter-out EPEMGEN,$(CHECKMODULES))
+CHECKMODULES := $(filter-out TPHIC,$(CHECKMODULES))
+CHECKMODULES := $(filter-out PDF,$(CHECKMODULES))
+CHECKMODULES := $(filter-out MICROCERN,$(CHECKMODULES))
 
-check-all:			$(patsubst %,%/module.mk,$(CHECKMODULES)) $(patsubst %,check-%,$(CHECKMODULES))
+check-all:    $(patsubst %,%/module.mk,$(CHECKMODULES)) $(patsubst %,check-%,$(CHECKMODULES))
 
-reveng-all:			$(patsubst %,%/module.mk,$(CHECKMODULES)) $(patsubst %,reveng-%,$(CHECKMODULES))
+reveng-all:   $(patsubst %,%/module.mk,$(CHECKMODULES)) $(patsubst %,reveng-%,$(CHECKMODULES))
 
-revdisp-all:		$(patsubst %,%/module.mk,$(CHECKMODULES)) $(patsubst %,revdisp-%,$(CHECKMODULES))
+revdisp-all:  $(patsubst %,%/module.mk,$(CHECKMODULES)) $(patsubst %,revdisp-%,$(CHECKMODULES))
 
 clean-dicts:
 ifndef ALIQUIET
@@ -307,7 +304,7 @@ clean-modules:
 ifndef ALIQUIET
 	@echo "***** Cleaning up module.mk files *****"
 endif
-	$(MUTE)rm -rf $(patsubst %,%/module.mk,$(MODULES)) 
+	$(MUTE)rm -rf $(patsubst %,%/module.mk,$(MODULES))
 
 clean-depend:
 ifndef ALIQUIET
@@ -333,9 +330,9 @@ ifndef ALIQUIET
 endif
 	$(MUTE)rm -rf bin/tgt_$(ALICE_TARGET)
 
-clean-check-all:			$(patsubst %,%/module.mk,$(CHECKMODULES)) $(patsubst %,clean-check-%,$(CHECKMODULES))
+clean-check-all:  $(patsubst %,%/module.mk,$(CHECKMODULES)) $(patsubst %,clean-check-%,$(CHECKMODULES))
 
-clean-reveng-all:			$(patsubst %,%/module.mk,$(CHECKMODULES)) $(patsubst %,clean-reveng-%,$(CHECKMODULES))
+clean-reveng-all: $(patsubst %,%/module.mk,$(CHECKMODULES)) $(patsubst %,clean-reveng-%,$(CHECKMODULES))
 
 htmldoc:
 	@rm -rf html/roothtml