X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=JETAN%2FMakefile;h=fc2c779ea8111aeb53382ef57cb4e482e63464e3;hp=e471a896a80afcd68c2a7447ce342878d354a14c;hb=b626371c810c0b068e5c7dcec0337fa06187f3b3;hpb=84d4333fbd65d56f0333d4f07aacc97072728b47

diff --git a/JETAN/Makefile b/JETAN/Makefile
index e471a896a80..fc2c779ea81 100644
--- a/JETAN/Makefile
+++ b/JETAN/Makefile
@@ -1,28 +1,63 @@
 PACKAGE = invalid-only-for-proof
 
-include $(ROOTSYS)/test/Makefile.arch
+include Makefile.arch
 
-SRCS     := $(wildcard *.cxx)
-HDRS     := $(SRCS:.cxx=.h)
-DHDR     := $(PACKAGE)LinkDef.h
+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 ($(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
+      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
@@ -34,11 +69,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"