X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=Makefile.flat;h=4d1da9f38456869fd61f156a4c66d0ad58abc980;hp=e014592df526aa3afb98a5df4de64a648f3a3430;hb=c52cf5d8e51982f36f3a56ab0cc273ba2519c197;hpb=efaab2ef8e895bb578be7bc9e91aaf971f1be438

diff --git a/Makefile.flat b/Makefile.flat
index e014592df52..4d1da9f3845 100644
--- a/Makefile.flat
+++ b/Makefile.flat
@@ -7,103 +7,182 @@
 ##### include general path/location macros #####
 override ALICE_ROOT=$(shell pwd)
 
+ifdef ALIVERBOSE
+MUTE:=
+else
+MUTE:=@
+endif
+
 include build/Makefile.config
+################################################################## 
+# 
+#            Where to install libraries and binaries 
+#                 and common header files
 
-# Where to install libraries and binaries
 LIBPATH=lib/tgt_$(ALICE_TARGET)
 BINPATH=bin/tgt_$(ALICE_TARGET)
+EXPORTDIR = $(ALICE_ROOT)/include
+##################################################################
 
-##### include machine dependent macros #####
+##################################################################
+# include machine dependent macros 
 
-#include $(filter-out DEBUG,build/Makefile.$(ALICE_TARGET))
-include build/Makefile.$(ALICE_TARGET)
+-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))
 endif
+##################################################################
 
+##################################################################
+#
+#                   Modules to build 
 
-##### Modules to build #####
+# COMMENTED OUT FOR TEST PURPOSES
 
-#needs to add:  VZERO TGeant4 AliGeant4 GEODB Euclid  
-#
+ALIROOTMODULES:= STEER \
+	 TGeant3 PHOS TRD TPC ZDC MUON PMD FMD TOF ITS \
+         CASTOR RICH START STRUCT EVGEN RALICE ALIFAST \
+	 THijing CONTAINERS MEVSIM TMEVSIM THbtp HBTP EMCAL HBTAN \
+
+
+GEANT4MODULES:=	TGeant4 AliGeant4
+ifeq ($(MAKECMDGOALS),geant4)
+ALIROOTMODULES += $(GEANT4MODULES)
+endif
+
+CERNMODULES:= PDF PYTHIA PYTHIA6 GEANT321 MINICERN HIJING
 
-MODULES:=STEER TPC PMD CONTAINERS ZDC STRUCT RALICE EMCAL \
-	ALIFAST CASTOR FMD START TGeant3 EVGEN THijing TMEVSIM \
-	 MEVSIM PDF PYTHIA PYTHIA6  TRD GEANT321 MINICERN TOF \
-	ITS RICH PHOS MUON HIJING LHC HBTP THbtp
+MODULES:=$(ALIROOTMODULES) $(CERNMODULES)
+
+##################################################################
 
 MODULES += ALIROOT 
 
 MODDIRS := MODULES
-		 
-# look for include files in each of the moduled
-CXXFLAGS += $(patsubst %,-I%,$(ALICE_ROOT))
-CXXFLAGS += $(patsubst %,-I$(ALICE_ROOT)/%,$(MODULES))
-CXXFLAGS += $(patsubst %,-I%,$(ROOTSYS)/include)
 
-FFLAGS += $(patsubst %,-I%,$(ALICE_ROOT))
-FFLAGS += $(patsubst %,-I$(ALICE_ROOT)/%,$(MODULES))
-FFLAGS += $(patsubst %,-I%,$(ROOTSYS)/include)
+#############################################################
+# 
+#               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)
 
-CINTFLAGS += $(patsubst %,-I%,$(ALICE_ROOT))
-CINTFLAGS += $(patsubst %,-I$(ALICE_ROOT)/%,$(MODULES))
+CINTFLAGS += -I$(ALICE_ROOT)/include
 CINTFLAGS += $(patsubst %,-I%,$(ROOTSYS)/include)
 
