diff options
| -rwxr-xr-x | configure.pl | 7 | ||||
| -rw-r--r-- | src/build-data/makefile/unix.in | 6 | ||||
| -rw-r--r-- | src/build-data/makefile/unix_shr.in | 13 |
3 files changed, 12 insertions, 14 deletions
diff --git a/configure.pl b/configure.pl index 6f9c0243d..53b7897e5 100755 --- a/configure.pl +++ b/configure.pl @@ -15,7 +15,10 @@ my $MAJOR_VERSION = 1; my $MINOR_VERSION = 8; my $PATCH_VERSION = 3; +my $SO_PATCH_VERSION = 2; + my $VERSION_STRING = "$MAJOR_VERSION.$MINOR_VERSION.$PATCH_VERSION"; +my $SO_VERSION_STRING = "$MAJOR_VERSION.$MINOR_VERSION.$SO_PATCH_VERSION"; ################################################## # Data # @@ -82,6 +85,7 @@ sub main { 'version_minor' => $MINOR_VERSION, 'version_patch' => $PATCH_VERSION, 'version' => $VERSION_STRING, + 'so_version' => $SO_VERSION_STRING, }); get_options($config); @@ -750,7 +754,8 @@ sub get_options { 'help' => sub { display_help(); }, 'module-info' => sub { emit_help(module_info()); }, - 'version' => sub { emit_help("Botan $VERSION_STRING\n") }, + 'version' => sub { emit_help("$VERSION_STRING\n") }, + 'so-version' => sub { emit_help("$SO_VERSION_STRING\n") }, 'with-tr1-implementation=s' => sub { $$config{'tr1'} = $_[1]; }, diff --git a/src/build-data/makefile/unix.in b/src/build-data/makefile/unix.in index b97c50a4f..4025eed29 100644 --- a/src/build-data/makefile/unix.in +++ b/src/build-data/makefile/unix.in @@ -12,11 +12,7 @@ LINK_TO = @{var:link_to} ################################################## # Version Numbers # ################################################## -MAJOR = @{var:version_major} -MINOR = @{var:version_minor} -PATCH = @{var:version_patch} - -VERSION = $(MAJOR).$(MINOR).$(PATCH) +VERSION = @{var:version} ################################################## # Installation Settings # diff --git a/src/build-data/makefile/unix_shr.in b/src/build-data/makefile/unix_shr.in index f98b10f2b..fec3a3654 100644 --- a/src/build-data/makefile/unix_shr.in +++ b/src/build-data/makefile/unix_shr.in @@ -14,11 +14,8 @@ LINK_TO = @{var:link_to} ################################################## # Version Numbers # ################################################## -MAJOR = @{var:version_major} -MINOR = @{var:version_minor} -PATCH = @{var:version_patch} - -VERSION = $(MAJOR).$(MINOR).$(PATCH) +VERSION = @{var:version} +SO_VERSION = @{var:so_version} ################################################## # Installation Settings # @@ -70,8 +67,8 @@ LIBRARIES = $(STATIC_LIB) $(SHARED_LIB) LIBNAME = @{var:lib_prefix}libbotan STATIC_LIB = $(LIBNAME).a -SHARED_LIB = $(LIBNAME)-$(MAJOR).$(MINOR).$(PATCH).@{var:so_suffix} -SONAME = $(LIBNAME)-$(MAJOR).$(MINOR).$(PATCH).@{var:so_suffix} +SHARED_LIB = $(LIBNAME)-$(SO_VERSION).@{var:so_suffix} +SONAME = $(LIBNAME)-$(SO_VERSION).@{var:so_suffix} SYMLINK = libbotan.@{var:so_suffix} @@ -88,7 +85,7 @@ all: $(LIBRARIES) # Link Commands # ################################################## $(CHECK): $(LIBRARIES) $(CHECKOBJS) - $(CXX) $(CHECKOBJS) -L. -lbotan-@{var:version} $(LINK_TO) -o $(CHECK) + $(CXX) $(CHECKOBJS) -L. -lbotan $(LINK_TO) -o $(CHECK) $(STATIC_LIB): $(LIBOBJS) $(RM) $(STATIC_LIB) |