X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=Makefile;h=1452fe404b3b618879d6dd41244c431e8be0de0f;hp=db75599759c56275c7669f84a521f06083cd8bc8;hb=282734acf7c54ae75e80e7c7d19d3f223ec545e5;hpb=0a1aa611183243f4d79e7049b6ea3dc7507077c8

diff --git a/Makefile b/Makefile
index db75599759c..1452fe404b3 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,242 +23,364 @@ export CLASSPATH IRST_INSTALLDIR IRST_CONFIG_DIR
 CODE_CHECK=java rules.ALICE.ALICERuleChecker
 REV_ENG=$(IRST_INSTALLDIR)/scripts/revEng.sh
 
+SMELL_DETECTOR_DIR=$(IRST_INSTALLDIR)/smell-detector
 
-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
-##################################################################
 
-##################################################################
-# 
-#               Check if HLT code is there
+#-------------------------------------------------------------------------------
+# Check if DATE is installed
 
-ifeq ($(ALIHLT_USEPACKAGE),ALIROOT)
-DEFSTR = -Duse_aliroot -Duse_root
-ifeq ($(ALIHLT_DOMC),true)
-DEFSTR += -Ddo_mc
-endif
-CXXFLAGS += -DALI_HLT $(DEFSTR) -I$(ALIHLT_TOPDIR)/src
-CINTFLAGS += -DALI_HLT $(DEFSTR) -I$(ALIHLT_TOPDIR)/src
-DEPINC += -DALI_HLT $(DEFSTR) -I$(ALIHLT_TOPDIR)/src
+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)
+else
+DATEFLAGS  = -D`uname` -DDATE_SYS=`uname` -Dlong32='int' \
+             -Dlong64='long long' -DdatePointer='long'
+CXXFLAGS  += $(DATEFLAGS)
+CFLAGS    += $(DATEFLAGS)
+CINTFLAGS += $(DATEFLAGS)
+DEPINC    += $(DATEFLAGS)
 endif
-##################################################################
 
-##################################################################
-#
-#                   Modules to build 
 
-# Uncomment to show some output
-#$(warning MAKECMDGOALS=$(MAKECMDGOALS))
+#-------------------------------------------------------------------------------
+# ROOT Stuff
+ROOTCONFIG    := root-config
+ROOTLIBDIR    := $(shell $(ROOTCONFIG) --libdir)
+ROOTPLUGDIR   := $(ROOTLIBDIR)/$(dir $(shell $(ROOTCONFIG) --version))
+ROOTINCDIR    := $(shell $(ROOTCONFIG) --incdir)
+ROOTCLIBS     := $(shell $(ROOTCONFIG) --glibs) \
+			-lThread 		\
+			-lMinuit 		\
+			-lVMC 			\
+			-lEG 			\
+			-lGeom 			\
+			-lTreePlayer 		\
+			-lXMLIO 		\
+			-lXMLParser 		\
+			-lProof 		\
+			-lProofPlayer 		\
+			-lMLP 			\
+			-lSpectrum 		\
+			-L$(ROOTPLUGDIR)
+
+#-------------------------------------------------------------------------------
+# 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
 
-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
+ifeq (ALIVERBOSE,2)
+$(warning MAKECMDGOALS=$(MAKECMDGOALS))
+endif
+
+ALIROOTMODULES := STEER PHOS TRD TPC ZDC MUON PMD FMD TOF ITS \
+      ACORDE HMPID T0 BCM STRUCT EVGEN RALICE VZERO \
+      THijing THbtp EMCAL HBTAN \
+      THerwig TEPEMGEN FASTSIM TPHIC RAW MONITOR ANALYSIS \
+      JETAN HLT LHC ESDCheck STAT TTherminator CORRFW DPMJET TDPMjet \
+      PWG0 PWG1 PWG2 PWG3 PWG4
 
-CERNMODULES:= PDF PYTHIA6 HIJING MICROCERN HERWIG
+ifneq ($(shell $(ROOTCONFIG) --has-pythia8), no)
+ALIROOTMODULES += PYTHIA8
+endif 
 
-MODULES:=$(ALIROOTMODULES) $(CERNMODULES) 
+ifneq ($(shell $(ROOTCONFIG) --has-opengl), no)
+ALIROOTMODULES += EVE
+endif 
 
 ifeq ($(findstring TFluka,$(MAKECMDGOALS)),TFluka)
