Fix Coverity leaks

[u/mrichter/AliRoot.git] / PWG3 / Makefile

diff --git a/PWG3/Makefile b/PWG3/Makefile
index 5b62a11d6d2d17712a9c0ac5b5223609ef49797d..c2037760aaf3621813e3ae4e388e7d994ae2059b 100644 (file)
--- a/PWG3/Makefile
+++ b/PWG3/Makefile
@@ -1,8 +1,8 @@
 # $Id$
 
-include $(ROOTSYS)/test/Makefile.arch
+PACKAGE = PWG3
 
-default-target: libPWG3base.so 
+include Makefile.arch
 
 ALICEINC      = -I.
 
@@ -12,6 +12,9 @@ ifneq ($(ESD_INCLUDE),)
        ifneq ($(STEERBase_INCLUDE),)
                ALICEINC += -I../$(STEERBase_INCLUDE)
        endif                           
+       ifneq ($(CDB_INCLUDE),)
+               ALICEINC += -I../$(CDB_INCLUDE)
+       endif                           
        ifneq ($(AOD_INCLUDE),)
                ALICEINC += -I../$(AOD_INCLUDE)
        endif
@@ -21,29 +24,35 @@ ifneq ($(ESD_INCLUDE),)
        ifneq ($(ANALYSISalice_INCLUDE),)
                ALICEINC += -I../$(ANALYSISalice_INCLUDE)
        endif
+       ifneq ($(CORRFW_INCLUDE),)
+               ALICEINC += -I../$(CORRFW_INCLUDE)
+       endif
+       ifneq ($(PWG3base_INCLUDE),)
+               ALICEINC += -I../$(PWG3base_INCLUDE)
+       endif
 else
   ifneq ($(ALICE_ROOT),)
-    ALICEINC += -I$(ALICE_ROOT)/include -I$(ALICE_ROOT)/MUON
+    ALICEINC += -I$(ALICE_ROOT)/include -I$(ALICE_ROOT)/PWG3/base -I$(ALICE_ROOT)/MUON -I$(ALICE_ROOT)/MUON/mapping
 else
   endif
 endif
 
+SRCS     = $(wildcard $(subst PWG3,,$(PACKAGE))/*.cxx)
+HDRS     = $(SRCS:.cxx=.h)
+DHDR     = $(PACKAGE)LinkDef.h
 CXXFLAGS     += $(ALICEINC) -g
 
-PACKAGE = PWG3base
-include lib$(PACKAGE).pkg
-
-DHDR_PWG3base := $(DHDR)
-HDRS_PWG3base := $(HDRS)
-SRCS_PWG3base := $(SRCS) G__$(PACKAGE).cxx
-OBJS_PWG3base := $(SRCS_PWG3base:.cxx=.o)
+DHDR_PWG3 := $(DHDR)
+HDRS_PWG3 := $(HDRS)
+SRCS_PWG3 := $(SRCS) G__$(PACKAGE).cxx
+OBJS_PWG3 := $(SRCS_PWG3:.cxx=.o)
 
 PARFILE       = $(PACKAGE).par
 
-lib$(PACKAGE).so: $(OBJS_PWG3base)
+lib$(PACKAGE).so: $(OBJS_PWG3)
        @echo "Linking" $@ ...
        @/bin/rm -f $@
-ifeq ($(PLATFORM),macosx)
+ifeq ($(ARCH),macosx)
        @$(LD) -bundle -undefined $(UNDEFOPT) $(LDFLAGS) $^ -o $@
 else
        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ -o $@
@@ -54,45 +63,9 @@ endif
 %.o:    %.cxx %.h
        $(CXX) $(CXXFLAGS) -c $< -o $@
 
-G__PWG3base.cxx G__PWG3base.h: $(HDRS_PWG3base) $(DHDR_PWG3base)
+G__$(PACKAGE).cxx G__$(PACKAGE).h: $(HDRS) $(DHDR)
        @echo "Generating dictionary ..."
        rootcint -f $@ -c $(ALICEINC) $^
 
 clean:
-       @rm -f $(OBJS_PWG3base)  *.so G__PWG3base.*  $(PARFILE)
-
-### CREATE PAR FILE
-
-$(PARFILE): $(patsubst %,$(PACKAGE)/%,$(filter-out G__%, $(HDRS_PWG3base) $(SRCS_PWG3base) $(DHDR_PWG3base) 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)"
-
+       @rm -f $(OBJS)  *.so G__$(PACKAGE).*  $(PARFILE)