Use of .so libs instead than .dylib

diff --git a/build/Makefile.macosx b/build/Makefile.macosx
index f7988a6f11ba27c5d0b75420853d2f1df37afdc8..a2d1f69966158b6b2b4d0b07fb472db8eeafc8c7 100644 (file)
--- a/build/Makefile.macosx
+++ b/build/Makefile.macosx
@@ -61,15 +61,10 @@ LD            = export MACOSX_DEPLOYMENT_TARGET=$(MACOSX_MAJOR).$(MACOSX_MINOR)
 LDFLAGS       = $(OPT) $(DICTLOAD)
 
 SHLD        := $(LD)
-SOFLAGS      := -bundle -undefined dynamic_lookup
+SOFLAGS      := -dynamiclib -undefined dynamic_lookup -single_module
 SHLIB        := 
 SOEXT       := so
 
-DYLD        := $(LD)
-DYFLAGS       = -dynamiclib -undefined dynamic_lookup -single_module
-DYLIB        := 
-DYEXT        := dylib
-
 ALLD         = ar
 ALFLAGS       = cr
 ALLIB         = 

diff --git a/build/Makefile.macosx64 b/build/Makefile.macosx64
index 9c25dfd712a6562f818ab2a9a21afcc77f82a092..df94e5edad9fafc209eddead8abcc85d9d526c72 100644 (file)
--- a/build/Makefile.macosx64
+++ b/build/Makefile.macosx64
@@ -62,15 +62,10 @@ LD            = export MACOSX_DEPLOYMENT_TARGET=$(MACOSX_MAJOR).$(MACOSX_MINOR)
 LDFLAGS       = $(OPT) $(DICTLOAD)
 
 SHLD        := $(LD)
-SOFLAGS      := -bundle -undefined dynamic_lookup
+SOFLAGS      := -m64 -dynamiclib -undefined dynamic_lookup -single_module
 SHLIB        := 
 SOEXT       := so
 
-DYLD        := $(LD)
-DYFLAGS       = -m64 -dynamiclib -undefined dynamic_lookup -single_module
-DYLIB        := 
-DYEXT        := dylib
-
 ALLD         = ar
 ALFLAGS       = cr
 ALLIB         = 

diff --git a/build/module.tpl b/build/module.tpl
index 0d58a2dbdd95cb89b1273983583e08f95a3f7013..50d4b558bbf734262fbcf715ede4370cf642f5d5 100644 (file)
--- a/build/module.tpl
+++ b/build/module.tpl
@@ -25,14 +25,6 @@ else
 @PACKAGE@SOFLAGS:=$(PACKSOFLAGS)
 endif
 
-ifdef DYEXT
-ifndef PACKDYFLAGS
-@PACKAGE@DYFLAGS:=$(DYFLAGS)
-else
-@PACKAGE@DYFLAGS:=$(PACKDYFLAGS)
-endif
-endif
-
 ifndef PACKLDFLAGS
 @PACKAGE@LDFLAGS:=$(LDFLAGS)
 else
@@ -140,19 +132,12 @@ endif
 
 @PACKAGE@LIB:=$(LIBPATH)/lib@PACKAGE@.$(SOEXT)
 
-ifneq ($(DYEXT),)
-@PACKAGE@DLIB:=$(LIBPATH)/lib@PACKAGE@.$(DYEXT)
-endif
-
 @PACKAGE@ALIB:=$(LIBPATH)/lib@PACKAGE@.$(AEXT)
 
 #Add this to the modules libs
 ifeq ($(TYPE),lib)
 @MODULE@LIBS += $(@PACKAGE@LIB)
 @MODULE@ALIBS += $(@PACKAGE@ALIB)
-ifneq ($(DYEXT),)
-@MODULE@DLIBS += $(@PACKAGE@DLIB)
-endif
 endif
 
 #The actual binary file
@@ -167,19 +152,12 @@ endif
 ifeq ($(TYPE),lib)
 ALLLIBS += $(@PACKAGE@LIB)
 ALLALIBS += $(@PACKAGE@ALIB)
-ifneq ($(DYEXT),)
-ALLLIBS += $(@PACKAGE@DLIB)
-endif
 BINLIBS += -l@PACKAGE@
 else
 ALLEXECS += $(@PACKAGE@BIN)
 endif
 
-ifeq ($(DYEXT),)
-@PACKAGE@LIB := $(@PACKAGE@LIB)
-else
 @PACKAGE@LIB := $(@PACKAGE@LIB)
-endif
 
 # include all dependence files
 INCLUDEFILES +=$(@PACKAGE@DEP)
@@ -203,13 +181,6 @@ endif
 
 #------------------------------------------------------------------------
 
-ifneq (,$(findstring macosx,$(ALICE_TARGET)))
-$(@PACKAGE@LIB): $(@PACKAGE@DLIB) $(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk
-ifndef ALIQUIET
-         @echo "***** Linking library $@ *****"
-endif
-         $(MUTE)rm -f $@; cd $(dir $@); ln -s $(notdir $(@PACKAGE@DLIB)) $(notdir $@)
-else
 $(@PACKAGE@LIB):$(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk
 ifndef ALIQUIET
          @echo "***** Linking library $@ *****"
@@ -219,19 +190,6 @@ endif
          $(SHLD) $(@PACKAGE@SOFLAGS) -o "$(CURDIR)"/$@ $(patsubst $(@MODULE@DIRO)/%,%,$(@PACKAGE@O) $(@PACKAGE@DO))  $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) $(SHLIB);\
          chmod a-w "$(CURDIR)"/$@ ;\
          cd $(ALICE_ROOT)
-endif
-
-ifneq ($(DYEXT),)
-$(@PACKAGE@DLIB):$(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk
-ifndef ALIQUIET
-         @echo "***** Linking library $@ *****"
-endif
-         \rm -f "$(CURDIR)"/$@ ;\
-         cd $(@MODULE@DIRO) ;\
-         $(DYLD) $(@PACKAGE@DYFLAGS) -o "$(CURDIR)"/$@ $(patsubst $(@MODULE@DIRO)/%,%,$(@PACKAGE@O) $(@PACKAGE@DO))  $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) $(DYLIB);\
-         chmod a-w "$(CURDIR)"/$@ ;\
-         cd $(ALICE_ROOT) 
-endif
 
 #------------------------------------------------------------------------
 
@@ -293,9 +251,6 @@ endif
 
 ifeq ($(TYPE),lib)
 all-@MODULE@: $(@PACKAGE@LIB)
-ifneq ($(DYEXT),)
-all-@MODULE@: $(@PACKAGE@DLIB)
-endif
 else
 all-@MODULE@: $(@PACKAGE@BIN)
 endif