-MODULES += TFluka
+ALIROOTMODULES += TFluka
+endif
+
+ifeq ($(findstring THydjet,$(MAKECMDGOALS)),THydjet)
+ALIROOTMODULES += THydjet
+endif
+
+ifeq ($(findstring SHUTTLE,$(MAKECMDGOALS)),SHUTTLE)
+ALIROOTMODULES += SHUTTLE
 endif
 
 ifeq ($(findstring Flugg,$(MAKECMDGOALS)),Flugg)
-MODULES += Flugg
+ALIROOTMODULES += Flugg
 endif
 
-##################################################################
+CERNMODULES := LHAPDF HIJING MICROCERN HERWIG
+ifneq ($(wildcard $(ROOTINCDIR)/TPythia6.h),)
+CERNMODULES += PYTHIA6
+endif 
 
-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
-#
-
-CXXFLAGS += -I$(ALICE_ROOT)/include
-CXXFLAGS += $(patsubst %,-I%,$(ROOTSYS)/include)
+#-------------------------------------------------------------------------------
+# Default include dirs for C++, Fortran, Cint, and dependencies
+# The module directory will be added by each module
 
-CINTFLAGS += -I$(ALICE_ROOT)/include
-CINTFLAGS += $(patsubst %,-I%,$(ROOTSYS)/include)
+GENINC     := -I$(ALICE_ROOT)/include -I$(shell root-config --incdir)
+CXXFLAGS   += $(GENINC)
+CXXFLAGSNO += $(GENINC)
+CINTFLAGS  += $(GENINC)
+DEPINC     += $(GENINC)
 
-DEPINC  += -I$(ALICE_ROOT)/include
-DEPINC += $(patsubst %,-I%,$(ROOTSYS)/include)
-#############################################################
+#-------------------------------------------------------------------------------
+# Libraries to link binaries against
+# Libraries will be linked against SHLIB
+# ROOT libraries 
 
+ALILIBS	      := -L$(LIBDIR) -lMUON -lTPC -lPMD -lTRD -lFMD -lTOF \
+                -lITS -lPHOS -lACORDE -lHMPID -lVZERO -lZDC -lSTRUCT \
+                -lT0 -lEVGEN -lSTEER 
 
-#############################################################
-#
-#             Libraries to link binaries against
-#            Libraries will be linked againstSHLIB
-LIBS := $(GLIBS) $(ROOTLIBS) $(SYSLIBS)
-#############################################################
+LIBS := $(ROOTCLIBS) $(ROOTPLIBS) $(SYSLIBS)
 
+ARVERSIONFILE := $(EXPORTDIR)/ARVersion.h
+SVNREV        := $(strip $(shell svn info | grep "Last Changed Rev:" | \
+			         cut -d: -f2 ))
+SVNBRANCH     := w$(subst //alisoft.cern.ch/AliRoot/,,\
+		    $(shell svn info | grep "URL:" | cut -d: -f3 ))
 
+#-------------------------------------------------------------------------------
 # default target
-default:     alilibs  aliroot
 
+default: $(ARVERSIONFILE)
+	$(MUTE)$(MAKE) aliroot
 
-#############################################################
-#
-#            Each module will add to this
+FORCE:
+
+#-------------------------------------------------------------------------------
+# Write header file with aliroot svn version and url
+
+$(ARVERSIONFILE): FORCE $(EXPORTDIR)
+	$(MUTE)rm -f $(ARVERSIONFILE)
+	@echo "***** Making $(ARVERSIONFILE) *****"
+	@echo "#ifndef ALIROOT_ARVersion" >> $@
+	@echo "#define ALIROOT_ARVersion" >> $@
+	@echo "#define ALIROOT_SVN_REVISION $(SVNREV)" >> $@
+	@echo "#define ALIROOT_SVN_BRANCH \"$(SVNBRANCH)\"" >> $@
+	@echo "#endif" >> $@ 
+#-------------------------------------------------------------------------------
+# 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 dependencies if not making them!
+
+ifneq ($(MAKECMDGOALS),depend)
+ifneq ($(MAKECMDGOALS),)
+
+ifeq (ALIVERBOSE,2)
+$(warning INCLUDEFILES=$(INCLUDEFILES))
+endif
 -include $(INCLUDEFILES)
+
 endif
 endif
-#############################################################
-
 endif
 endif
-# **************************************************************************
-
-#############################################################
-#
-#              include dummy dependency file
-#               *MUST* be last includefile
-include build/dummy.d
-#############################################################
 
