diff options
| author | lloyd <[email protected]> | 2011-04-06 03:50:38 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2011-04-06 03:50:38 +0000 |
| commit | 4b763179b2fb0c6f022c17a73afc731b5efa88f9 (patch) | |
| tree | 06e3a3df5a4c1f5479b4c659a817cdde6fd6f4e0 | |
| parent | 55bbfdc0348f5f82a6dd5075e77bb4a1d18c53dc (diff) | |
I belive this check in fixes PR 113 by making shared library sonames
match the norman Unix conventions.
| -rwxr-xr-x | configure.py | 4 | ||||
| -rw-r--r-- | src/build-data/makefile/unix.in | 2 | ||||
| -rw-r--r-- | src/build-data/makefile/unix_shr.in | 7 |
3 files changed, 7 insertions, 6 deletions
diff --git a/configure.py b/configure.py index d773244df..c0d92406b 100755 --- a/configure.py +++ b/configure.py @@ -57,8 +57,8 @@ class BuildConfigurationInformation(object): version_string = '%d.%d.%d%s' % ( version_major, version_minor, version_patch, version_suffix) - soversion_string = '%d.%d.%d%s' % ( - version_major, version_minor, version_so_patch, version_suffix) + soversion_string = '%d.%d.%d' % ( + version_major, version_minor, version_so_patch) """ Constructor diff --git a/src/build-data/makefile/unix.in b/src/build-data/makefile/unix.in index c525aa6bf..ea51c999e 100644 --- a/src/build-data/makefile/unix.in +++ b/src/build-data/makefile/unix.in @@ -63,7 +63,7 @@ all: $(LIBRARIES) # Link Commands $(CHECK): $(LIBRARIES) $(CHECKOBJS) - $(CXX) $(CHECKOBJS) -L. libbotan.a $(LINK_TO) -o $(CHECK) + $(CXX) $(CHECKOBJS) $(STATIC_LIB) $(LINK_TO) -o $(CHECK) $(STATIC_LIB): $(LIBOBJS) $(RM) $(STATIC_LIB) diff --git a/src/build-data/makefile/unix_shr.in b/src/build-data/makefile/unix_shr.in index aaedeeaf8..8691a08de 100644 --- a/src/build-data/makefile/unix_shr.in +++ b/src/build-data/makefile/unix_shr.in @@ -57,8 +57,8 @@ LIBRARIES = $(STATIC_LIB) $(SHARED_LIB) LIBNAME = %{lib_prefix}libbotan STATIC_LIB = $(LIBNAME).a -SHARED_LIB = $(LIBNAME)-$(SO_VERSION).%{so_suffix} -SONAME = $(LIBNAME)-$(SO_VERSION).%{so_suffix} +SHARED_LIB = $(LIBNAME).%{so_suffix}.$(VERSION) +SONAME = $(LIBNAME).%{so_suffix}.$(SO_VERSION) SYMLINK = libbotan.%{so_suffix} @@ -71,7 +71,7 @@ all: $(LIBRARIES) # Link Commands $(CHECK): $(LIBRARIES) $(CHECKOBJS) - $(CXX) $(LDFLAGS) $(CHECKOBJS) -o $(CHECK) -L. -lbotan-%{so_version} $(LINK_TO) + $(CXX) $(LDFLAGS) $(CHECKOBJS) $(SHARED_LIB) $(LINK_TO) -o $(CHECK) $(STATIC_LIB): $(LIBOBJS) $(RM) $(STATIC_LIB) @@ -80,6 +80,7 @@ $(STATIC_LIB): $(LIBOBJS) $(SHARED_LIB): $(LIBOBJS) $(SO_LINK_CMD) $(LDFLAGS) $(LIBOBJS) -o $(SHARED_LIB) $(LINK_TO) + $(LN) $(SHARED_LIB) $(SONAME) $(LN) $(SHARED_LIB) $(SYMLINK) # Fake Targets |