Fixing the AddTask

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

diff --git a/CORRFW/Makefile b/CORRFW/Makefile
index 69f036c93be619c7f3ee97759d8a0909e81f48c4..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,22 @@ 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
-include lib$(PACKAGE).pkg
+SRCS     = $(wildcard *.cxx)
+HDRS     = $(SRCS:.cxx=.h)
+DHDR     = $(PACKAGE)LinkDef.h
 
 DHDR_CORRFW := $(DHDR)
 HDRS_CORRFW := $(HDRS)
@@ -49,10 +57,10 @@ PARFILE       = $(PACKAGE).par
 lib$(PACKAGE).so: $(OBJS_CORRFW)
        @echo "Linking" $@ ...
        @/bin/rm -f $@
-ifeq ($(ARCH),macosx)
-       @$(LD) -bundle -undefined $(UNDEFOPT) $(LDFLAGS) $^ -o $@
+ifeq ($(PLATFORM),macosx)
+       $(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(PACKLDFLAGS) $(EXPLLINKLIBS)
 else
-       @$(LD) $(SOFLAGS) $(LDFLAGS) $^ -o $@
+       $(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(PACKLDFLAGS) $(EXPLLINKLIBS)
 endif
        @chmod a+x $@
        @echo "done"
@@ -69,7 +77,7 @@ G__$(PACKAGE).cxx G__$(PACKAGE).h: $(HDRS) $(DHDR)
 
 ### CREATE PAR FILE
 
-$(PARFILE): $(patsubst %,$(PACKAGE)/%,$(filter-out G__%, $(HDRS_CORRFW) $(SRCS_CORRFW) $(DHDR_CORRFW) Makefile Makefile.arch lib$(PACKAGE).pkg PROOF-INF))
+$(PARFILE): $(patsubst %,$(PACKAGE)/%,$(filter-out G__%, $(HDRS_CORRFW) $(SRCS_CORRFW) $(DHDR_CORRFW) Makefile Makefile.arch PROOF-INF))
        @echo "Creating archive" $@ ...
        @tar cfzh $@ $(PACKAGE)
        @rm -rf $(PACKAGE)