diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/build-data/makefile/unix.in | 6 | ||||
| -rw-r--r-- | src/build-data/makefile/unix_shr.in | 13 |
2 files changed, 6 insertions, 13 deletions
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) |