X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PWG2%2FMakefile;h=e54a51dfe7438abfb40b1695d9f2fe3e2d8e1aab;hb=9b0cb3c31a546ef910fd5387cb313d8149d21fdc;hp=5e59a3d522ef4fc35dd2e094013b8e9058ce834c;hpb=4c166e18c7821f12d8e3b744a13060cce7e5f20d;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PWG2/Makefile b/PWG2/Makefile
index 5e59a3d522e..e54a51dfe74 100644
--- a/PWG2/Makefile
+++ b/PWG2/Makefile
@@ -2,16 +2,69 @@
 
 include $(ROOTSYS)/test/Makefile.arch
 
-default-target: libPWG2.so libPWG2ebye.so libPWG2flow.so libPWG2femtoscopy.so 
+PACKAGE = PWG2
+
+default-target: lib$(PACKAGE).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 -I$(ALICE_ROOT)/RAW -I$(ALICE_ROOT)/TPC
-else
-  ifneq ($(ESD_INCLUDE),)
-    ALICEINC += -I../$(ESD_INCLUDE)
+ifneq ($(ESD_INCLUDE),)
+   ALICEINC += -I../$(ESD_INCLUDE)
+   ALICEINC += -I../$(AOD_INCLUDE)
+   ALICEINC += -I../$(STEERBase_INCLUDE)
+   ALICEINC += -I../$(ANALYSIS_INCLUDE)
+   ALICEINC += -I../$(ANALYSISalice_INCLUDE)
+ else
+    ifneq ($(ALICE_ROOT),)
+       ALICEINC += -I$(ALICE_ROOT)/include
+     endif
+endif
+
+ifneq ($(CORRFW_INCLUDE),)
+  ALICEINC += -I../$(CORRFW_INCLUDE)
+endif
+
+ifneq ($(PWG2AOD_INCLUDE),)
+  ALICEINC += -I../$(PWG2AOD_INCLUDE)
+endif
+
+ifneq ($(PWG2femtoscopy_INCLUDE),)
+  ALICEINC += -I../$(PWG2femtoscopy_INCLUDE)
+endif
+
+ifneq ($(PWG2femtoscopyUser_INCLUDE),)
+  ALICEINC += -I../$(PWG2femtoscopyUser_INCLUDE)
+endif
+
+ifneq ($(PWG2flowCommon_INCLUDE),)
+  ALICEINC += -I../$(PWG2flowCommon_INCLUDE)
+endif
+
+ifneq ($(PWG2flowTasks_INCLUDE),)
+  ALICEINC += -I../$(PWG2flowTasks_INCLUDE)
+endif
+
+ifneq ($(PWG2resonances_INCLUDE),)
+  ALICEINC += -I../$(PWG2resonances_INCLUDE)
+endif
+
+ifneq ($(PWG2unicor_INCLUDE),)
+  ALICEINC += -I../$(PWG2unicor_INCLUDE)
+endif
+
+ifneq ($(PWG2evchar_INCLUDE),)
+  ALICEINC += -I../$(PWG2evchar_INCLUDE)
+endif
+
+ifneq ($(PWG2kink_INCLUDE),)
+  ALICEINC += -I../$(PWG2kink_INCLUDE)
+endif
+
+# only if no par file was loaded before
+ifeq ($(ALICEINC),-I.)
+  ifneq ($(ALICE_ROOT),)
+    ALICEINC += -I$(ALICE_ROOT)/include
   endif
 endif
 
@@ -20,24 +73,25 @@ endif
 #  ALICEINC += -I../$(PWG0base_INCLUDE)
 #endif
 
-CXXFLAGS     += $(ALICEINC) -g -IFEMTOSCOPY/AliFemto -IFEMTOSCOPY/AliFemto/Base -IFEMTOSCOPY/AliFemto/Infrastructure -IFEMTOSCOPY/AliFemtoUser
+CXXFLAGS     += $(ALICEINC) -g
+F77FLAGS     += $(ALICEINC) -g -fPIC
 
-ALICEINC += -IFEMTOSCOPY/AliFemto -IFEMTOSCOPY/AliFemto/Base -IFEMTOSCOPY/AliFemto/Infrastructure  -IFEMTOSCOPY/AliFemtoUser
+#ALICEINC += -IFEMTOSCOPY/AliFemto -IANALYSIS -IFEMTOSCOPY/AliFemtoUser
 
-PACKAGE = PWG2
 include lib$(PACKAGE).pkg
 
 DHDR_PWG2 := $(DHDR)
 HDRS_PWG2 := $(HDRS)
 SRCS_PWG2 := $(SRCS) G__$(PACKAGE).cxx
-OBJS_PWG2 := $(SRCS_PWG2:.cxx=.o)
+FSCRS_PWG2 := $(FSRCS)
+OBJS_PWG2 := $(SRCS_PWG2:.cxx=.o) $(FSRCS:.F=.o)
 
 PARFILE       = $(PACKAGE).par
 
 lib$(PACKAGE).so: $(OBJS_PWG2)
 	@echo "Linking" $@ ...
 	@/bin/rm -f $@
