From: rdm Date: Thu, 3 Jun 2004 23:40:47 +0000 (+0000) Subject: set PLATFORM to the operating system (linux, macosx, alpha, ...) and X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=b934f19438b30bf24a709d2acb6fc5218ccd4e74;hp=dd98d073f9f272a5fb23b1325266290ad38aa60a;p=u%2Fmrichter%2FAliRoot.git set PLATFORM to the operating system (linux, macosx, alpha, ...) and ALICE_TAGET to the compiler, so the same platforms (OS's) can have different, incompatible, compilers (linux g++, linux icc, etc). The PLATFORM is set in the Makefile.$(ALICE_TARGET) files. --- diff --git a/Makefile b/Makefile index 2dd93a8b3aa..ad3ac272623 100644 --- a/Makefile +++ b/Makefile @@ -5,12 +5,8 @@ ##### include general path/location macros ##### -ifeq ($(PLATFORM),) -PLATFORM = $(shell root-config --arch) -endif -ALICE_TARGET = $(PLATFORM) - -override ALICE_ROOT=$(shell pwd) +override ALICE_TARGET := $(shell root-config --arch) +override ALICE_ROOT := $(shell pwd) ifdef ALIVERBOSE MUTE:= @@ -28,9 +24,9 @@ REV_ENG=$(IRST_INSTALLDIR)/scripts/revEng.sh include build/Makefile.config -################################################################## -# -# Where to install libraries and binaries +################################################################## +# +# Where to install libraries and binaries # and common header files LIBPATH = lib/tgt_$(ALICE_TARGET) @@ -39,68 +35,68 @@ EXPORTDIR = $(ALICE_ROOT)/include ################################################################## ################################################################## -# include machine dependent macros +# include machine dependent macros -include build/Makefile.$(ALICE_TARGET) ################################################################## ################################################################## -# +# # Check if called with debug ifeq ($(ALIDEBUG),YES) -override ALICE_TARGET:=$(ALICE_TARGET)DEBUG -FFLAGS := -g $(filter-out -O%,$(FFLAGS)) +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)) +CFLAGS := -g $(filter-out -O%,$(CLAGS)) +SOFLAGS := -g $(filter-out -O%,$(SOFLAGS)) +LDFLAGS := -g $(filter-out -O%,$(LDFLAGS)) endif ################################################################## ################################################################## -# +# # 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 DATE is installed ifdef DATE_ROOT -DATEFLAGS = -DALI_DATE -D${DATE_SYS} -DDATE_SYS=${DATE_SYS} -Dlong32=${DATE_LONG32} -Dlong64=${DATE_LONG64} -DdatePointer=${DATE_POINTER} -CXXFLAGS += $(DATEFLAGS) -CFLAGS += $(DATEFLAGS) +DATEFLAGS = -DALI_DATE -D${DATE_SYS} -DDATE_SYS=${DATE_SYS} -Dlong32=${DATE_LONG32} -Dlong64=${DATE_LONG64} -DdatePointer=${DATE_POINTER} +CXXFLAGS += $(DATEFLAGS) +CFLAGS += $(DATEFLAGS) CINTFLAGS += $(DATEFLAGS) -DEPINC += $(DATEFLAGS) +DEPINC += $(DATEFLAGS) endif ################################################################## ################################################################## # -# Modules to build +# Modules to build # Uncomment to show some output #$(warning MAKECMDGOALS=$(MAKECMDGOALS)) -ALIROOTMODULES:= STEER PHOS TRD TPC ZDC MUON PMD FMD TOF ITS \ +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 -CERNMODULES:= PDF PYTHIA6 HIJING MICROCERN HERWIG +CERNMODULES := PDF PYTHIA6 HIJING MICROCERN HERWIG -MODULES:=$(ALIROOTMODULES) $(CERNMODULES) +MODULES := $(ALIROOTMODULES) $(CERNMODULES) ifeq ($(findstring TFluka,$(MAKECMDGOALS)),TFluka) MODULES += TFluka @@ -112,14 +108,14 @@ endif ################################################################## -MODULES += ALIROOT +MODULES += ALIROOT MODDIRS := $(MODULES) ############################################################# -# -# Default include dirs for -# C++, Fortran, Cint, and dependencies +# +# Default include dirs for +# C++, Fortran, Cint, and dependencies # The module directory will be added by each module # @@ -153,8 +149,8 @@ default: alilibs aliroot ALLLIBS := ALLEXECS := INCLUDEFILES := -BINLIBS := -EXPORTFILES := +BINLIBS := +EXPORTFILES := ############################################################# BINLIBDIRS := -L$(ALICE_ROOT)/$(LIBPATH) @@ -165,7 +161,7 @@ BINLIBDIRS := -L$(ALICE_ROOT)/$(LIBPATH) include build/module.dep ############################################################# -# +# # Check if module.mk is present for the library %.mk: build/module.tpl ifndef ALIQUIET @@ -176,7 +172,7 @@ endif # ************************************************************************** # -# If cleaning, do not include +# If cleaning, do not include # dependencies or module.mk files. ifeq ($(findstring $(MAKECMDGOALS), clean distclean clean-all clean-dicts clean-modules clean-depend clean-objects clean-libs clean-bins),) @@ -187,9 +183,9 @@ ifeq ($(findstring $(MAKECMDGOALS), clean distclean clean-all clean-dicts clean- ifneq ($(findstring modules,$(MAKECMDGOALS)),modules) ############################################################# -# +# # Include the modules --include $(patsubst %,%/module.mk,$(MODULES)) +-include $(patsubst %,%/module.mk,$(MODULES)) # # @@ -224,7 +220,7 @@ include build/dummy.d .PHONY: alilibs aliroot makedistr clean distclean clean-all \ htmldoc profile -modules: $(patsubst %,%/module.mk,$(MODULES)) +modules: $(patsubst %,%/module.mk,$(MODULES)) aliroot: $(BINPATH) $(ALLEXECS) alilibs bin @@ -236,30 +232,32 @@ alilibs: $(LIBPATH) $(ALLLIBS) lib modules endif # 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)) + profile: ifndef ALIQUIET @echo "***** Entering PROFILE mode. *****" endif @(export ALIPROFILE=YES && $(MAKE)) -lib: + +lib: @mkdir lib @mkdir lib/tgt_$(ALICE_TARGET) -bin: +bin: @mkdir bin @mkdir bin/tgt_$(ALICE_TARGET) @@ -292,7 +290,7 @@ clean: @echo " clean-MODULENAME : Clean everything from module MODULENAME" @echo " clean-all : Cleans up everything, including cern libraires" @echo " distclean : Like clean-all + clean all tgt_*'s" - @echo " clean-modules : Clean all module.mk file in all modules" + @echo " clean-modules : Clean all module.mk files in all modules" @echo " clean-libs : Clean all libraries (not object files)" @echo "********************************************" @@ -318,11 +316,11 @@ 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 @@ -334,7 +332,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 @@ -360,9 +358,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 diff --git a/PDF/libpdf.pkg b/PDF/libpdf.pkg index e19e41ba685..fe5a7809652 100644 --- a/PDF/libpdf.pkg +++ b/PDF/libpdf.pkg @@ -393,7 +393,7 @@ npdf/structa.F PACKFFLAGS := $(FFLAGS) -IPDF/pdf -ifeq ($(PLATFORM),linux) +ifeq ($(ALICE_TARGET),linux) GCC_VERSION := $(shell $(CXX) -v 2>&1 | \ grep version | cut -d' ' -f3) ifeq ($(GCC_VERSION),2.96) diff --git a/PYTHIA6/libpythia6.pkg b/PYTHIA6/libpythia6.pkg index 00658f3307e..07c5bbb649e 100644 --- a/PYTHIA6/libpythia6.pkg +++ b/PYTHIA6/libpythia6.pkg @@ -16,7 +16,7 @@ pdf_alice.F\ tpythia6_called_from_cc.F\ openDecayTable.F -ifeq ($(PLATFORM),linux) +ifeq ($(ALICE_TARGET),linux) GCC_VERSION := $(shell $(CXX) -v 2>&1 | \ grep version | cut -d' ' -f3) ifeq ($(GCC_VERSION),2.96) diff --git a/TPHIC/libTPHIC.pkg b/TPHIC/libTPHIC.pkg index 8b7e5831012..619ee0ec7f7 100644 --- a/TPHIC/libTPHIC.pkg +++ b/TPHIC/libTPHIC.pkg @@ -6,7 +6,7 @@ HDRS= TPHICgen.h AliGenTPHIC.h DHDR:=TPHICLinkDef.h -ifeq ($(PLATFORM),linux) +ifeq ($(ALICE_TARGET),linux) FFLAGS += -fno-automatic endif #PACKFFLAGS := $(filter-out -O%,$(FFLAGS)) diff --git a/build/Makefile.alphacxx6 b/build/Makefile.alphacxx6 index d7034a8f23b..60edd7e34cc 100644 --- a/build/Makefile.alphacxx6 +++ b/build/Makefile.alphacxx6 @@ -1,4 +1,6 @@ -# Makefile to build ALIROOT for OSF1 +# Makefile to build AliRoot for Alpha OSF1 + +PLATFORM = alpha # The compilers CXX = cxx diff --git a/build/Makefile.hpuxacc b/build/Makefile.hpuxacc index 809c5d2514b..f467b367ae1 100644 --- a/build/Makefile.hpuxacc +++ b/build/Makefile.hpuxacc @@ -1,3 +1,7 @@ +# Makefile to build AliRoot on HP-UX + +PLATFORM = hpux + # The compilers CXX = aCC F77 = f77 diff --git a/build/Makefile.linux b/build/Makefile.linux index ca55a0d6b05..dced5509d92 100644 --- a/build/Makefile.linux +++ b/build/Makefile.linux @@ -1,3 +1,7 @@ +# Makefile to build AliRoot for Linux + +PLATFORM = linux + # The compilers CXX = g++ F77 = g77 diff --git a/build/Makefile.linuxia64ecc b/build/Makefile.linuxia64ecc index 104092313de..07beda5913a 100644 --- a/build/Makefile.linuxia64ecc +++ b/build/Makefile.linuxia64ecc @@ -1,3 +1,7 @@ +# Makefile for AliRoot for Itanium/Linux with Intel icc compiler + +PLATFORM = linux + # The compilers CXX = ecc F77 = efc diff --git a/build/Makefile.linuxia64gcc b/build/Makefile.linuxia64gcc index 891d1882628..e1fca3f2016 100644 --- a/build/Makefile.linuxia64gcc +++ b/build/Makefile.linuxia64gcc @@ -1,3 +1,7 @@ +# Makefile for AliRoot for Itanium/Linux with gcc + +PLATFORM = linux + # The compilers CXX = g++ F77 = g77 diff --git a/build/Makefile.linuxicc b/build/Makefile.linuxicc index a10ed4a254e..7db7211efc0 100644 --- a/build/Makefile.linuxicc +++ b/build/Makefile.linuxicc @@ -1,3 +1,7 @@ +# Makefile for AliRoot for Linux with the Intel icc compiler + +PLATFORM = linux + # The C/C++ compilers CXX = icc CC = icc diff --git a/build/Makefile.macosx b/build/Makefile.macosx index 043a42f7ef9..671a1af2c3e 100644 --- a/build/Makefile.macosx +++ b/build/Makefile.macosx @@ -1,3 +1,7 @@ +# Makefile for AliRoot for MacOS X with gcc + +PLATFORM = macosx + # The compilers CXX = g++ F77 = g77 diff --git a/build/Makefile.macosxxlc b/build/Makefile.macosxxlc index 607ad27c05b..5ae368b2d5a 100644 --- a/build/Makefile.macosxxlc +++ b/build/Makefile.macosxxlc @@ -1,3 +1,7 @@ +# Makefile for AliRoot for MacOS X using the IBM xlc compiler + +PLATFORM = macosx + # The compilers CXX = xlC F77 = xlf diff --git a/build/module.tpl b/build/module.tpl index 506506f1f40..a4897a5cea4 100644 --- a/build/module.tpl +++ b/build/module.tpl @@ -34,7 +34,7 @@ endif endif ifndef PACKDCXXFLAGS -ifeq ($(PLATFORM),linuxicc) +ifeq ($(ALICE_TARGET),linuxicc) @PACKAGE@DCXXFLAGS:=$(filter-out -O%,$(CXXFLAGS)) -O0 else @PACKAGE@DCXXFLAGS:=$(filter-out -O%,$(CXXFLAGS))