Change naming convention for versioned dynamic library files on

Darwin/OS X to match the OS's convention that the version number
precedes the .dylib suffix.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@32957 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Wolfgang Lux 2011-04-30 07:59:20 +00:00
parent 3795c60175
commit af51b6720b
3 changed files with 22 additions and 1 deletions

View file

@ -1,4 +1,11 @@
2011-04-12 Wolfgang Lux <wolfgang.lux@gmail.com>
2011-04-30 Wolfgang Lux <wolfgang.lux@gmail.com>
* Instance/library.make:
* Instance/framework.make: Change naming convention for versioned
dynamic library files on Darwin/OS X to match the OS's convention
that the version number precedes the .dylib suffix.
2011-04-30 Wolfgang Lux <wolfgang.lux@gmail.com>
* configure.ac:
* config.make.in:

View file

@ -252,8 +252,15 @@ FRAMEWORK_CURRENT_LIBRARY_DIR = $(GNUSTEP_BUILD_DIR)/$(FRAMEWORK_CURRENT_LIBRARY
ifneq ($(BUILD_DLL), yes)
FRAMEWORK_LIBRARY_FILE = lib$(GNUSTEP_INSTANCE)$(SHARED_LIBEXT)
ifeq ($(findstring darwin, $(GNUSTEP_TARGET_OS)), darwin)
# On Mac OS X the version number conventionally precedes the shared
# library suffix, e.g., libgnustep-base.1.16.1.dylib.
VERSION_FRAMEWORK_LIBRARY_FILE = lib$(GNUSTEP_INSTANCE).$(VERSION).$(SHARED_LIBEXT)
SONAME_FRAMEWORK_FILE = lib$(GNUSTEP_INSTANCE).$(INTERFACE_VERSION).$(SHARED_LIBEXT)
else
VERSION_FRAMEWORK_LIBRARY_FILE = $(FRAMEWORK_LIBRARY_FILE).$(VERSION)
SONAME_FRAMEWORK_FILE = $(FRAMEWORK_LIBRARY_FILE).$(INTERFACE_VERSION)
endif
else # BUILD_DLL

View file

@ -184,8 +184,15 @@ endif
ifneq ($(BUILD_DLL),yes)
LIBRARY_FILE = $(LIBRARY_NAME_WITH_LIB)$(SHARED_LIBEXT)
ifeq ($(findstring darwin, $(GNUSTEP_TARGET_OS)), darwin)
# On Mac OS X the version number conventionally precedes the shared
# library suffix, e.g., libgnustep-base.1.16.1.dylib.
VERSION_LIBRARY_FILE = $(LIBRARY_NAME_WITH_LIB).$(VERSION)$(SHARED_LIBEXT)
SONAME_LIBRARY_FILE = $(LIBRARY_NAME_WITH_LIB).$(INTERFACE_VERSION)$(SHARED_LIBEXT)
else
VERSION_LIBRARY_FILE = $(LIBRARY_FILE).$(VERSION)
SONAME_LIBRARY_FILE = $(LIBRARY_FILE).$(INTERFACE_VERSION)
endif
else # BUILD_DLL