-DEPINC += $(patsubst %,-I%,$(ALICE_ROOT))
-DEPINC += $(patsubst %,-I$(ALICE_ROOT)/%,$(MODULES))
+DEPINC  += -I$(ALICE_ROOT)/include
 DEPINC += $(patsubst %,-I%,$(ROOTSYS)/include)
+#############################################################
 
 
+#############################################################
+#
+#             Libraries to link binaries against
+#            Libraries will be linked againstSHLIB
 LIBS := $(ROOTLIBS) $(SYSLIBS) $(GLIBS)
+#############################################################
 
 
 # default target
 default:     alilibs  aliroot
 
-# each module must add to this
-ALLLIBS :=
-ALLEXECS :=
-INCLUDEFILES :=
-BINLIBS := 
 
+#############################################################
+#
+#            Each module will add to this
 
-BINLIBDIRS := -L$(ALICE_ROOT)/$(LIBPATH)
+ALLLIBS      :=
+ALLEXECS     :=
+INCLUDEFILES :=
+BINLIBS      := 
+EXPORTFILES  := 
+#############################################################
+
+BINLIBDIRS   := -L$(ALICE_ROOT)/$(LIBPATH)
 
-.PHONY:		alilibs aliroot makedistr 
 
 #Dependencies of module.mk files
 
 include build/module.dep
 
-# Check if module.mk is present for the library
-%.mk:
+#############################################################
+# 
+#        Check if module.mk is present for the library
+%.mk: build/module.tpl
+ifndef ALIQUIET
 	@echo "***** Creating $@ file *****";
-	share/alibtool mkmodule  $(patsubst %/module.mk,%,$@) > $@;
+endif
+	@share/alibtool mkmodule  $(patsubst %/module.mk,%,$@) > $@;
+#############################################################
 
-# If cleaning, do not include dependencies or module.mk files.
-ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
+# **************************************************************************
+#
+#               If cleaning, do not include 
+#             dependencies or module.mk files.
+
+ifeq ($(findstring $(MAKECMDGOALS), clean clean-all clean-dicts clean-modules clean-depend clean-objects clean-libs clean-bins),)
+
+#            If making modules, not not include
+#                       anything
+
+ifneq ($(findstring modules,$(MAKECMDGOALS)),modules)
 
-# description of each module
-include $(patsubst %,%/module.mk,$(MODULES))
+#############################################################
+# 
+#                Include the modules
+-include $(patsubst %,%/module.mk,$(MODULES))
+#############################################################
 
-# include dependencies if not making them!
-ifneq ($(MAKECMDGOALS),depend)
+#############################################################
+#
+#          include dependencies if not making them!
+ifneq ($(MAKECMDGOALS),depend )
+#           Don't include if cleaning of any sort
+ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
 include $(INCLUDEFILES)
 endif
+endif
+#############################################################
 
 endif
+endif
+# **************************************************************************
+
+#############################################################
+#
+#              include dummy dependency file
+#               *MUST* be last includefile
+include build/dummy.d
+#############################################################
+
 
 # targets
 
-aliroot: $(BINPATH) $(ALLEXECS) bin
+.PHONY:		alilibs aliroot geant4 makedistr clean
+
+modules: $(patsubst %,%/module.mk,$(MODULES)) 	
+
+geant4modules: $(patsubst %,%/module.mk,$(GEANT4MODULES)) 
+
+aliroot: $(BINPATH) $(ALLEXECS) alilibs bin
 
+geant4: aliroot
 
-alilibs: $(LIBPATH) $(ALLLIBS) lib
+alilibs: $(LIBPATH) $(ALLLIBS) lib modules
 
 # Single Makefile "distribution": Makefile + modules + mkdepend scripts
 makedistr: $(MODULES)	 
@@ -112,10 +191,12 @@ makedistr: $(MODULES)
 
 all: aliroot
 
-depend: $(INCLUDEFILES)
+depend: $(INCLUDEFILES) 
 
 debug:
+ifndef ALIQUIET
 	@echo "***** Entering DEBUG mode. *****"
+endif
 	@(export ALIDEBUG=YES && $(MAKE) -f Makefile.flat )
 lib: 
 	@mkdir lib
