Merge branch 'master' into TPCdev

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

diff --git a/JETAN/Makefile b/JETAN/Makefile
index baeb0248c47437ee8af718249f01d1b288364f55..5a29206e7849b3845ff990925b35fa62f1f5b9e3 100644 (file)
--- a/JETAN/Makefile
+++ b/JETAN/Makefile
@@ -1,26 +1,70 @@
 PACKAGE = invalid-only-for-proof
 
-include $(ROOTSYS)/test/Makefile.arch
-include lib$(PACKAGE).pkg
+include Makefile.arch
+
+SRCS     = $(wildcard *.cxx)
+HDRS     = $(SRCS:.cxx=.h)
+DHDR     = $(PACKAGE)LinkDef.h
 
 
 ALICEINC      = -I.
+ifneq ($(findstring dev,$(PACKAGE)),)
+ ALICEINC     += -I./DEV
+endif
 
 ### define include dir for local case and par case
+ifneq ($(OADB_INCLUDE),)
+   ALICEINC += -I../$(OADB_INCLUDE)
+endif
+ifneq ($(EMCALUtils_INCLUDE),)
+   ALICEINC += -I../$(EMCALUtils_INCLUDE)
+endif
+ifneq ($(JETANDEV_INCLUDE),)
+  ifneq ($(FASTJET_ROOT),)
+   ALICEINC += -I$(FASTJET_ROOT)/include
+  else
+   ALICEINC += -I$(ALICE_ROOT)/JETAN/fastjet
+  endif
+endif
+ifneq ($(JETAN_INCLUDE),)
+ ifeq ($(findstring dev,$(PACKAGE)),)
+  ifneq ($(FASTJET_ROOT),)
+   ALICEINC += -I$(FASTJET_ROOT)/include
+  else
+   ALICEINC += -I$(ALICE_ROOT)/JETAN/fastjet
+  endif
+ endif
+endif
+
 ifneq ($(ESD_INCLUDE),)
    ALICEINC += -I../$(ESD_INCLUDE)
    ALICEINC += -I../$(AOD_INCLUDE)
    ALICEINC += -I../$(STEERBase_INCLUDE)
    ALICEINC += -I../$(ANALYSIS_INCLUDE)
    ALICEINC += -I../$(ANALYSISalice_INCLUDE)
+   ifneq ($(JETANDEV_INCLUDE),)        
+     ALICEINC += -I../$(JETANDEV_INCLUDE)
+   endif
+   ifneq ($(JETAN_INCLUDE),)
+    ifeq ($(findstring dev,$(PACKAGE)),)
+     ALICEINC += -I../$(JETAN_INCLUDE)
+    endif
+   endif
  else
     ifneq ($(ALICE_ROOT),)
-       ALICEINC += -I$(ALICE_ROOT)/include
+      ifneq ($(findstring dev,$(PACKAGE)),)
+       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)/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)
@@ -28,11 +72,7 @@ OBJS          = $(SRCS:.cxx=.o)
 lib$(PACKAGE).so: $(OBJS)
        @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"