summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-04-15 02:25:16 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-04-15 02:25:16 +0200
commit08baea013b73607df0c86f24506912c7e6af6f7e (patch)
tree2552f5cc7b5e547ebcc9dc09d4085a344ad1d3e0 /source4/lib
parentb62d7aa8eb2da784186b8cd903775dd12c3f34f7 (diff)
downloadsamba-08baea013b73607df0c86f24506912c7e6af6f7e.tar.gz
samba-08baea013b73607df0c86f24506912c7e6af6f7e.tar.bz2
samba-08baea013b73607df0c86f24506912c7e6af6f7e.zip
Move SOVERSION, VERSION and PC_FILE out of smb_build but use make variables directly instead.
(This used to be commit 9d0ae012b0b463278cd054d06788aa998acc2da2)
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/ldb/config.mk8
-rw-r--r--source4/lib/registry/config.mk8
-rw-r--r--source4/lib/util/config.mk2
3 files changed, 10 insertions, 8 deletions
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index f526a8ce1f..25219eb8b0 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -119,19 +119,21 @@ ldb_tdb_OBJ_FILES = $(addprefix lib/ldb/ldb_tdb/, ldb_tdb.o ldb_search.o ldb_pac
################################################
# Start SUBSYSTEM ldb
[LIBRARY::LIBLDB]
-VERSION = 0.0.1
-SO_VERSION = 0
CFLAGS = -Ilib/ldb/include
-PC_FILE = ldb.pc
INIT_FUNCTION_TYPE = extern const struct ldb_module_ops
PUBLIC_DEPENDENCIES = \
LIBTALLOC
PRIVATE_DEPENDENCIES = \
SOCKET_WRAPPER
+
+PC_FILES += $(ldbdir)/ldb.pc
#
# End SUBSYSTEM ldb
################################################
+LIBLDB_VERSION = 0.0.1
+LIBLDB_SOVERSION = 0
+
LIBLDB_OBJ_FILES = $(addprefix lib/ldb/common/, ldb.o ldb_ldif.o ldb_parse.o ldb_msg.o ldb_utf8.o ldb_debug.o ldb_modules.o ldb_match.o ldb_attributes.o attrib_handlers.o ldb_dn.o ldb_controls.o qsort.o)
PUBLIC_HEADERS += $(ldbdir)/include/ldb.h $(ldbdir)/include/ldb_errors.h
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index affc11d31c..ce19d8512e 100644
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -18,15 +18,17 @@ clean::
################################################
# Start SUBSYSTEM registry
[LIBRARY::registry]
-VERSION = 0.0.1
-PC_FILE = registry.pc
-SO_VERSION = 0
PUBLIC_DEPENDENCIES = \
LIBSAMBA-UTIL CHARSET TDR_REGF LIBLDB \
RPC_NDR_WINREG LDB_WRAP
# End MODULE registry_ldb
################################################
+PC_FILES += lib/registry/registry.pc
+
+registry_VERSION = 0.0.1
+registry_SOVERSION = 0
+
registry_OBJ_FILES = $(addprefix lib/registry/, interface.o util.o samba.o \
patchfile_dotreg.o patchfile_preg.o patchfile.o regf.o \
hive.o local.o ldb.o dir.o rpc.o)
diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk
index fff489d62c..5a4b831ed5 100644
--- a/source4/lib/util/config.mk
+++ b/source4/lib/util/config.mk
@@ -1,6 +1,4 @@
[SUBSYSTEM::LIBSAMBA-UTIL]
-#VERSION = 0.0.1
-#SO_VERSION = 0
PUBLIC_DEPENDENCIES = \
LIBTALLOC LIBCRYPTO \
SOCKET_WRAPPER LIBREPLACE_NETWORK \