fixing backward incompatible operator=, check for existence of fEventPlaneP

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

diff --git a/PWG4/Makefile b/PWG4/Makefile
index f8e9c9a484ed0a6f0139d3b47835d36f90a25f16..6e88ae683cb0f578ad37073321764c88ec48e6fd 100644 (file)
--- a/PWG4/Makefile
+++ b/PWG4/Makefile
@@ -51,6 +51,18 @@ ifneq ($(EMCALUtils_INCLUDE),)
   CXXFLAGS+=-D__EMCALUTIL__
 endif
 
+ifneq ($(EMCALbase_INCLUDE),)
+  ALICEINC += -I../$(EMCALbase_INCLUDE)
+endif
+
+ifneq ($(EMCALsim_INCLUDE),)
+  ALICEINC += -I../$(EMCALsim_INCLUDE)
+endif
+
+ifneq ($(EMCALrec_INCLUDE),)
+  ALICEINC += -I../$(EMCALrec_INCLUDE)
+endif
+
 ifneq ($(PWG4PartCorrBase_INCLUDE),)
   ALICEINC += -I../$(PWG4PartCorrBase_INCLUDE)
 endif
@@ -104,10 +116,27 @@ PARFILE       = $(PACKAGE).par
 lib$(PACKAGE).so: $(OBJS_PWG4)
        @echo "Linking" $@ ...
        @/bin/rm -f $@
-ifeq ($(ARCH),macosx)
-       @$(LD) -bundle -undefined $(UNDEFOPT) $(LDFLAGS) $^ -o $@
+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) $(SOFLAGS) $(LDFLAGS) $^ -o $@
+               $(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
        @chmod a+x $@
        @echo "done"