X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=JETAN%2FMakefile;h=5a29206e7849b3845ff990925b35fa62f1f5b9e3;hb=016a21c00dd6877ce6ad16410e88c50b54b94c81;hp=d81a1407ea8a905d4aa70bf2f018ed1a9c93a901;hpb=cb9ef56fed13194a0989c02474aaf7b98219804e;p=u%2Fmrichter%2FAliRoot.git

diff --git a/JETAN/Makefile b/JETAN/Makefile
index d81a1407ea8..5a29206e784 100644
--- 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)
@@ -8,32 +8,63 @@ 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 ($(JETAN_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 -I$(ALICE_ROOT)/JETAN -I$(ALICE_ROOT)/ANALYSIS
+      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)
@@ -41,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"