Adding extra check for GPU_FORCE_64BIT_PTR env var
[u/mrichter/AliRoot.git] / JETAN / Makefile
index 6a2f556..fc2c779 100644 (file)
@@ -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,6 +8,9 @@ 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),)
@@ -16,26 +19,45 @@ 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
@@ -47,28 +69,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"