put back previous default value, although decission needs to be made to which one...

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

diff --git a/EMCAL/Makefile b/EMCAL/Makefile
index 52c0b0b284bb93843f90a724264b4fc94a993c24..a49c28c6648c05c81ce920f0db27044b8932d870 100644 (file)
--- a/EMCAL/Makefile
+++ b/EMCAL/Makefile
@@ -1,6 +1,6 @@
 # $Id: Makefile 33076 2009-06-19 16:40:17Z akisiel $
 
-include $(ROOTSYS)/test/Makefile.arch
+include Makefile.arch
 
 PACKAGE = EMCAL
 
@@ -10,12 +10,24 @@ ALICEINC      = -I.
 
 ### define include dir for local case and par case
 
+### in case of Root compilation for ANALYSIS, only load EMCALUtils
+### if modification of EMCAL libraries, include STEER and RAW
 ifneq ($(STEERBase_INCLUDE),)
   ALICEINC += -I../$(STEERBase_INCLUDE)
+  ALICEINC += -I../$(ESD_INCLUDE)
+  ALICEINC += -I../$(AOD_INCLUDE)
+else
+    ALICEINC += -I$(ALICE_ROOT)/include
+    ALICEINC += -I$(ALICE_ROOT)/STEER
+    ALICEINC += -I$(ALICE_ROOT)/RAW
+    ALICEINC += -I$(ALICE_ROOT)/VZERO
 endif
 
+### in modification of EMCAL libraries, and not modification of EMCALUtils, include EMCAL from aliroot 
 ifneq ($(EMCALUtils_INCLUDE),)
   ALICEINC += -I../$(EMCALUtils_INCLUDE)
+else
+ ALICEINC += -I$(ALICE_ROOT)/EMCAL
 endif
 
 ifneq ($(EMCALbase_INCLUDE),)
@@ -31,21 +43,22 @@ ifneq ($(EMCALrec_INCLUDE),)
 endif
 
 # only if no par file was loaded before
-ifeq ($(ALICEINC),-I.)
+#ifeq ($(ALICEINC),-I.)
   ifneq ($(ALICE_ROOT),)
     ALICEINC += -I$(ALICE_ROOT)/include
-    ALICEINC += -I$(ALICE_ROOT)/STEER
-    ALICEINC += -I$(ALICE_ROOT)/RAW
-    ALICEINC += -I$(ALICE_ROOT)/EMCAL
+#    ALICEINC += -I$(ALICE_ROOT)/RAW
+#    ALICEINC += -I$(ALICE_ROOT)/EMCAL
   endif
-endif
+#endif
 
 
 CXXFLAGS     += $(ALICEINC) -g
 F77FLAGS     += $(ALICEINC) -g -fPIC
 
 
-include lib$(PACKAGE).pkg
+SRCS     = $(wildcard *.cxx */*.cxx)
+HDRS     = $(SRCS:.cxx=.h)
+DHDR     = $(PACKAGE)LinkDef.h
 
 DHDR_EMCAL := $(DHDR)
 HDRS_EMCAL := $(HDRS)
@@ -58,11 +71,7 @@ PARFILE       = $(PACKAGE).par
 lib$(PACKAGE).so: $(OBJS_EMCAL)
        @echo "Linking" $@ ...
        @/bin/rm -f $@
-ifeq ($(ARCH),macosx)
-       @$(LD) -bundle -undefined $(UNDEFOPT) $(LDFLAGS) $^ -o $@
-else
-       @$(LD) $(SOFLAGS) $(LDFLAGS) $^ -o $@
-endif
+       $(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(EXPLLINKLIBS)
        @chmod a+x $@
        @echo "done"
 
@@ -81,7 +90,7 @@ clean:
 
 ### CREATE PAR FILE
 
-$(PARFILE): $(patsubst %,$(PACKAGE)/%,$(filter-out G__%, $(HDRS_EMCAL) $(SRCS_EMCAL) $(DHDR_EMCAL) Makefile Makefile.arch lib$(PACKAGE).pkg PROOF-INF))
+$(PARFILE): $(patsubst %,$(PACKAGE)/%,$(filter-out G__%, $(HDRS_EMCAL) $(SRCS_EMCAL) $(DHDR_EMCAL) Makefile Makefile.arch PROOF-INF))
        @echo "Creating archive" $@ ...
        @tar cfzh $@ $(PACKAGE)
        @rm -rf $(PACKAGE)