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 e1e84baa0853a89212d5cb5de4b53698afa00895..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
 
@@ -43,14 +43,13 @@ 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
@@ -72,28 +71,7 @@ PARFILE       = $(PACKAGE).par
 lib$(PACKAGE).so: $(OBJS_EMCAL)
        @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,$@)
-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
-endif
+       $(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(EXPLLINKLIBS)
        @chmod a+x $@
        @echo "done"