renaming function to avoid library conflict (discovered in test/generators/TUHKMgen)

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

diff --git a/OADB/Makefile b/OADB/Makefile
index f6e8ec2198e1be4d39c59970f22d82edb35a3f8a..358160233d6a7f6ee2c114a10dba3d9604dfe8c7 100644 (file)
--- a/OADB/Makefile
+++ b/OADB/Makefile
@@ -1,6 +1,6 @@
 PACKAGE = invalid-only-for-proof
 
-include $(ROOTSYS)/test/Makefile.arch
+include $(ROOTSYS)/etc/Makefile.arch
 
 SRCS     = $(wildcard *.cxx */*.cxx)
 HDRS     = $(SRCS:.cxx=.h)
@@ -13,6 +13,22 @@ endif
 
 ALICEINC = -I.
 
+ifneq ($(ESD_INCLUDE),)
+   ALICEINC += -I../$(ESD_INCLUDE) 
+endif
+
+ifneq ($(AOD_INCLUDE),)
+   ALICEINC += -I../$(AOD_INCLUDE) 
+endif
+
+ifneq ($(STEERBase_INCLUDE),)
+   ALICEINC += -I../$(STEERBase_INCLUDE)
+endif
+
+ifneq ($(ANALYSIS_INCLUDE),)
+   ALICEINC += -I../$(ANALYSIS_INCLUDE)
+endif
+
 ifneq ($(OADB_INCLUDE),)
    ALICEINC += -I../$(OADB_INCLUDE) 
 endif
@@ -26,6 +42,13 @@ endif
 
 
 
+ifeq ($(PLATFORM),macosx)
+ROOTLIBDIR     := $(shell $(RC) --libdir)
+ifeq ($(PACKAGE),OADB)
+   PACKLDFLAGS = $(STEERBase_LIBS) $(ESD_LIBS) $(AOD_LIBS) $(ANALYSIS_LIBS) -L$(ROOTLIBDIR)  -lVMC -lMinuit -lEG -lGeom
+endif
+endif
+
 
 CXXFLAGS += $(ALICEINC) -g
 
@@ -35,10 +58,10 @@ OBJS          = $(SRCS:.cxx=.o)
 lib$(PACKAGE).so: $(OBJS)
        @echo "Linking" $@ ...
        @/bin/rm -f $@
-ifeq ($(ARCH),macosx)
-       @$(LD) -bundle -undefined $(UNDEFOPT) $(LDFLAGS) $^ -o $@
+ifeq ($(PLATFORM),macosx)
+       $(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(PACKLDFLAGS) $(EXPLLINKLIBS)
 else
-       @$(LD) $(SOFLAGS) $(LDFLAGS) $^ -o $@
+       $(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(PACKLDFLAGS) $(EXPLLINKLIBS)
 endif
        @chmod a+x $@
        @echo "done"