Bug fix in the order of the Ds cuts (Sadhana, Francesco)

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

diff --git a/PWG0/Makefile b/PWG0/Makefile
index dab6032ce083e3df53703c3958b3c1304d359d39..07e732f908bc2d09313df0b16956a4f3f2f6638f 100644 (file)
--- a/PWG0/Makefile
+++ b/PWG0/Makefile
@@ -1,17 +1,30 @@
 # $Id$
 
-include $(ROOTSYS)/test/Makefile.arch
+include Makefile.arch
 
 default-target: libPWG0base.so libPWG0dep.so libPWG0selectors.so
 
 ALICEINC      = -I.
 
 ### define include dir for local case and par case
-ifneq ($(ALICE_ROOT),)
-  ALICEINC += -I$(ALICE_ROOT)/include -I$(ALICE_ROOT)/PYTHIA6 -I$(ALICE_ROOT)/EVGEN
+ifneq ($(ESD_INCLUDE),)
+   ALICEINC += -I../$(ESD_INCLUDE)
+       ifneq ($(STEERBase_INCLUDE),)
+               ALICEINC += -I../$(STEERBase_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
+else
+  ifneq ($(ALICE_ROOT),)
+    ALICEINC += -I$(ALICE_ROOT)/include -I$(ALICE_ROOT)/PYTHIA6 -I$(ALICE_ROOT)/EVGEN -I$(ALICE_ROOT)/RAW -I$(ALICE_ROOT)/TPC
 else
-  ifneq ($(ESD_INCLUDE),)
-    ALICEINC += -I../$(ESD_INCLUDE)
   endif
 endif
 
@@ -35,7 +48,7 @@ PARFILE       = $(PACKAGE).par
 lib$(PACKAGE).so: $(OBJS_PWG0base)
        @echo "Linking" $@ ...
        @/bin/rm -f $@
-ifeq ($(PLATFORM),macosx)
+ifeq ($(ARCH),macosx)
        @$(LD) -bundle -undefined $(UNDEFOPT) $(LDFLAGS) $^ -o $@
 else
        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ -o $@
@@ -99,7 +112,7 @@ OBJS_PWG0dep := $(SRCS_PWG0dep:.cxx=.o)
 libPWG0dep.so: $(OBJS_PWG0dep)
        @echo "Linking" $@ ...
        @/bin/rm -f $@
-ifeq ($(PLATFORM),macosx)
+ifeq ($(ARCH),macosx)
        @$(LD) -bundle -undefined $(UNDEFOPT) $(LDFLAGS) $^ -o $@
 else
        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ -o $@
@@ -122,7 +135,7 @@ OBJS_PWG0selectors := $(SRCS_PWG0selectors:.cxx=.o)
 libPWG0selectors.so: $(OBJS_PWG0selectors)
        @echo "Linking" $@ ...
        @/bin/rm -f $@
-ifeq ($(PLATFORM),macosx)
+ifeq ($(ARCH),macosx)
        @$(LD) -bundle -undefined $(UNDEFOPT) $(LDFLAGS) $^ -o $@
 else
        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ -o $@