Merge branch 'master' of https://git.cern.ch/reps/AliRoot

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

diff --git a/JETAN/Makefile b/JETAN/Makefile
index c468efdcd4f8650ef1289ceb363d6cd31ed1a740..5a29206e7849b3845ff990925b35fa62f1f5b9e3 100644 (file)
--- a/JETAN/Makefile
+++ b/JETAN/Makefile
@@ -1,6 +1,6 @@
 PACKAGE = invalid-only-for-proof
 
-include $(ROOTSYS)/test/Makefile.arch
+include Makefile.arch
 
 SRCS     = $(wildcard *.cxx)
 HDRS     = $(SRCS:.cxx=.h)
@@ -53,15 +53,18 @@ ifneq ($(ESD_INCLUDE),)
  else
     ifneq ($(ALICE_ROOT),)
       ifneq ($(findstring dev,$(PACKAGE)),)
-       ALICEINC += -I$(ALICE_ROOT)/include -I$(ALICE_ROOT)/JETAN/DEV -I$(ALICE_ROOT)/ANALYSIS
+       ALICEINC += -I$(ALICE_ROOT)/include -I$(ALICE_ROOT)/JETAN/DEV -I$(ALICE_ROOT)/JETAN/fastjet -I$(ALICE_ROOT)/ANALYSIS
       else
-       ALICEINC += -I$(ALICE_ROOT)/include -I$(ALICE_ROOT)/JETAN -I$(ALICE_ROOT)/ANALYSIS
+       ALICEINC += -I$(ALICE_ROOT)/include -I$(ALICE_ROOT)/JETAN -I$(ALICE_ROOT)/JETAN/fastjet -I$(ALICE_ROOT)/ANALYSIS
      endif
     endif
 endif
 
 CXXFLAGS     += $(ALICEINC) -g
 
+ifeq ($(ARCH),macosx64)
+  SOFLAGS      += -undefined dynamic_lookup
+endif
 
 SRCS         += G__$(PACKAGE).cxx
 OBJS          = $(SRCS:.cxx=.o)
@@ -69,28 +72,7 @@ OBJS          = $(SRCS:.cxx=.o)
 lib$(PACKAGE).so: $(OBJS)
        @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"