@@ -126,56 +207,80 @@ bin:
 	@mkdir bin/tgt_$(ALICE_TARGET)
 
 $(MODULES):
+ifndef ALIQUIET
 	@echo "***** Making $@ *****"
-	mkdir -p $@
+endif
+	@mkdir -p $@
 
 $(BINPATH):
+ifndef ALIQUIET
 	@echo "***** Making $@ *****"
-	mkdir -p $@
+endif
+	@mkdir -p $@
 
 $(LIBPATH):
+ifndef ALIQUIET
 	@echo "***** Making $@ *****"
-	mkdir -p $@
+endif
+	@mkdir -p $@
+
+build/dummy.d: $(EXPORTFILES)
+	@(if [ ! -f $@ ] ; then \
+	   touch $@; \
+	fi)
+
+clean:
+	@echo "***** No targen 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 "	clean-libs        : Clean all libraries (not object files)"
+	@echo "********************************************"
+
+clean-all: clean-modules clean-libs clean-bins
+ifndef ALIQUIET
+	@echo "***** Cleaning up everything ****"
+endif
+	$(MUTE)rm -rf $(patsubst %,%/tgt_$(ALICE_TARGET),$(MODULES))
+	$(MUTE)rm -rf $(EXPORTDIR)
 
+#This cleans only libraries that are not CERN-libraries
 
-cleanall:
-	@echo "***** Cleaning up everything ****"
-	rm -rf $(patsubst %,%/module.mk,$(MODULES)) 
-	rm -rf $(patsubst %,%/tgt_$(ALICE_TARGET),$(MODULES))
-	rm -rf lib/tgt_$(ALICE_TARGET)
-	rm -rf bin/tgt_$(ALICE_TARGET)
+clean-aliroot:   $(patsubst %,%/module.mk,$(ALIROOTMODULES)) $(patsubst %,clean-%,$(ALIROOTMODULES))
 
-clean: clean-modules clean-depend clean-objects clean-libs clean-bins
+clean-dicts:
+ifndef ALIQUIET
+	@echo "***** Cleaning up G__ files *****"
+endif
+	$(MUTE)rm -rf */tgt_$(ALICE_TARGET)/G__*
 
 clean-modules:
+ifndef ALIQUIET
 	@echo "***** Cleaning up module.mk files *****"
-	rm -rf $(patsubst %,%/module.mk,$(MODULES)) 
+endif
+	$(MUTE)rm -rf $(patsubst %,%/module.mk,$(MODULES)) 
 
 clean-depend:
+ifndef ALIQUIET
 	@echo "***** Cleaning up dependencies *****"
-	rm -rf */tgt_$(ALICE_TARGET)/*.d
-	rm -rf */tgt_$(ALICE_TARGET)/*/*.d
-	rm -rf */tgt_$(ALICE_TARGET)/*/*/*.d
-	rm -rf */tgt_$(ALICE_TARGET)/*/*/*/*.d
+endif
+	$(MUTE)echo rm `find . -name "*.d"`
 
 clean-objects:
+ifndef ALIQUIET
 	@echo "***** Cleaning up .o files *****"
-	rm -rf */tgt_$(ALICE_TARGET)/*.o
-	rm -rf */tgt_$(ALICE_TARGET)/*/*.o
-	rm -rf */tgt_$(ALICE_TARGET)/*/*/*.o
-	rm -rf */tgt_$(ALICE_TARGET)/*/*/*/*.o
+endif
+	$(MUTE)echo rm `find . -name "*.o"`
 
 clean-libs:
+ifndef ALIQUIET
 	@echo "***** Cleaning up library files *****"
-	rm -rf lib/tgt_$(ALICE_TARGET)/*
+endif
+	$(MUTE)rm -rf lib/tgt_$(ALICE_TARGET)/*
 
 clean-bins:
+ifndef ALIQUIET
 	@echo "***** Cleaning up binary files *****"
-	rm -rf bin/tgt_$(ALICE_TARGET)
-
-
-
-
-
-
-
+endif
+	$(MUTE)rm -rf bin/tgt_$(ALICE_TARGET)