[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha2-1152-g6c65968
Jelmer Vernooij
jelmer at samba.org
Fri Feb 29 13:24:46 GMT 2008
The branch, v4-0-test has been updated
via 6c659689ed4081f1d7a6253c538c7f01784197ba (commit)
via 36da52abf5be79e37bd495ec4265e01b27aa9da5 (commit)
via 1dd6bea507f1f5e26cccf89148280721260a4673 (commit)
from 94b0dd7ab0f5cc5493ea8dcfd8be54e1bec26283 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 6c659689ed4081f1d7a6253c538c7f01784197ba
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Feb 29 14:23:38 2008 +0100
Move public header accumulation out of the perl code.
Never install generated prototype files. It's easier to break the
API when using them and they're not easily readable for 3rd party users.
Conflicts:
source/auth/config.mk
source/auth/credentials/config.mk
source/auth/gensec/config.mk
source/build/smb_build/config_mk.pm
source/build/smb_build/main.pl
source/build/smb_build/makefile.pm
source/dsdb/config.mk
source/lib/charset/config.mk
source/lib/tdr/config.mk
source/lib/util/config.mk
source/libcli/config.mk
source/libcli/ldap/config.mk
source/librpc/config.mk
source/param/config.mk
source/rpc_server/config.mk
source/torture/config.mk
commit 36da52abf5be79e37bd495ec4265e01b27aa9da5
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Feb 26 15:19:45 2008 +0100
Fix manpage paths.
commit 1dd6bea507f1f5e26cccf89148280721260a4673
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Feb 26 15:11:47 2008 +0100
Move manpage management out of the perl build system.
-----------------------------------------------------------------------
Summary of changes:
source/auth/config.mk | 6 ++-
source/auth/credentials/config.mk | 5 ++-
source/auth/gensec/config.mk | 5 ++-
source/build/smb_build/README.txt | 3 +-
source/build/smb_build/config_mk.pm | 11 ------
source/build/smb_build/input.pm | 8 ----
source/build/smb_build/main.pl | 2 -
source/build/smb_build/makefile.pm | 22 ------------
source/configure.ac | 2 +
source/dsdb/config.mk | 12 ++++--
source/lib/basic.mk | 12 +++++--
source/lib/charset/config.mk | 6 ++-
source/lib/cmdline/config.mk | 3 +-
source/lib/events/config.mk | 3 +-
source/lib/ldb/config.mk | 11 ++++--
source/lib/ldb/tools/config.mk | 18 +++++++---
source/lib/nss_wrapper/config.mk | 3 +-
source/lib/registry/config.mk | 15 ++++++---
source/lib/socket_wrapper/config.mk | 3 +-
source/lib/talloc/config.mk | 6 ++-
source/lib/tdb/config.mk | 3 +-
source/lib/tdr/config.mk | 5 ++-
source/lib/util/config.mk | 24 +++++++------
source/libcli/auth/config.mk | 4 ++-
source/libcli/config.mk | 13 +++++--
source/libcli/ldap/config.mk | 4 +-
source/libnet/config.mk | 10 +++--
source/librpc/config.mk | 62 +++++++++++++++++++++++-----------
source/ntvfs/config.mk | 3 +-
source/param/config.mk | 8 +++--
source/rpc_server/config.mk | 10 +++--
source/smbd/config.mk | 3 +-
source/torture/config.mk | 17 ++++++---
source/utils/config.mk | 6 ++-
34 files changed, 185 insertions(+), 143 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/auth/config.mk b/source/auth/config.mk
index 5b320bc..7a6ca05 100644
--- a/source/auth/config.mk
+++ b/source/auth/config.mk
@@ -6,10 +6,11 @@ mkinclude credentials/config.mk
[SUBSYSTEM::auth_session]
OBJ_FILES = session.o
-PUBLIC_HEADERS = session.h
PUBLIC_PROTO_HEADER = session_proto.h
PUBLIC_DEPENDENCIES = CREDENTIALS
+PUBLIC_HEADERS += auth/session.h
+
[SUBSYSTEM::auth_system_session]
OBJ_FILES = system_session.o
PUBLIC_PROTO_HEADER = system_session_proto.h
@@ -81,7 +82,6 @@ OBJ_FILES = pam_errors.o
[SUBSYSTEM::auth]
#VERSION = 0.0.1
#SO_VERSION = 0
-PUBLIC_HEADERS = auth.h
PUBLIC_PROTO_HEADER = auth_proto.h
OBJ_FILES = \
auth.o \
@@ -92,6 +92,8 @@ PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
# End SUBSYSTEM auth
#######################
+PUBLIC_HEADERS += auth/auth.h
+
[PYTHON::swig_auth]
PUBLIC_DEPENDENCIES = auth_system_session
PRIVATE_DEPENDENCIES = SAMDB
diff --git a/source/auth/credentials/config.mk b/source/auth/credentials/config.mk
index fee9519..ef8db50 100644
--- a/source/auth/credentials/config.mk
+++ b/source/auth/credentials/config.mk
@@ -1,8 +1,7 @@
#################################
# Start SUBSYSTEM CREDENTIALS
[SUBSYSTEM::CREDENTIALS]
-PUBLIC_PROTO_HEADER = credentials_proto.h
-PUBLIC_HEADERS = credentials.h credentials_krb5.h
+PRIVATE_PROTO_HEADER = credentials_proto.h
OBJ_FILES = credentials.o \
credentials_files.o \
credentials_ntlm.o \
@@ -13,6 +12,8 @@ PUBLIC_DEPENDENCIES = \
PRIVATE_DEPENDENCIES = \
SECRETS
+PUBLIC_HEADERS += $(addprefix auth/credentials/, credentials.h credentials_krb5.h)
+
[PYTHON::swig_credentials]
PUBLIC_DEPENDENCIES = CREDENTIALS LIBCMDLINE_CREDENTIALS
SWIG_FILE = credentials.i
diff --git a/source/auth/gensec/config.mk b/source/auth/gensec/config.mk
index 9aab2c7..b60f039 100644
--- a/source/auth/gensec/config.mk
+++ b/source/auth/gensec/config.mk
@@ -4,14 +4,15 @@
PC_FILE = gensec.pc
VERSION = 0.0.1
SO_VERSION = 0
-PUBLIC_HEADERS = gensec.h spnego.h
-PUBLIC_PROTO_HEADER = gensec_proto.h
+PRIVATE_PROTO_HEADER = gensec_proto.h
OBJ_FILES = gensec.o socket.o
PUBLIC_DEPENDENCIES = \
CREDENTIALS LIBSAMBA-UTIL LIBCRYPTO ASN1_UTIL samba-socket LIBPACKET
# End SUBSYSTEM gensec
#################################
+PUBLIC_HEADERS += $(addprefix auth/gensec/, gensec.h spnego.h)
+
################################################
# Start MODULE gensec_krb5
[MODULE::gensec_krb5]
diff --git a/source/build/smb_build/README.txt b/source/build/smb_build/README.txt
index 5974db9..eac3905 100644
--- a/source/build/smb_build/README.txt
+++ b/source/build/smb_build/README.txt
@@ -1,6 +1,5 @@
The Samba Build System
-----------------------
-----------------------
+======================
The build system basically has two main parts: the autoconf-generated
shell scripts which check for availability of functions and libraries
diff --git a/source/build/smb_build/config_mk.pm b/source/build/smb_build/config_mk.pm
index 4d8db8a..90e4512 100644
--- a/source/build/smb_build/config_mk.pm
+++ b/source/build/smb_build/config_mk.pm
@@ -36,13 +36,9 @@ my $section_types = {
"ENABLE" => "bool",
- "MANPAGE" => "string",
-
"PUBLIC_PROTO_HEADER" => "string",
"PRIVATE_PROTO_HEADER" => "string",
- "PUBLIC_HEADERS" => "list",
-
"CFLAGS" => "list",
"LDFLAGS" => "list",
"STANDARD_VISIBILITY" => "string",
@@ -62,7 +58,6 @@ my $section_types = {
"OUTPUT_TYPE" => "list",
- "MANPAGE" => "string",
"PRIVATE_PROTO_HEADER" => "string",
"CFLAGS" => "list"
@@ -74,7 +69,6 @@ my $section_types = {
"ENABLE" => "bool",
- "MANPAGE" => "string",
"INSTALLDIR" => "string",
"PRIVATE_PROTO_HEADER" => "string",
@@ -102,11 +96,6 @@ my $section_types = {
"ENABLE" => "bool",
- "MANPAGE" => "string",
-
- "PUBLIC_HEADERS" => "list",
-
- "PUBLIC_PROTO_HEADER" => "string",
"PRIVATE_PROTO_HEADER" => "string",
"CFLAGS" => "list",
diff --git a/source/build/smb_build/input.pm b/source/build/smb_build/input.pm
index 8c9a6ef..948f265 100644
--- a/source/build/smb_build/input.pm
+++ b/source/build/smb_build/input.pm
@@ -233,14 +233,6 @@ sub check($$$$$)
my ($INPUT, $enabled, $subsys_ot, $lib_ot, $module_ot) = @_;
foreach my $part (values %$INPUT) {
- unless (defined($part->{PUBLIC_HEADERS})) {
- $part->{PUBLIC_HEADERS} = [];
- }
-
- if (defined($part->{PUBLIC_PROTO_HEADER})) {
- push (@{$part->{PUBLIC_HEADERS}}, $part->{PUBLIC_PROTO_HEADER});
- }
-
if (defined($enabled->{$part->{NAME}})) {
$part->{ENABLE} = $enabled->{$part->{NAME}};
next;
diff --git a/source/build/smb_build/main.pl b/source/build/smb_build/main.pl
index d2d3dc9..6c205a6 100644
--- a/source/build/smb_build/main.pl
+++ b/source/build/smb_build/main.pl
@@ -67,8 +67,6 @@ foreach my $key (values %$OUTPUT) {
$key->{TYPE} eq "PYTHON") and
grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}});
$mkenv->PythonFiles($key) if defined($key->{PYTHON_FILES});
- $mkenv->Manpage($key) if defined($key->{MANPAGE});
- $mkenv->Header($key) if defined($key->{PUBLIC_HEADERS});
$mkenv->ProtoHeader($key) if defined($key->{PRIVATE_PROTO_HEADER}) or
defined($key->{PUBLIC_PROTO_HEADER});
}
diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index a152bfc..06f9d4b 100644
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -295,21 +295,6 @@ sub StaticLibrary($$)
$self->output("$ctx->{RESULT_STATIC_LIBRARY}: \$($ctx->{NAME}_FULL_OBJ_LIST)\n");
}
-sub Header($$)
-{
- my ($self,$ctx) = @_;
-
- return if ($#{$ctx->{PUBLIC_HEADERS}} == -1);
-
- $self->output("PUBLIC_HEADERS +=");
-
- foreach (@{$ctx->{PUBLIC_HEADERS}}) {
- $self->output(" " . output::add_dir_str($ctx->{BASEDIR}, $_));
- }
-
- $self->output("\n");
-}
-
sub Binary($$)
{
my ($self,$ctx) = @_;
@@ -361,13 +346,6 @@ sub PythonFiles($$)
}
}
-sub Manpage($$)
-{
- my ($self,$ctx) = @_;
-
- $self->output("MANPAGES += " . output::add_dir_str($ctx->{BASEDIR}, $ctx->{MANPAGE}) . "\n");
-}
-
sub ProtoHeader($$)
{
my ($self,$ctx) = @_;
diff --git a/source/configure.ac b/source/configure.ac
index 66556ad..5ba4413 100644
--- a/source/configure.ac
+++ b/source/configure.ac
@@ -78,6 +78,8 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1,
AC_DEFINE_UNQUOTED(LDB_MODULESDIR, "${LDB_MODULESDIR}" , [ldb Modules directory])
fi
])
+ ldbdir=lib/ldb
+ AC_SUBST(ldbdir)
m4_include(lib/ldb/sqlite3.m4)
m4_include(lib/ldb/libldb.m4)
SMB_INCLUDE_MK(lib/ldb/config.mk)
diff --git a/source/dsdb/config.mk b/source/dsdb/config.mk
index 17752fb..82119c2 100644
--- a/source/dsdb/config.mk
+++ b/source/dsdb/config.mk
@@ -5,8 +5,7 @@ mkinclude samdb/ldb_modules/config.mk
################################################
# Start SUBSYSTEM SAMDB
[SUBSYSTEM::SAMDB]
-PUBLIC_PROTO_HEADER = samdb/samdb_proto.h
-PUBLIC_HEADERS = samdb/samdb.h
+PRIVATE_PROTO_HEADER = samdb/samdb_proto.h
PUBLIC_DEPENDENCIES = HEIMDAL_KRB5
PRIVATE_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER \
auth_system_session LDAP_ENCODE LIBCLI_AUTH LIBNDR \
@@ -17,6 +16,9 @@ OBJ_FILES = \
samdb/cracknames.o \
repl/replicated_objects.o
+
+PUBLIC_HEADERS += dsdb/samdb/samdb.h
+
[SUBSYSTEM::SAMDB_COMMON]
PUBLIC_PROTO_HEADER = common/proto.h
PRIVATE_DEPENDENCIES = LIBLDB
@@ -26,14 +28,16 @@ OBJ_FILES = \
common/util.o
[SUBSYSTEM::SAMDB_SCHEMA]
-PUBLIC_PROTO_HEADER = schema/proto.h
-PUBLIC_HEADERS = schema/schema.h
+PRIVATE_PROTO_HEADER = schema/proto.h
PRIVATE_DEPENDENCIES = SAMDB_COMMON NDR_DRSUAPI NDR_DRSBLOBS
OBJ_FILES = \
schema/schema_init.o \
schema/schema_syntax.o \
schema/schema_constructed.o \
+
+PUBLIC_HEADERS += dsdb/schema/schema.h
+
#######################
# Start SUBSYSTEM DREPL_SRV
[MODULE::DREPL_SRV]
diff --git a/source/lib/basic.mk b/source/lib/basic.mk
index a118636..d059bdf 100644
--- a/source/lib/basic.mk
+++ b/source/lib/basic.mk
@@ -22,17 +22,23 @@ mkinclude crypto/config.mk
OBJ_FILES = compression/mszip.o
[SUBSYSTEM::GENCACHE]
-PUBLIC_HEADERS = gencache/gencache.h
OBJ_FILES = gencache/gencache.o
PRIVATE_DEPENDENCIES = TDB_WRAP
+
+PUBLIC_HEADERS += lib/gencache/gencache.h
+
[SUBSYSTEM::LDB_WRAP]
-PUBLIC_HEADERS = ldb_wrap.h
OBJ_FILES = ldb_wrap.o
PUBLIC_DEPENDENCIES = LIBLDB
PRIVATE_DEPENDENCIES = LDBSAMBA UTIL_LDB
+
+PUBLIC_HEADERS += lib/ldb_wrap.h
+
[SUBSYSTEM::TDB_WRAP]
-PUBLIC_HEADERS = tdb_wrap.h
OBJ_FILES = tdb_wrap.o
PUBLIC_DEPENDENCIES = LIBTDB
+
+
+PUBLIC_HEADERS += lib/tdb_wrap.h
diff --git a/source/lib/charset/config.mk b/source/lib/charset/config.mk
index 4f0c80c..2766784 100644
--- a/source/lib/charset/config.mk
+++ b/source/lib/charset/config.mk
@@ -5,9 +5,11 @@ OBJ_FILES = \
iconv.o \
charcnv.o \
util_unistr.o
-PUBLIC_HEADERS = charset.h
-PUBLIC_PROTO_HEADER = charset_proto.h
+PRIVATE_PROTO_HEADER = charset_proto.h
PUBLIC_DEPENDENCIES = ICONV
PRIVATE_DEPENDENCIES = DYNCONFIG
# End SUBSYSTEM CHARSET
################################################
+
+
+PUBLIC_HEADERS += lib/charset/charset.h
diff --git a/source/lib/cmdline/config.mk b/source/lib/cmdline/config.mk
index a1f876d..87014d4 100644
--- a/source/lib/cmdline/config.mk
+++ b/source/lib/cmdline/config.mk
@@ -4,10 +4,11 @@ OBJ_FILES = credentials.o
PUBLIC_DEPENDENCIES = CREDENTIALS LIBPOPT
[SUBSYSTEM::POPT_SAMBA]
-PUBLIC_HEADERS = popt_common.h
OBJ_FILES = popt_common.o
PUBLIC_DEPENDENCIES = LIBPOPT
+PUBLIC_HEADERS += lib/cmdline/popt_common.h
+
[SUBSYSTEM::POPT_CREDENTIALS]
PRIVATE_PROTO_HEADER = popt_credentials.h
OBJ_FILES = popt_credentials.o
diff --git a/source/lib/events/config.mk b/source/lib/events/config.mk
index 910cf37..225a23c 100644
--- a/source/lib/events/config.mk
+++ b/source/lib/events/config.mk
@@ -32,11 +32,12 @@ INIT_FUNCTION = s4_events_standard_init
# Start SUBSYSTEM LIBEVENTS
[SUBSYSTEM::LIBEVENTS]
OBJ_FILES = events.o events_timed.o events_signal.o
-PUBLIC_HEADERS = events.h events_internal.h
PUBLIC_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL
# End SUBSYSTEM LIBEVENTS
##############################
+PUBLIC_HEADERS += $(addprefix lib/events/, events.h events_internal.h)
+
[PYTHON::swig_events]
SWIG_FILE = events.i
PRIVATE_DEPENDENCIES = LIBEVENTS
diff --git a/source/lib/ldb/config.mk b/source/lib/ldb/config.mk
index d6980f3..81fd1e9 100644
--- a/source/lib/ldb/config.mk
+++ b/source/lib/ldb/config.mk
@@ -147,12 +147,14 @@ PUBLIC_DEPENDENCIES = \
LIBTALLOC
PRIVATE_DEPENDENCIES = \
SOCKET_WRAPPER
-MANPAGE = man/ldb.3
-PUBLIC_HEADERS = include/ldb.h include/ldb_errors.h
#
# End SUBSYSTEM ldb
################################################
+PUBLIC_HEADERS += $(ldbdir)/include/ldb.h $(ldbdir)/include/ldb_errors.h
+
+MANPAGES += $(ldbdir)/man/ldb.3
+
################################################
# Start BINARY ldbtest
[BINARY::ldbtest]
@@ -167,7 +169,6 @@ PRIVATE_DEPENDENCIES = \
# Start BINARY oLschema2ldif
[BINARY::oLschema2ldif]
INSTALLDIR = BINDIR
-MANPAGE = man/oLschema2ldif.1
OBJ_FILES= \
tools/convert.o \
tools/oLschema2ldif.o
@@ -176,11 +177,12 @@ PRIVATE_DEPENDENCIES = \
# End BINARY oLschema2ldif
################################################
+MANPAGES += $(ldbdir)/man/oLschema2ldif.1
+
################################################
# Start BINARY ad2oLschema
[BINARY::ad2oLschema]
INSTALLDIR = BINDIR
-MANPAGE = man/ad2oLschema.1
OBJ_FILES= \
tools/convert.o \
tools/ad2oLschema.o
@@ -189,6 +191,7 @@ PRIVATE_DEPENDENCIES = \
# End BINARY ad2oLschema
################################################
+MANPAGES += $(ldbdir)/man/ad2oLschema.1
mkinclude tools/config.mk
mkinclude ldb_ildap/config.mk
diff --git a/source/lib/ldb/tools/config.mk b/source/lib/ldb/tools/config.mk
index bf6c5f9..02ad84a 100644
--- a/source/lib/ldb/tools/config.mk
+++ b/source/lib/ldb/tools/config.mk
@@ -17,10 +17,11 @@ OBJ_FILES = \
ldbadd.o
PRIVATE_DEPENDENCIES = \
LIBLDB_CMDLINE LIBCLI_RESOLVE
-MANPAGE = ../man/ldbadd.1
# End BINARY ldbadd
################################################
+MANPAGES += $(ldbdir)/man/ldbadd.1
+
################################################
# Start BINARY ldbdel
[BINARY::ldbdel]
@@ -29,10 +30,11 @@ OBJ_FILES= \
ldbdel.o
PRIVATE_DEPENDENCIES = \
LIBLDB_CMDLINE
-MANPAGE = ../man/ldbdel.1
# End BINARY ldbdel
################################################
+MANPAGES += $(ldbdir)/man/ldbdel.1
+
################################################
# Start BINARY ldbmodify
[BINARY::ldbmodify]
@@ -41,10 +43,11 @@ OBJ_FILES= \
ldbmodify.o
PRIVATE_DEPENDENCIES = \
LIBLDB_CMDLINE
-MANPAGE = ../man/ldbmodify.1
# End BINARY ldbmodify
################################################
+MANPAGES += $(ldbdir)/man/ldbmodify.1
+
################################################
# Start BINARY ldbsearch
[BINARY::ldbsearch]
@@ -53,10 +56,11 @@ OBJ_FILES= \
ldbsearch.o
PRIVATE_DEPENDENCIES = \
LIBLDB_CMDLINE
-MANPAGE = ../man/ldbsearch.1
# End BINARY ldbsearch
################################################
+MANPAGES += $(ldbdir)/man/ldbsearch.1
+
################################################
# Start BINARY ldbedit
[BINARY::ldbedit]
@@ -65,10 +69,11 @@ OBJ_FILES= \
ldbedit.o
PRIVATE_DEPENDENCIES = \
LIBLDB_CMDLINE
-MANPAGE = ../man/ldbedit.1
# End BINARY ldbedit
################################################
+MANPAGES += $(ldbdir)/man/ldbedit.1
+
################################################
# Start BINARY ldbrename
[BINARY::ldbrename]
@@ -77,8 +82,9 @@ OBJ_FILES= \
ldbrename.o
PRIVATE_DEPENDENCIES = \
LIBLDB_CMDLINE
-MANPAGE = ../man/ldbrename.1
# End BINARY ldbrename
################################################
+MANPAGES += $(ldbdir)/man/ldbrename.1
+
diff --git a/source/lib/nss_wrapper/config.mk b/source/lib/nss_wrapper/config.mk
index b46f7c3..81b0ef3 100644
--- a/source/lib/nss_wrapper/config.mk
+++ b/source/lib/nss_wrapper/config.mk
@@ -1,7 +1,8 @@
##############################
# Start SUBSYSTEM NSS_WRAPPER
[SUBSYSTEM::NSS_WRAPPER]
-PUBLIC_HEADERS = nss_wrapper.h
OBJ_FILES = nss_wrapper.o
# End SUBSYSTEM NSS_WRAPPER
##############################
+
+PUBLIC_HEADERS += lib/nss_wrapper/nss_wrapper.h
diff --git a/source/lib/registry/config.mk b/source/lib/registry/config.mk
index 7a9c8fc..b2d7ce2 100644
--- a/source/lib/registry/config.mk
+++ b/source/lib/registry/config.mk
@@ -36,10 +36,11 @@ OBJ_FILES = \
PUBLIC_DEPENDENCIES = \
--
Samba Shared Repository
More information about the samba-cvs
mailing list