[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha3-152-g9d0ae01
Jelmer Vernooij
jelmer at samba.org
Tue Apr 15 00:33:34 GMT 2008
The branch, v4-0-test has been updated
via 9d0ae012b0b463278cd054d06788aa998acc2da2 (commit)
from fac3463dd505404998b6b00526f1dad6ae47ba84 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 9d0ae012b0b463278cd054d06788aa998acc2da2
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Apr 15 02:25:16 2008 +0200
Move SOVERSION, VERSION and PC_FILE out of smb_build but use make variables directly instead.
-----------------------------------------------------------------------
Summary of changes:
source/auth/gensec/config.mk | 7 +++--
source/build/m4/public.m4 | 2 -
source/build/smb_build/config_mk.pm | 4 ---
source/build/smb_build/input.pm | 10 ---------
source/build/smb_build/makefile.pm | 5 +---
source/lib/ldb/config.mk | 8 ++++--
source/lib/registry/config.mk | 8 ++++--
source/lib/util/config.mk | 2 -
source/libcli/config.mk | 2 -
source/librpc/config.mk | 37 ++++++++++++++++++-----------------
source/param/config.mk | 8 ++++--
source/torture/config.mk | 7 +----
12 files changed, 41 insertions(+), 59 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/auth/gensec/config.mk b/source/auth/gensec/config.mk
index 7cb673c..cfb3493 100644
--- a/source/auth/gensec/config.mk
+++ b/source/auth/gensec/config.mk
@@ -1,15 +1,16 @@
#################################
# Start SUBSYSTEM gensec
[LIBRARY::gensec]
-PC_FILE = gensec.pc
-VERSION = 0.0.1
-SO_VERSION = 0
PRIVATE_PROTO_HEADER = gensec_proto.h
PUBLIC_DEPENDENCIES = \
CREDENTIALS LIBSAMBA-UTIL LIBCRYPTO ASN1_UTIL samba-socket LIBPACKET
# End SUBSYSTEM gensec
#################################
+PC_FILES += auth/gensec/gensec.pc
+
+gensec_VERSION = 0.0.1
+gensec_SOVERSION = 0
gensec_OBJ_FILES = $(addprefix auth/gensec/, gensec.o socket.o)
PUBLIC_HEADERS += auth/gensec/gensec.h
diff --git a/source/build/m4/public.m4 b/source/build/m4/public.m4
index 01bf565..1eae998 100644
--- a/source/build/m4/public.m4
+++ b/source/build/m4/public.m4
@@ -52,8 +52,6 @@ SMB_INFO_LIBRARIES="$SMB_INFO_LIBRARIES
# Start Library $1
@<:@LIBRARY::$1@:>@
PRIVATE_DEPENDENCIES = $3
-VERSION = $4
-SO_VERSION = $5
CFLAGS = \$($1_CFLAGS)
LDFLAGS = \$($1_LDFLAGS)
ENABLE = YES
diff --git a/source/build/smb_build/config_mk.pm b/source/build/smb_build/config_mk.pm
index de786dd..307c391 100644
--- a/source/build/smb_build/config_mk.pm
+++ b/source/build/smb_build/config_mk.pm
@@ -73,12 +73,8 @@ my $section_types = {
"USE_HOSTCC" => "bool"
},
"LIBRARY" => {
- "VERSION" => "string",
- "SO_VERSION" => "string",
"LIBRARY_REALNAME" => "string",
- "PC_FILE" => "string",
-
"INIT_FUNCTION_TYPE" => "string",
"INIT_FUNCTION_SENTINEL" => "string",
"OUTPUT_TYPE" => "list",
diff --git a/source/build/smb_build/input.pm b/source/build/smb_build/input.pm
index bb6a120..3ca2f22 100644
--- a/source/build/smb_build/input.pm
+++ b/source/build/smb_build/input.pm
@@ -125,16 +125,6 @@ sub check_library($$$)
unless (defined($lib->{OUTPUT_TYPE})) { $lib->{OUTPUT_TYPE} = $default_ot; }
- if (defined($lib->{VERSION}) and not defined($lib->{SO_VERSION})) {
- print "$lib->{NAME}: Please specify SO_VERSION when specifying VERSION\n";
- return;
- }
-
- if (defined($lib->{SO_VERSION}) and not defined($lib->{VERSION})) {
- print "$lib->{NAME}: Please specify VERSION when specifying SO_VERSION\n";
- return;
- }
-
unless (defined($lib->{INIT_FUNCTION_TYPE})) { $lib->{INIT_FUNCTION_TYPE} = "NTSTATUS (*) (void)"; }
unless (defined($lib->{INIT_FUNCTION_SENTINEL})) { $lib->{INIT_FUNCTION_SENTINEL} = "NULL"; }
unless (defined($lib->{INSTALLDIR})) { $lib->{INSTALLDIR} = "LIBDIR"; }
diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index 9518c2e..81aac2f 100644
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -214,9 +214,6 @@ sub SharedLibraryPrimitives($$)
{
my ($self,$ctx) = @_;
- $self->output("$ctx->{NAME}_SOVERSION = $ctx->{SO_VERSION}\n") if (defined($ctx->{SO_VERSION}));
- $self->output("$ctx->{NAME}_VERSION = $ctx->{VERSION}\n") if (defined($ctx->{VERSION}));
-
if (not grep(/STATIC_LIBRARY/, @{$ctx->{OUTPUT_TYPE}})) {
$self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
$self->_prepare_list($ctx, "FULL_OBJ_LIST");
@@ -231,7 +228,7 @@ sub SharedLibrary($$)
$ctx->{LIBRARY_SONAME} = "";
}
- $self->output("SHARED_LIBS += $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}\n") if (defined($ctx->{SO_VERSION}));
+ $self->output("SHARED_LIBS += $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}\n");
$self->_prepare_list($ctx, "DEPEND_LIST");
$self->_prepare_list($ctx, "LINK_FLAGS");
diff --git a/source/lib/ldb/config.mk b/source/lib/ldb/config.mk
index f526a8c..25219eb 100644
--- a/source/lib/ldb/config.mk
+++ b/source/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/source/lib/registry/config.mk b/source/lib/registry/config.mk
index affc11d..ce19d85 100644
--- a/source/lib/registry/config.mk
+++ b/source/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/source/lib/util/config.mk b/source/lib/util/config.mk
index fff489d..5a4b831 100644
--- a/source/lib/util/config.mk
+++ b/source/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 \
diff --git a/source/libcli/config.mk b/source/libcli/config.mk
index 1ed52ca..95b4500 100644
--- a/source/libcli/config.mk
+++ b/source/libcli/config.mk
@@ -42,8 +42,6 @@ PRIVATE_PROTO_HEADER = nbt/nbtname.h
NDR_NBT_BUF_OBJ_FILES = libcli/nbt/nbtname.o
[SUBSYSTEM::LIBCLI_NBT]
-#VERSION = 0.0.1
-#SO_VERSION = 0
PRIVATE_PROTO_HEADER = nbt/nbt_proto.h
PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT LIBCLI_COMPOSITE LIBEVENTS \
NDR_SECURITY samba-socket LIBSAMBA-UTIL
diff --git a/source/librpc/config.mk b/source/librpc/config.mk
index abf7a43..92409da 100644
--- a/source/librpc/config.mk
+++ b/source/librpc/config.mk
@@ -1,21 +1,19 @@
################################################
# Start SUBSYSTEM LIBNDR
[LIBRARY::LIBNDR]
-VERSION = 0.0.1
-SO_VERSION = 0
-PC_FILE = ndr.pc
PRIVATE_PROTO_HEADER = ndr/libndr_proto.h
PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC LIBSAMBA-UTIL CHARSET \
LIBSAMBA-HOSTCONFIG
+
+LIBNDR_OBJ_FILES = $(addprefix librpc/ndr/, ndr.o ndr_basic.o ndr_string.o uuid.o)
+
+PC_FILES += librpc/ndr.pc
+LIBNDR_VERSION = 0.0.1
+LIBNDR_SOVERSION = 0
+
# End SUBSYSTEM LIBNDR
################################################
-LIBNDR_OBJ_FILES = \
- librpc/ndr/ndr.o \
- librpc/ndr/ndr_basic.o \
- librpc/ndr/ndr_string.o \
- librpc/ndr/uuid.o
-
PUBLIC_HEADERS += librpc/ndr/libndr.h
#################################
@@ -430,10 +428,11 @@ RPC_NDR_UNIXINFO_OBJ_FILES = librpc/gen_ndr/ndr_unixinfo_c.o
[LIBRARY::dcerpc_samr]
PUBLIC_DEPENDENCIES = dcerpc NDR_SAMR
-PC_FILE = dcerpc_samr.pc
-VERSION = 0.0.1
-SO_VERSION = 0
+PC_FILES += librpc/dcerpc_samr.pc
+
+dcerpc_samr_VERSION = 0.0.1
+dcerpc_samr_SOVERSION = 0
dcerpc_samr_OBJ_FILES = librpc/gen_ndr/ndr_samr_c.o
[SUBSYSTEM::RPC_NDR_SPOOLSS]
@@ -460,11 +459,12 @@ PUBLIC_HEADERS += librpc/gen_ndr/ndr_svcctl_c.h
[LIBRARY::dcerpc_atsvc]
PUBLIC_DEPENDENCIES = dcerpc NDR_ATSVC
-PC_FILE = dcerpc_atsvc.pc
-VERSION = 0.0.1
-SO_VERSION = 0
+
+dcerpc_atsvc_VERSION = 0.0.1
+dcerpc_atsvc_SOVERSION = 0
dcerpc_atsvc_OBJ_FILES = librpc/gen_ndr/ndr_atsvc_c.o
+PC_FILES += librpc/dcerpc_atsvc.pc
PUBLIC_HEADERS += librpc/gen_ndr/ndr_atsvc_c.h
@@ -573,9 +573,6 @@ PUBLIC_HEADERS += $(addprefix librpc/, gen_ndr/dcerpc.h gen_ndr/ndr_dcerpc.h)
################################################
# Start SUBSYSTEM dcerpc
[LIBRARY::dcerpc]
-VERSION = 0.0.1
-SO_VERSION = 0
-PC_FILE = dcerpc.pc
PRIVATE_PROTO_HEADER = rpc/dcerpc_proto.h
PRIVATE_DEPENDENCIES = \
samba-socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 \
@@ -588,6 +585,10 @@ PUBLIC_DEPENDENCIES = CREDENTIALS
# End SUBSYSTEM dcerpc
################################################
+PC_FILES += librpc/dcerpc.pc
+dcerpc_VERSION = 0.0.1
+dcerpc_SOVERSION = 0
+
dcerpc_OBJ_FILES = $(addprefix librpc/rpc/, dcerpc.o dcerpc_auth.o dcerpc_schannel.o dcerpc_util.o \
dcerpc_error.o dcerpc_smb.o dcerpc_smb2.o dcerpc_sock.o dcerpc_connect.o dcerpc_secondary.o)
diff --git a/source/param/config.mk b/source/param/config.mk
index fcec88f..42cb6f3 100644
--- a/source/param/config.mk
+++ b/source/param/config.mk
@@ -1,10 +1,10 @@
[LIBRARY::LIBSAMBA-HOSTCONFIG]
-VERSION = 0.0.1
-SO_VERSION = 0
-PC_FILE = samba-hostconfig.pc
PUBLIC_DEPENDENCIES = LIBSAMBA-UTIL
PRIVATE_DEPENDENCIES = DYNCONFIG LIBREPLACE_EXT CHARSET
+LIBSAMBA-HOSTCONFIG_VERSION = 0.0.1
+LIBSAMBA-HOSTCONFIG-SOVERSION = 0
+
LIBSAMBA-HOSTCONFIG_OBJ_FILES = param/loadparm.o \
param/generic.o \
param/util.o \
@@ -12,6 +12,8 @@ LIBSAMBA-HOSTCONFIG_OBJ_FILES = param/loadparm.o \
PUBLIC_HEADERS += param/param.h
+PC_FILES += param/samba-hostconfig.pc
+
[SUBSYSTEM::PROVISION]
PRIVATE_DEPENDENCIES = LIBPYTHON
diff --git a/source/torture/config.mk b/source/torture/config.mk
index dc2b1c5..e6c5402 100644
--- a/source/torture/config.mk
+++ b/source/torture/config.mk
@@ -1,8 +1,5 @@
# TORTURE subsystem
[LIBRARY::torture]
-SO_VERSION = 0
-VERSION = 0.0.1
-PC_FILE = torture.pc
PRIVATE_PROTO_HEADER = proto.h
PUBLIC_DEPENDENCIES = \
LIBSAMBA-HOSTCONFIG \
@@ -10,7 +7,7 @@ PUBLIC_DEPENDENCIES = \
LIBTALLOC \
LIBPOPT
-
+PC_FILES += torture/torture.pc
torture_OBJ_FILES = $(addprefix torture/, torture.o ui.o)
PUBLIC_HEADERS += torture/torture.h torture/ui.h
@@ -19,7 +16,7 @@ PUBLIC_HEADERS += torture/torture.h torture/ui.h
PRIVATE_DEPENDENCIES = LIBCLI_RAW LIBPYTHON smbcalls PROVISION
PUBLIC_DEPENDENCIES = POPT_CREDENTIALS
-TORTURE_UTIL_OBJ_FILES = torture/util_smb.o
+TORTURE_UTIL_OBJ_FILES = $(addprefix torture/, util_smb.o)
#################################
# Start SUBSYSTEM TORTURE_BASIC
--
Samba Shared Repository
More information about the samba-cvs
mailing list