X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PWG%2FMakefile;h=07d9d97b947bb01718dfecc194a64f76c522a2e5;hb=35363fb9c02cf2c513a161aef2a062fba35a135e;hp=032d286e4b8d5970b7c418de3a70744fff2b80b6;hpb=222034d35c92d124e825cd5a8a666b1b853cc65c;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PWG/Makefile b/PWG/Makefile
index 032d286e4b8..07d9d97b947 100644
--- a/PWG/Makefile
+++ b/PWG/Makefile
@@ -1,6 +1,6 @@
 PACKAGE = invalid-only-for-proof
 
-include $(ROOTSYS)/test/Makefile.arch
+include Makefile.arch
 
 ifndef PACKCXXFLAGS
    PACKCXXFLAGS = $(CXXFLAGS)
@@ -45,11 +45,41 @@ ifneq ($(CORRFW_INCLUDE),)
   ALICEINC += -I../$(CORRFW_INCLUDE)
 endif
 
+ifneq ($(PWGflowBase_INCLUDE),)
+  ALICEINC += -I../$(PWGflowBase_INCLUDE)
+endif
+
+ifneq ($(PWGflowTasks_INCLUDE),)
+  ALICEINC += -I../$(PWGflowTasks_INCLUDE)
+endif
+
+ifneq ($(PHOSUtils_INCLUDE),)
+  ALICEINC += -I../$(PHOSUtils_INCLUDE)
+  CXXFLAGS+=-D__PHOSUTIL__
+endif
+
+ifneq ($(EMCALUtils_INCLUDE),)
+  ALICEINC += -I../$(EMCALUtils_INCLUDE)
+  CXXFLAGS+=-D__EMCALUTIL__
+endif
+
+ifneq ($(PWGCaloTrackCorrBase_INCLUDE),)
+  ALICEINC += -I../$(PWGCaloTrackCorrBase_INCLUDE)
+endif
+
+ifneq ($(PWGEMCAL_INCLUDE),)
+  ALICEINC += -I../$(PWGEMCALTasks_INCLUDE)
+endif
+
 # only if no par file was loaded before
 #ifeq ($(ALICEINC),-I.)
   ifneq ($(ALICE_ROOT),)
     ALICEINC += -I$(ALICE_ROOT)/include
     ALICEINC += -I$(ALICE_ROOT)/ANALYSIS
+    ALICEINC += -I$(ALICE_ROOT)/PWG/FLOW/Base
+    ALICEINC += -I$(ALICE_ROOT)/MUON
+    ALICEINC += -I$(ALICE_ROOT)/EMCAL
+    ALICEINC += -I$(ALICE_ROOT)/PHOS
   endif
 #endif
 
@@ -69,28 +99,7 @@ PARFILE       = $(PACKAGE).par
 lib$(PACKAGE).so: $(OBJS_PWG)
 	@echo "Linking" $@ ...
 	@/bin/rm -f $@
-ifeq ($(PLATFORM),macosx)
-# 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) $^ $(OutPutOpt) $@ $(EXPLLINKLIBS)
-endif
-endif
+	$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(EXPLLINKLIBS)
 	@chmod a+x $@
 	@echo "done"