-ifeq ($(PLATFORM),macosx)
+ifeq ($(ARCH),macosx)
 	@$(LD) -bundle -undefined $(UNDEFOPT) $(LDFLAGS) $^ -o $@
 else
 	@$(LD) $(SOFLAGS) $(LDFLAGS) $^ -o $@
@@ -48,12 +102,15 @@ endif
 %.o:    %.cxx %.h
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
-G__PWG2.cxx G__PWG2.h: $(HDRS_PWG2) $(DHDR_PWG2)
+%.o:    %.F
+	$(F77) $(F77FLAGS) -c $< -o $@
+
+G__$(PACKAGE).cxx G__$(PACKAGE).h: $(HDRS_PWG2) $(DHDR_PWG2)
 	@echo "Generating dictionary ..."
-	rootcint -f $@ -c $(ALICEINC) $^
+	rootcint -f $@ -c $(CINTFLAGS) $(ALICEINC) $^
 
 clean:
-	@rm -f $(OBJS_PWG2) $(OBJS_PWG2ebye) $(OBJS_PWG2flow) $(OBJS_PWG2femtoscopy) *.so G__PWG2.* G__PWG2ebye.* G__PWG2flow.* G__PWG2femtoscopy.* $(PARFILE)
+	@rm -f $(OBJS_PWG2) *.so G__$(PACKAGE).* $(PARFILE)
 
 ### CREATE PAR FILE
 
@@ -89,74 +146,3 @@ test-%.par: %.par
 	@cd par-tmp; tar xfz ../$<;	cd $(subst .par,,$<); PROOF-INF/BUILD.sh
 	@rm -rf par-tmp
 	@echo "INFO: Testing succeeded (already cleaned up)"
-
-## libPWG0ebye part
-include libPWG2ebye.pkg
-
-DHDR_PWG2ebye := $(DHDR)
-HDRS_PWG2ebye := $(HDRS)
-SRCS_PWG2ebye := $(SRCS) G__PWG2ebye.cxx
-OBJS_PWG2ebye := $(SRCS_PWG2ebye:.cxx=.o)
-
-libPWG2ebye.so: $(OBJS_PWG2ebye)
-	@echo "Linking" $@ ...
-	@/bin/rm -f $@
-ifeq ($(PLATFORM),macosx)
-	@$(LD) -bundle -undefined $(UNDEFOPT) $(LDFLAGS) $^ -o $@
-else
-	@$(LD) $(SOFLAGS) $(LDFLAGS) $^ -o $@
-endif
-	@chmod a+x $@
-	@echo "done"
-
-G__PWG2ebye.cxx G__PWG2ebye.h: $(HDRS_PWG2ebye) $(DHDR_PWG2ebye)
-	@echo "Generating dictionary ..."
-	rootcint -f $@ -c $(ALICEINC) $^
-
-## libPWG2flow part
-include libPWG2flow.pkg
-
-DHDR_PWG2flow := $(DHDR)
-HDRS_PWG2flow := $(HDRS)
-SRCS_PWG2flow := $(SRCS) G__PWG2flow.cxx
-OBJS_PWG2flow := $(SRCS_PWG2flow:.cxx=.o)
-
-libPWG2flow.so: $(OBJS_PWG2flow)
-	@echo "Linking" $@ ...
-	@/bin/rm -f $@
-ifeq ($(PLATFORM),macosx)
-	@$(LD) -bundle -undefined $(UNDEFOPT) $(LDFLAGS) $^ -o $@
-else
-	@$(LD) $(SOFLAGS) $(LDFLAGS) $^ -o $@
-endif
-	@chmod a+x $@
-	@echo "done"
-
-G__PWG2flow.cxx G__PWG2flow.h: $(HDRS_PWG2flow) $(DHDR_PWG2flow)
-	@echo "Generating dictionary ..."
-	rootcint -f $@ -c $(ALICEINC) $^
-
-
-## libPWG2femtoscopy part
-include libPWG2femtoscopy.pkg
-
-DHDR_PWG2femtoscopy := $(DHDR)
-HDRS_PWG2femtoscopy := $(HDRS)
-SRCS_PWG2femtoscopy := $(SRCS) G__PWG2femtoscopy.cxx
-OBJS_PWG2femtoscopy := $(SRCS_PWG2femtoscopy:.cxx=.o)
-
-libPWG2femtoscopy.so: $(OBJS_PWG2femtoscopy)
-	@echo "Linking" $@ ...
-	@/bin/rm -f $@
-ifeq ($(PLATFORM),macosx)
-	@$(LD) -bundle -undefined $(UNDEFOPT) $(LDFLAGS) $^ -o $@
-else
-	@$(LD) $(SOFLAGS) $(LDFLAGS) $^ -o $@
-endif
-	@chmod a+x $@
-	@echo "done"
-
-G__PWG2femtoscopy.cxx G__PWG2femtoscopy.h: $(HDRS_PWG2femtoscopy) $(DHDR_PWG2femtoscopy)
-	@echo "Generating dictionary ..."
-	rootcint -f $@ -c $(ALICEINC) $^
-