Update from release

diff --git a/ANALYSIS/Makefile b/ANALYSIS/Makefile
index b4479f1b2e4639922d8b44b6ff57ae48d0ac2d7e..078924e37a7a9dd2fb603e8ef7bace92ec44c3dd 100644 (file)
--- a/ANALYSIS/Makefile
+++ b/ANALYSIS/Makefile
@@ -1,12 +1,38 @@
-PACKAGE = ANALYSIS_NEW
 
-include Makefile.arch
+include $(ROOTSYS)/test/Makefile.arch
+
+default-target: libANALYSIS_NEW.so
+
+ALICEINC      = -I.
+
+### define include dir for local case and par case
+ifneq ($(ESD_INCLUDE),)
+   ALICEINC += -I../$(ESD_INCLUDE)
+else
+  ifneq ($(ALICE_ROOT),)
+    ALICEINC += -I$(ALICE_ROOT)/include 
+  endif
+endif
+
+# for building of ANALYSIS_NEW.par
+ifneq ($(ANALYSIS_NEW_INCLUDE),)
+  ALICEINC += -I../$(ANALYSIS_NEW_INCLUDE)
+endif
+
+CXXFLAGS     += $(ALICEINC) -g
+
+PACKAGE = ANALYSIS_NEW
 include lib$(PACKAGE).pkg
 
-SRCS         += G__$(PACKAGE).cxx
-OBJS          = $(SRCS:.cxx=.o)
+DHDR_ANALYSIS_NEW := $(DHDR)
+HDRS_ANALYSIS_NEW := $(HDRS)
+SRCS_ANALYSIS_NEW := $(SRCS) G__$(PACKAGE).cxx
+OBJS_ANALYSIS_NEW := $(SRCS_ANALYSIS_NEW:.cxx=.o)
+
+PARFILE       = $(PACKAGE).par
+
 
-lib$(PACKAGE).so: $(OBJS)
+lib$(PACKAGE).so: $(OBJS_ANALYSIS_NEW)
        @echo "Linking" $@ ...
        @/bin/rm -f $@
 ifeq ($(PLATFORM),macosx)
@@ -21,9 +47,43 @@ endif
        $(CXX) $(CXXFLAGS) -c $< -o $@
 
 clean:
-       @rm -f $(OBJS) *.so G__$(PACKAGE).*
+       @rm -f $(OBJS_ANALYSIS_NEW) *.so G__$(PACKAGE).* $(PARFILE)
 
 G__$(PACKAGE).cxx G__$(PACKAGE).h: $(HDRS) $(DHDR)
        @echo "Generating dictionary ..."
        rootcint -f $@ -c $(ALICEINC) $^
 
+### CREATE PAR FILE
+
+$(PARFILE): $(patsubst %,$(PACKAGE)/%,$(filter-out G__%, $(HDRS_ANALYSIS_NEW) $(SRCS_ANALYSIS_NEW) $(DHDR_ANALYSIS_NEW) Makefile Makefile.arch lib$(PACKAGE).pkg PROOF-INF))
+       @echo "Creating archive" $@ ...
+       @tar cfzh $@ $(PACKAGE)
+       @rm -rf $(PACKAGE)
+       @echo "done"
+
+$(PACKAGE)/Makefile: Makefile #.$(PACKAGE)
+       @echo Copying $< to $@ with transformations
+       @[ -d $(dir $@) ] || mkdir -p $(dir $@)
+       @sed 's/include \$$(ROOTSYS)\/test\/Makefile.arch/include Makefile.arch/' < $^ > $@
+
+$(PACKAGE)/Makefile.arch: $(ROOTSYS)/test/Makefile.arch
+       @echo Copying $< to $@
+       @[ -d $(dir $@) ] || mkdir -p $(dir $@)
+       @cp -a $^ $@
+
+$(PACKAGE)/PROOF-INF: PROOF-INF.$(PACKAGE)
+       @echo Copying $< to $@
+       @[ -d $(dir $@) ] || mkdir -p $(dir $@)
+       @cp -a -r $^ $@
+
+$(PACKAGE)/%: %
+       @echo Copying $< to $@
+       @[ -d $(dir $@) ] || mkdir -p $(dir $@)
+       @cp -a $< $@
+
+test-%.par: %.par
+       @echo "INFO: The file $< is now tested, in case of an error check in par-tmp."
+       @mkdir -p par-tmp
+       @cd par-tmp; tar xfz ../$<;     cd $(subst .par,,$<); PROOF-INF/BUILD.sh
+       @rm -rf par-tmp
+       @echo "INFO: Testing succeeded (already cleaned up)"