add pyquen quenching strength

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

diff --git a/ANALYSIS/Makefile b/ANALYSIS/Makefile
index 254963e3b40ec4b15325a4c8b9c4f7dc138eb189..fd1baa0891f2589c6e62949b48da0774dad1291d 100644 (file)
--- a/ANALYSIS/Makefile
+++ b/ANALYSIS/Makefile
@@ -33,10 +33,20 @@ ifneq ($(ANALYSISalice_INCLUDE),)
 endif
 
 # only if no par file was loaded before
-ifeq ($(ALICEINC),-I.)
+#ifeq ($(ALICEINC),-I.)
   ifneq ($(ALICE_ROOT),)
-    ALICEINC += -I$(ALICE_ROOT)/include -I$(ALICE_ROOT)/ANALYSIS/Tender -I$(ALICE_ROOT)/TOF -I$(ALICE_ROOT)/TRD/Cal -I$(ALICE_ROOT)/VZERO -I$(ALICE_ROOT)/TPC -I$(ALICE_ROOT)/T0
+    ALICEINC += -I$(ALICE_ROOT)/include -I$(ALICE_ROOT)/ANALYSIS/Tender -I$(ALICE_ROOT)/TOF -I$(ALICE_ROOT)/TRD/Cal -I$(ALICE_ROOT)/VZERO -I$(ALICE_ROOT)/TPC -I$(ALICE_ROOT)/T0 -I$(ALICE_ROOT)/EMCAL
   endif
+#endif
+
+ifeq ($(PLATFORM),macosx)
+ROOTLIBDIR     := $(shell $(RC) --libdir)
+ifeq ($(PACKAGE),ANALYSIS)
+   PACKLDFLAGS = $(STEERBase_LIBS) $(ESD_LIBS) $(AOD_LIBS) -L$(ROOTLIBDIR) -lXMLParser
+endif
+ifeq ($(PACKAGE),ANALYSISalice) 
+   PACKLDFLAGS = $(STEERBase_LIBS) $(ESD_LIBS) $(AOD_LIBS) $(ANALYSIS_LIBS) $(OADB_LIBS) -L$(ROOTLIBDIR) -lXMLIO -lEG -lTreePlayer
+endif
 endif
 
 CHECKXML      := $(shell root-config --has-xml)
@@ -64,26 +74,9 @@ lib$(PACKAGE).so: $(OBJS_ANALYSIS)
        @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,$@)
+       $(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(PACKLDFLAGS) $(EXPLLINKLIBS)
 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
+       $(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(PACKLDFLAGS) $(EXPLLINKLIBS)
 endif
        @chmod a+x $@
        @echo "done"