From 84d4333fbd65d56f0333d4f07aacc97072728b47 Mon Sep 17 00:00:00 2001 From: hristov Date: Sun, 16 Jan 2011 19:24:50 +0000 Subject: [PATCH] Partial restoration of the par file functionallity --- ANALYSIS/Makefile | 7 +++++-- CORRFW/Makefile | 7 +++++-- EMCAL/Makefile | 6 ++++-- JETAN/Makefile | 5 ++++- PHOS/Makefile | 5 ++++- PWG0/Makefile | 17 +++++++++++++---- STEER/Makefile | 6 +++++- cmake/ALICE_CMake.cmake | 2 +- 8 files changed, 41 insertions(+), 14 deletions(-) diff --git a/ANALYSIS/Makefile b/ANALYSIS/Makefile index 4355e041482..fbc266af15e 100644 --- a/ANALYSIS/Makefile +++ b/ANALYSIS/Makefile @@ -38,7 +38,10 @@ endif CXXFLAGS += $(ALICEINC) -g CHECKXML := $(shell root-config --has-xml) -include lib$(PACKAGE).pkg + +SRCS := $(wildcard *.cxx) +HDRS := $(SRCS:.cxx=.h) +DHDR := $(PACKAGE)LinkDef.h DHDR_ANALYSIS := $(DHDR) HDRS_ANALYSIS := $(HDRS) @@ -71,7 +74,7 @@ G__$(PACKAGE).cxx G__$(PACKAGE).h: $(HDRS) $(DHDR) ### CREATE PAR FILE -$(PARFILE): $(patsubst %,$(PACKAGE)/%,$(filter-out G__%, $(HDRS_ANALYSIS) $(SRCS_ANALYSIS) $(DHDR_ANALYSIS) Makefile Makefile.arch lib$(PACKAGE).pkg PROOF-INF)) +$(PARFILE): $(patsubst %,$(PACKAGE)/%,$(filter-out G__%, $(HDRS_ANALYSIS) $(SRCS_ANALYSIS) $(DHDR_ANALYSIS) Makefile Makefile.arch PROOF-INF)) @echo "Creating archive" $@ ... @tar cfzh $@ $(PACKAGE) @rm -rf $(PACKAGE) diff --git a/CORRFW/Makefile b/CORRFW/Makefile index 69f036c93be..1fe993a398e 100644 --- a/CORRFW/Makefile +++ b/CORRFW/Makefile @@ -36,7 +36,10 @@ endif CXXFLAGS += $(ALICEINC) -g PACKAGE = CORRFW -include lib$(PACKAGE).pkg + +SRCS := $(wildcard *.cxx) +HDRS := $(SRCS:.cxx=.h) +DHDR := $(PACKAGE)LinkDef.h DHDR_CORRFW := $(DHDR) HDRS_CORRFW := $(HDRS) @@ -69,7 +72,7 @@ G__$(PACKAGE).cxx G__$(PACKAGE).h: $(HDRS) $(DHDR) ### CREATE PAR FILE -$(PARFILE): $(patsubst %,$(PACKAGE)/%,$(filter-out G__%, $(HDRS_CORRFW) $(SRCS_CORRFW) $(DHDR_CORRFW) Makefile Makefile.arch lib$(PACKAGE).pkg PROOF-INF)) +$(PARFILE): $(patsubst %,$(PACKAGE)/%,$(filter-out G__%, $(HDRS_CORRFW) $(SRCS_CORRFW) $(DHDR_CORRFW) Makefile Makefile.arch PROOF-INF)) @echo "Creating archive" $@ ... @tar cfzh $@ $(PACKAGE) @rm -rf $(PACKAGE) diff --git a/EMCAL/Makefile b/EMCAL/Makefile index 73aacdf09d4..12f61cff4e2 100644 --- a/EMCAL/Makefile +++ b/EMCAL/Makefile @@ -57,7 +57,9 @@ CXXFLAGS += $(ALICEINC) -g F77FLAGS += $(ALICEINC) -g -fPIC -include lib$(PACKAGE).pkg +SRCS := $(wildcard *.cxx */*.cxx) +HDRS := $(SRCS:.cxx=.h) +DHDR := $(PACKAGE)LinkDef.h DHDR_EMCAL := $(DHDR) HDRS_EMCAL := $(HDRS) @@ -93,7 +95,7 @@ clean: ### CREATE PAR FILE -$(PARFILE): $(patsubst %,$(PACKAGE)/%,$(filter-out G__%, $(HDRS_EMCAL) $(SRCS_EMCAL) $(DHDR_EMCAL) Makefile Makefile.arch lib$(PACKAGE).pkg PROOF-INF)) +$(PARFILE): $(patsubst %,$(PACKAGE)/%,$(filter-out G__%, $(HDRS_EMCAL) $(SRCS_EMCAL) $(DHDR_EMCAL) Makefile Makefile.arch PROOF-INF)) @echo "Creating archive" $@ ... @tar cfzh $@ $(PACKAGE) @rm -rf $(PACKAGE) diff --git a/JETAN/Makefile b/JETAN/Makefile index af380e14dbf..e471a896a80 100644 --- a/JETAN/Makefile +++ b/JETAN/Makefile @@ -1,7 +1,10 @@ PACKAGE = invalid-only-for-proof include $(ROOTSYS)/test/Makefile.arch -include lib$(PACKAGE).pkg + +SRCS := $(wildcard *.cxx) +HDRS := $(SRCS:.cxx=.h) +DHDR := $(PACKAGE)LinkDef.h ALICEINC = -I. diff --git a/PHOS/Makefile b/PHOS/Makefile index 73c44097834..926a122750c 100644 --- a/PHOS/Makefile +++ b/PHOS/Makefile @@ -1,7 +1,10 @@ PACKAGE = invalid-only-for-proof include $(ROOTSYS)/test/Makefile.arch -include lib$(PACKAGE).pkg + +SRCS := $(wildcard *.cxx) +HDRS := $(SRCS:.cxx=.h) +DHDR := $(PACKAGE)LinkDef.h ifndef PACKCXXFLAGS PACKCXXFLAGS = $(CXXFLAGS) diff --git a/PWG0/Makefile b/PWG0/Makefile index 07e732f908b..de002ee3274 100644 --- a/PWG0/Makefile +++ b/PWG0/Makefile @@ -36,7 +36,10 @@ endif CXXFLAGS += $(ALICEINC) -g PACKAGE = PWG0base -include lib$(PACKAGE).pkg + +SRCS := $(wildcard *.cxx */*.cxx) +HDRS := $(SRCS:.cxx=.h) +DHDR := $(PACKAGE)LinkDef.h DHDR_PWG0base := $(DHDR) HDRS_PWG0base := $(HDRS) @@ -68,7 +71,7 @@ clean: ### CREATE PAR FILE -$(PARFILE): $(patsubst %,$(PACKAGE)/%,$(filter-out G__%, $(HDRS_PWG0base) $(SRCS_PWG0base) $(DHDR_PWG0base) Makefile Makefile.arch lib$(PACKAGE).pkg PROOF-INF)) +$(PARFILE): $(patsubst %,$(PACKAGE)/%,$(filter-out G__%, $(HDRS_PWG0base) $(SRCS_PWG0base) $(DHDR_PWG0base) Makefile Makefile.arch PROOF-INF)) @echo "Creating archive" $@ ... @tar cfzh $@ $(PACKAGE) @rm -rf $(PACKAGE) @@ -102,7 +105,10 @@ test-%.par: %.par @echo "INFO: Testing succeeded (already cleaned up)" ## libPWG0dep part -include libPWG0dep.pkg + +SRCS := $(wildcard *.cxx */*.cxx) +HDRS := $(SRCS:.cxx=.h) +DHDR := $(PACKAGE)LinkDef.h DHDR_PWG0dep := $(DHDR) HDRS_PWG0dep := $(HDRS) @@ -125,7 +131,10 @@ G__PWG0dep.cxx G__PWG0dep.h: $(HDRS_PWG0dep) $(DHDR_PWG0dep) rootcint -f $@ -c $(ALICEINC) $^ ## libPWG0selectors part -include libPWG0selectors.pkg + +SRCS := $(wildcard *.cxx */*.cxx) +HDRS := $(SRCS:.cxx=.h) +DHDR := $(PACKAGE)LinkDef.h DHDR_PWG0selectors := $(DHDR) HDRS_PWG0selectors := $(HDRS) diff --git a/STEER/Makefile b/STEER/Makefile index 2baec91a884..69f27d64f10 100644 --- a/STEER/Makefile +++ b/STEER/Makefile @@ -1,7 +1,11 @@ PACKAGE = invalid-only-for-proof include $(ROOTSYS)/test/Makefile.arch -include lib$(PACKAGE).pkg + +SRCS := $(wildcard *.cxx) +HDRS := $(SRCS:.cxx=.h) +DHDR := $(PACKAGE)LinkDef.h + ifndef PACKCXXFLAGS PACKCXXFLAGS = $(CXXFLAGS) diff --git a/cmake/ALICE_CMake.cmake b/cmake/ALICE_CMake.cmake index 996f60ee204..7739434359f 100644 --- a/cmake/ALICE_CMake.cmake +++ b/cmake/ALICE_CMake.cmake @@ -593,7 +593,7 @@ macro(ALICE_BuildPAR) COMMAND sed -e 's/include .\(ROOTSYS\)\\/test\\/Makefile.arch/include Makefile.arch/\; s/PACKAGE = .*/PACKAGE = ${PACKAGE}/' < Makefile > ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE}/Makefile COMMAND cp -pR ${ROOTSYS}/test/Makefile.arch ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE}/Makefile.arch COMMAND cp -pR PROOF-INF.${PACKAGE} ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE}/PROOF-INF - COMMAND cp -pR lib${PACKAGE}.pkg ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE} +# COMMAND cp -pR lib${PACKAGE}.pkg ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE} COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_BINARY_DIR} tar --exclude=.svn -czhf ${CMAKE_BINARY_DIR}/${PACKAGE}.par ${PACKAGE} COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE} COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --red --bold "${PACKAGE}.par has been created in ${CMAKE_BINARY_DIR}" -- 2.43.5