From e153a8099e9a187e6bcac6507ed4b1ddfe7cb764 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 13 Mar 2006 16:32:44 +0000 Subject: r14327: Replace MAJOR_VERSION/MINOR_VERSION/RELEASE_VERSION with two parameters: - VERSION: should contain the current version. Will be made part of the filename. - SO_VERSION: should contain the latest version that this on is compatible to. Will be used for setting the soname of the shared library. Fix sonames and use them on platforms that support them Remove symlinking code. ldconfig will take care of creating the symlinks now that we set the soname. (This used to be commit 7871b07e21c85c63d0ecac4c31b98dc112d18af5) --- source4/lib/ldb/config.mk | 5 ++--- source4/lib/registry/config.mk | 5 ++--- source4/lib/samba3/config.mk | 5 ++--- source4/lib/socket_wrapper/config.mk | 5 ++--- source4/lib/talloc/config.mk | 5 ++--- source4/lib/tdb/config.mk | 5 ++--- source4/lib/tdr/config.mk | 5 ++--- source4/lib/util/config.mk | 5 ++--- 8 files changed, 16 insertions(+), 24 deletions(-) (limited to 'source4/lib') diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index da9f5f7076..5fbe782626 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -132,11 +132,10 @@ NOPROTO = YES ################################################ # Start SUBSYSTEM ldb [LIBRARY::ldb] -MAJOR_VERSION = 0 -MINOR_VERSION = 0 +VERSION = 0.0.1 +SO_VERSION = 0.0.1 DESCRIPTION = LDAP-like embedded database library INIT_FUNCTION_TYPE = int (*) (void) -RELEASE_VERSION = 1 OBJ_FILES = \ common/ldb.o \ common/ldb_ldif.o \ diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk index 1c006b3e09..4456d57ccc 100644 --- a/source4/lib/registry/config.mk +++ b/source4/lib/registry/config.mk @@ -84,10 +84,9 @@ REQUIRED_SUBSYSTEMS = \ ################################################ # Start SUBSYSTEM registry [LIBRARY::registry] -MAJOR_VERSION = 0 -MINOR_VERSION = 0 +VERSION = 0.0.1 +SO_VERSION = 0.0.1 DESCRIPTION = Windows-style registry library -RELEASE_VERSION = 1 OBJ_FILES = \ common/reg_interface.o \ common/reg_util.o \ diff --git a/source4/lib/samba3/config.mk b/source4/lib/samba3/config.mk index fc741ced0d..9411f12913 100644 --- a/source4/lib/samba3/config.mk +++ b/source4/lib/samba3/config.mk @@ -1,9 +1,8 @@ ################################################ # Start SUBSYSTEM LIBSAMBA3 [LIBRARY::LIBSAMBA3] -MAJOR_VERSION = 0 -MINOR_VERSION = 0 -RELEASE_VERSION = 1 +VERSION = 0.0.1 +SO_VERSION = 0.0.1 DESCRIPTION = Library for reading Samba3 data files PRIVATE_PROTO_HEADER = samba3_proto.h PUBLIC_HEADERS = samba3.h diff --git a/source4/lib/socket_wrapper/config.mk b/source4/lib/socket_wrapper/config.mk index 38eabee6b3..dcc3835194 100644 --- a/source4/lib/socket_wrapper/config.mk +++ b/source4/lib/socket_wrapper/config.mk @@ -1,9 +1,8 @@ ############################## # Start SUBSYSTEM SOCKET_WRAPPER [LIBRARY::SOCKET_WRAPPER] -MAJOR_VERSION = 0 -MINOR_VERSION = 0 -RELEASE_VERSION = 1 +VERSION = 0.0.1 +SO_VERSION = 0.0.1 NOPROTO = YES DESCRIPTION = Wrapper library for testing TCP/IP connections using Unix Sockets PUBLIC_HEADERS = socket_wrapper.h diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk index 70be4d0f4f..e63edb0139 100644 --- a/source4/lib/talloc/config.mk +++ b/source4/lib/talloc/config.mk @@ -1,9 +1,8 @@ ################################################ # Start LIBRARY LIBTALLOC [LIBRARY::LIBTALLOC] -MAJOR_VERSION = 0 -MINOR_VERSION = 0 -RELEASE_VERSION = 1 +VERSION = 0.0.1 +SO_VERSION = 0.0.1 OBJ_FILES = talloc.o REQUIRED_SUBSYSTEMS = LIBREPLACE NOPROTO = YES diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk index c9785775d1..b6595ea2ba 100644 --- a/source4/lib/tdb/config.mk +++ b/source4/lib/tdb/config.mk @@ -1,9 +1,8 @@ ################################################ # Start SUBSYSTEM LIBTDB [LIBRARY::LIBTDB] -MAJOR_VERSION = 0 -MINOR_VERSION = 0 -RELEASE_VERSION = 1 +VERSION = 0.0.1 +SO_VERSION = 0.0.1 DESCRIPTION = Trivial Database Library OBJ_FILES = \ common/tdb.o common/dump.o common/io.o common/lock.o \ diff --git a/source4/lib/tdr/config.mk b/source4/lib/tdr/config.mk index f42aeeb75b..8aa3f85056 100644 --- a/source4/lib/tdr/config.mk +++ b/source4/lib/tdr/config.mk @@ -1,8 +1,7 @@ [LIBRARY::TDR] PUBLIC_HEADERS = tdr.h -MAJOR_VERSION = 0 -MINOR_VERSION = 0 -RELEASE_VERSION = 1 +VERSION = 0.0.1 +SO_VERSION = 0.0.1 DESCRIPTION = Simple marshall/unmarshall library PRIVATE_PROTO_HEADER = tdr_proto.h OBJ_FILES = tdr.o diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk index cf2e038709..9740de2020 100644 --- a/source4/lib/util/config.mk +++ b/source4/lib/util/config.mk @@ -1,7 +1,6 @@ [LIBRARY::LIBBASIC] -MAJOR_VERSION = 0 -MINOR_VERSION = 0 -RELEASE_VERSION = 1 +VERSION = 0.0.1 +SO_VERSION = 0.0.1 DESCRIPTION = Generic utility functions PRIVATE_PROTO_HEADER = util_proto.h PUBLIC_HEADERS = util.h \ -- cgit