From deb133c534bdb6a3ddaf1f468fd0f094dbbf0435 Mon Sep 17 00:00:00 2001 From: panos Date: Mon, 4 Dec 2006 08:38:03 +0000 Subject: [PATCH] Modifications in the Makefile - Different par files for each PWG2 dir --- PWG2/Makefile | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/PWG2/Makefile b/PWG2/Makefile index a1ee06554e3..8c301b6f100 100644 --- a/PWG2/Makefile +++ b/PWG2/Makefile @@ -1,36 +1,39 @@ # $Id$ -PACKAGE = PWG2 - include $(ROOTSYS)/test/Makefile.arch -include lib$(PACKAGE).pkg -ALICEINC = -I. +default-target: libPWG2ebye.so + +ALICEINC = -I. ### define include dir for local case and par case ifneq ($(ALICE_ROOT),) - ALICEINC += -I$(ALICE_ROOT)/include + ALICEINC += -I$(ALICE_ROOT)/include -I$(ALICE_ROOT)/PYTHIA6 -I$(ALICE_ROOT)/EVGEN else - ifneq ($(STEER_INCLUDE),) - ALICEINC += -I../$(STEER_INCLUDE) - endif ifneq ($(ESD_INCLUDE),) ALICEINC += -I../$(ESD_INCLUDE) endif endif -CXXFLAGS += $(ALICEINC) -SRCS += dict.cxx -OBJS = $(SRCS:.cxx=.o) +CXXFLAGS += $(ALICEINC) -g + +PACKAGE = PWG2ebye +include lib$(PACKAGE).pkg + +DHDR_PWG2ebye := $(DHDR) +HDRS_PWG2ebye := $(HDRS) +SRCS_PWG2ebye := $(SRCS) G__$(PACKAGE).cxx +OBJS_PWG2ebye := $(SRCS_PWG2ebye:.cxx=.o) + PARFILE = $(PACKAGE).par -lib$(PACKAGE).so: $(OBJS) +lib$(PACKAGE).so: $(OBJS_PWG2ebye) @echo "Linking" $@ ... @/bin/rm -f $@ ifeq ($(PLATFORM),macosx) @$(LD) -bundle -undefined $(UNDEFOPT) $(LDFLAGS) $^ -o $@ else - @$(LD) $(SOFLAGS) $(LDFLAGS) $(OBJS) -o $@ + @$(LD) $(SOFLAGS) $(LDFLAGS) $^ -o $@ endif @chmod a+x $@ @echo "done" @@ -38,17 +41,16 @@ endif %.o: %.cxx %.h $(CXX) $(CXXFLAGS) -c $< -o $@ -clean: - @rm -f $(OBJS) core *~ *.so dict.* $(PARFILE) - -dict.cxx dict.h: $(HDRS) $(DHDR) +G__PWG2ebye.cxx G__PWG2ebye.h: $(HDRS_PWG2ebye) $(DHDR_PWG2ebye) @echo "Generating dictionary ..." - @[ -f dict ] || rm -f $@ rootcint -f $@ -c $(ALICEINC) $^ +clean: + @rm -f $(OBJS_PWG2ebye) *.so G__PWG2ebye.* $(PARFILE) + ### CREATE PAR FILE -$(PARFILE): $(patsubst %,$(PACKAGE)/%,$(filter-out dict.%, $(HDRS) $(SRCS) $(DHDR) $(PKGFILE) Makefile Makefile.arch lib$(PACKAGE).pkg PROOF-INF)) +$(PARFILE): $(patsubst %,$(PACKAGE)/%,$(filter-out G__%, $(HDRS_PWG2ebye) $(SRCS_PWG2ebye) $(DHDR_PWG2ebye) Makefile Makefile.arch lib$(PACKAGE).pkg PROOF-INF)) @echo "Creating archive" $@ ... @tar cfzh $@ $(PACKAGE) @rm -rf $(PACKAGE) @@ -62,17 +64,17 @@ $(PACKAGE)/Makefile: Makefile #.$(PACKAGE) $(PACKAGE)/Makefile.arch: $(ROOTSYS)/test/Makefile.arch @echo Copying $< to $@ @[ -d $(dir $@) ] || mkdir -p $(dir $@) - @cp $^ $@ + @cp -a $^ $@ $(PACKAGE)/PROOF-INF: PROOF-INF.$(PACKAGE) @echo Copying $< to $@ @[ -d $(dir $@) ] || mkdir -p $(dir $@) - @cp -r $^ $@ + @cp -a -r $^ $@ $(PACKAGE)/%: % @echo Copying $< to $@ @[ -d $(dir $@) ] || mkdir -p $(dir $@) - @cp $< $@ + @cp -a $< $@ test-%.par: %.par @echo "INFO: The file $< is now tested, in case of an error check in par-tmp." @@ -80,3 +82,4 @@ test-%.par: %.par @cd par-tmp; tar xfz ../$<; cd $(subst .par,,$<); PROOF-INF/BUILD.sh @rm -rf par-tmp @echo "INFO: Testing succeeded (already cleaned up)" + -- 2.43.5