add track efficiency dicing to Esd/Aod Filter, rename matching prep macro + adjust

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

diff --git a/CORRFW/Makefile b/CORRFW/Makefile
index 417c6514df001d9fdf657874bfa783bd7ede75a3..8d13bffecacaa21378ec8e3791a6dcb9ddfc0b1e 100644 (file)
--- a/CORRFW/Makefile
+++ b/CORRFW/Makefile
@@ -1,7 +1,9 @@
 
 include Makefile.arch
 
-default-target: libCORRFW.so
+PACKAGE = CORRFW
+
+default-target: lib$(PACKAGE).so
 
 ALICEINC      = -I.
 
@@ -27,16 +29,19 @@ ALICEINC += -I../$(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
   endif
+#endif
+
+ifeq ($(PLATFORM),macosx)
+     ROOTLIBDIR     := $(shell $(RC) --libdir)
+     PACKLDFLAGS = $(STEERBase_LIBS) $(ESD_LIBS) $(AOD_LIBS) $(ANALYSIS_LIBS) $(ANALYSISalice_LIBS) -L$(ROOTLIBDIR)  -lVMC -lMinuit -lEG -lGeom
 endif
 
 CXXFLAGS     += $(ALICEINC) -g
 
-PACKAGE = CORRFW
-
 SRCS     = $(wildcard *.cxx)
 HDRS     = $(SRCS:.cxx=.h)
 DHDR     = $(PACKAGE)LinkDef.h
@@ -53,26 +58,9 @@ lib$(PACKAGE).so: $(OBJS_CORRFW)
        @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"