X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=EMCAL%2FMakefile;h=e1e84baa0853a89212d5cb5de4b53698afa00895;hp=0e6c24f3a11e83666f582d1dcca7666dbea9927a;hb=d86acb69c5666a90fe5ee57112b88c85f8296bc6;hpb=f284616d173133d22a9f400fa2cc3764ea044a06

diff --git a/EMCAL/Makefile b/EMCAL/Makefile
index 0e6c24f3a11..e1e84baa085 100644
--- a/EMCAL/Makefile
+++ b/EMCAL/Makefile
@@ -72,10 +72,27 @@ PARFILE       = $(PACKAGE).par
 lib$(PACKAGE).so: $(OBJS_EMCAL)
 	@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"