Fix in the last caall to CleanOwnPrimaryVertex

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

diff --git a/PWG3/Makefile b/PWG3/Makefile
index a2039418c1cdbab39a23ebd9564695373a28b431..774f60cee480b2f74a97c937cd158d1f685be120 100644 (file)
--- a/PWG3/Makefile
+++ b/PWG3/Makefile
@@ -1,8 +1,8 @@
 # $Id$
 
-include Makefile.arch
+PACKAGE = PWG3
 
-default-target: libPWG3base.so 
+include Makefile.arch
 
 ALICEINC      = -I.
 
@@ -12,38 +12,67 @@ 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
        ifneq ($(ANALYSIS_INCLUDE),)
                ALICEINC += -I../$(ANALYSIS_INCLUDE)
        endif
+       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)
-       @$(LD) -bundle -undefined $(UNDEFOPT) $(LDFLAGS) $^ -o $@
+# We need to make both the .dylib and the .so
+               $(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@
+ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
+ifeq ($(MACOSX_MINOR),4)
+               ln -sf $@ $(subst .$(DllSuf),.so,$@)
+else
+               $(LD) -bundle -undefined $(UNDEFOPT) $(LDFLAGS) $^ \
+                  $(OutPutOpt) $(subst .$(DllSuf),.so,$@)
+endif
+endif
+else
+ifeq ($(PLATFORM),win32)
+               bindexplib $* $^ > $*.def
+               lib -nologo -MACHINE:IX86 $^ -def:$*.def \
+                  $(OutPutOpt)$(EVENTLIB)
+               $(LD) $(SOFLAGS) $(LDFLAGS) $^ $*.exp $(LIBS) \
+                  $(OutPutOpt)$@
 else
-       @$(LD) $(SOFLAGS) $(LDFLAGS) $^ -o $@
+               $(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(EXPLLINKLIBS)
+endif
 endif
        @chmod a+x $@
        @echo "done"
@@ -51,45 +80,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)