+#-------------------------------------------------------------------------------
+# 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) 
+
+ROOTALIBDIR=$(shell root-config --libdir)
+
+ALIMDCSPECFILE=$(RAWDIRO)/alimdc.spec
+ALIMDCVERSION=$(subst -,.,$(notdir $(subst /RAW/mdc.h,,$(shell svn info RAW/mdc.h | grep "URL:" | cut -d: -f3 ))))
+ALIMDCRELEASE=$(firstword $(shell svn info RAW/mdc.h | grep "Revision:" | cut -d: -f2 ))
+
+alimdc-rpm: alimdc-static alimdc-specfile
+	$(MUTE)rm -rf alimdc-root
+	$(MUTE)mkdir -p alimdc-root/opt/alimdc/lib
+	$(MUTE)mkdir -p alimdc-root/opt/alimdc/include
+	$(MUTE)cp RAW/mdc.h alimdc-root/opt/alimdc/include
+	$(MUTE)cp $(LIBPATH)/libAliMDC.a \
+	$(ROOTALIBDIR)/libRoot.a \
+	$(ROOTALIBDIR)/libfreetype.a $(ROOTALIBDIR)/libpcre.a \
+	alimdc-root/opt/alimdc/lib
+	$(MUTE)rm -rf RPMS
+	$(MUTE)mkdir -p RPMS/i386
+	$(MUTE)rpmbuild --verbose --define "_topdir $(ALICE_ROOT)" --define "_tmppath $(ALICE_ROOT)" -bb $(ALIMDCSPECFILE)
+	$(MUTE)cp -p RPMS/i386/alimdc-*.rpm .
+	$(MUTE)rm -rf alimdc-root
+	$(MUTE)rm -rf RPMS
+	@echo "***** alimdc RPM created and put $(ALICE_ROOT) folder *****"
+
+alimdc-specfile: $(RAWDIRO)
+	$(MUTE)rm -rf $(ALIMDCSPECFILE)
+	@echo "***** Making alimdc RPM spec-file $(ALIMDCSPECFILE) *****"
+	@echo "# RPM specfile for alimdc static libs" >> $(ALIMDCSPECFILE)
+	@echo "# Package contains both ROOT and AliRoot" >> $(ALIMDCSPECFILE)
+	@echo "# static libs needed by mStreamRecorder" >> $(ALIMDCSPECFILE)
+	@echo "# in order to ROOT-ify the incoming raw" >> $(ALIMDCSPECFILE)
+	@echo "# data" >> $(ALIMDCSPECFILE)
+	@echo "# Example how-to build alimdc RPM:" >> $(ALIMDCSPECFILE)
+	@echo "# cd $ALICE_ROOT" >> $(ALIMDCSPECFILE)
+	@echo "# make alimdc-rpm" >> $(ALIMDCSPECFILE)
+	@echo "" >> $(ALIMDCSPECFILE)
+	@echo "Summary: AliMDC static libraries" >> $(ALIMDCSPECFILE)
+	@echo "Name: alimdc" >> $(ALIMDCSPECFILE)
+	@echo "Version:  $(ALIMDCVERSION)" >> $(ALIMDCSPECFILE)
+	@echo "Release: $(ALIMDCRELEASE)" >> $(ALIMDCSPECFILE)
+	@echo "# Copyright: CERN Alice Off-line" >> $(ALIMDCSPECFILE)
+	@echo "License: CERN Alice Off-line" >> $(ALIMDCSPECFILE)
+	@echo "Vendor: ALICE Core Off-line Group" >> $(ALIMDCSPECFILE)
+	@echo "URL: http://aliceinfo.cern.ch" >> $(ALIMDCSPECFILE)
+	@echo "Group: Applications/Alice" >> $(ALIMDCSPECFILE)
+	@echo "Prefix: /opt/%{name}" >> $(ALIMDCSPECFILE)
+	@echo "BuildRoot: %{_tmppath}/%{name}-root" >> $(ALIMDCSPECFILE)
+	@echo "" >> $(ALIMDCSPECFILE)
+	@echo "# automatic dependencies" >> $(ALIMDCSPECFILE)
+	@echo "AutoReqProv: yes" >> $(ALIMDCSPECFILE)
+	@echo "" >> $(ALIMDCSPECFILE)
+	@echo "# list here required RPM packages for runtime" >> $(ALIMDCSPECFILE)
+	@echo "Requires: glibc" >> $(ALIMDCSPECFILE)
+	@echo "" >> $(ALIMDCSPECFILE)
+	@echo "Provides: alimdc" >> $(ALIMDCSPECFILE)
+	@echo "" >> $(ALIMDCSPECFILE)
+	@echo "# description of the package" >> $(ALIMDCSPECFILE)
+	@echo "%description" >> $(ALIMDCSPECFILE)
+	@echo "Package contains both ROOT and AliRoot" >> $(ALIMDCSPECFILE)
+	@echo "static libs needed by mStreamRecorder" >> $(ALIMDCSPECFILE)
+	@echo "in order to ROOT-ify the incoming raw" >> $(ALIMDCSPECFILE)
+	@echo "data. The package version correspond to" >> $(ALIMDCSPECFILE)
+	@echo "the AliRoot one." >> $(ALIMDCSPECFILE)
+	@echo "" >> $(ALIMDCSPECFILE)
+	@echo "# list of files to be installed" >> $(ALIMDCSPECFILE)
+	@echo "%files" >> $(ALIMDCSPECFILE)
+	@echo "%defattr (-,root,root)" >> $(ALIMDCSPECFILE)
+	@echo "%{prefix}/lib/libAliMDC.a" >> $(ALIMDCSPECFILE)
+	@echo "%{prefix}/lib/libRoot.a" >> $(ALIMDCSPECFILE)
+	@echo "%{prefix}/lib/libpcre.a" >> $(ALIMDCSPECFILE)
+	@echo "%{prefix}/lib/libfreetype.a" >> $(ALIMDCSPECFILE)
+	@echo "%{prefix}/include/mdc.h" >> $(ALIMDCSPECFILE)
+
+alimdc-static: $(LIBPATH) $(BINPATH) $(RAWDatabaseALIB) $(MDCALIB) $(ESDALIB) $(STEERBaseALIB) $(alimdcCXXO)
+	 $(MUTE)rm -rf $(LIBPATH)/libAliMDC.a
+	 $(MUTE)rm -rf junk
+	 mkdir junk && cd junk && ar x ../$(RAWDatabaseALIB) && ar x ../$(MDCALIB) && ar x ../$(ESDALIB) && ar x ../$(STEERBaseALIB) && ar r ../$(LIBPATH)/libAliMDC.a *.o && cd .. && rm -rf junk
+	 $(LD) $(LDFLAGS) -o $(BINPATH)/alimdca $(alimdcCXXO) \
+	 $(LIBPATH)/libAliMDC.a \
+	 $(ROOTALIBDIR)/libRoot.a \
+	 $(ROOTALIBDIR)/libfreetype.a $(ROOTALIBDIR)/libpcre.a \
+	 -pthread -ldl
+
+alilibs-static: $(LIBPATH) modules $(ALLALIBS)
+
+include  build/MakefileDA
+
+#-------------------------------------------------------------------------------
 # 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
