X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ANALYSIS%2FMakefile;h=fd1baa0891f2589c6e62949b48da0774dad1291d;hb=e17f27a2b694b8b46bd22e31836e4e128b1d0b17;hp=fbc266af15e236cb22d59637ec434eee651cde04;hpb=84d4333fbd65d56f0333d4f07aacc97072728b47;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ANALYSIS/Makefile b/ANALYSIS/Makefile
index fbc266af15e..fd1baa0891f 100644
--- a/ANALYSIS/Makefile
+++ b/ANALYSIS/Makefile
@@ -1,7 +1,7 @@
 
-include $(ROOTSYS)/test/Makefile.arch
+include Makefile.arch
 
-PACKAGE = ANALYSIS
+PACKAGE = ANALYSISalice
 
 default-target: lib$(PACKAGE).so
 
@@ -24,24 +24,43 @@ ifneq ($(ANALYSIS_INCLUDE),)
    ALICEINC += -I../$(ANALYSIS_INCLUDE)
 endif
 
+ifneq ($(OADB_INCLUDE),)
+   ALICEINC += -I../$(OADB_INCLUDE)
+endif
+
 ifneq ($(ANALYSISalice_INCLUDE),)
    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 -I$(ALICE_ROOT)/ANALYSIS/Tender -I$(ALICE_ROOT)/TOF
+    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
+#endif
 
-CXXFLAGS     += $(ALICEINC) -g
+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)
 
-SRCS     := $(wildcard *.cxx)
-HDRS     := $(SRCS:.cxx=.h)
-DHDR     := $(PACKAGE)LinkDef.h
+ifeq ($(CHECKXML),yes)
+  CXXFLAGS += -DWITHXML
+  CINTFLAGS += -DWITHXML
+endif
+
+CXXFLAGS += $(ALICEINC) -g
+
+SRCS     = $(wildcard *.cxx)
+HDRS     = $(SRCS:.cxx=.h)
+DHDR     = $(PACKAGE)LinkDef.h
 
 DHDR_ANALYSIS := $(DHDR)
 HDRS_ANALYSIS := $(HDRS)
@@ -54,10 +73,10 @@ PARFILE       = $(PACKAGE).par
 lib$(PACKAGE).so: $(OBJS_ANALYSIS)
 	@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"