@@ -282,11 +406,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 "********************************************"
 
@@ -297,21 +422,28 @@ 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 := $(filter-out HBTP,$(CHECKMODULES))
-CHECKMODULES := $(filter-out MEVSIM,$(CHECKMODULES))
-CHECKMODULES := $(filter-out EPEMGEN,$(CHECKMODULES))
+CHECKMODULES := $(MODULES)
 CHECKMODULES := $(filter-out TPHIC,$(CHECKMODULES))
+CHECKMODULES := $(filter-out LHAPDF,$(CHECKMODULES))
+CHECKMODULES := $(filter-out MICROCERN,$(CHECKMODULES))
+
+check-all:    $(patsubst %,%/module.mk,$(CHECKMODULES)) $(patsubst %,check-%,$(CHECKMODULES))
+
+smell-all:    $(patsubst %,%/module.mk,$(CHECKMODULES)) $(patsubst %,smell-%,$(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))
+smell-all:    $(patsubst %,%/module.mk,$(CHECKMODULES)) $(patsubst %,smell-%,$(CHECKMODULES))
 
 clean-dicts:
 ifndef ALIQUIET
@@ -321,9 +453,10 @@ endif
 
 clean-modules:
 ifndef ALIQUIET
-	@echo "***** Cleaning up module.mk files *****"
+	@echo "***** Cleaning up module.mk and temporary compilation files *****"
 endif
-	$(MUTE)rm -rf $(patsubst %,%/module.mk,$(MODULES)) 
+	$(MUTE)rm -rf $(patsubst %,%/module.mk,$(MODULES))
+	$(MUTE)rm -rf $(patsubst %,%/tgt_$(ALICE_TARGET),$(MODULES))
 
 clean-depend:
 ifndef ALIQUIET
@@ -349,9 +482,11 @@ 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-smell-all:  $(patsubst %,%/module.mk,$(CHECKMODULES)) $(patsubst %,clean-smell-%,$(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