sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-29 11:21:54 +03:00
Code

Merge branch 'v4-0-trivial' into v4-0-gmake3

Browse Source 
Conflicts:

	source/build/smb_build/makefile.pm
This commit is contained in:
Jelmer Vernooij 2008-02-18 13:33:35 +01:00
commit 4d19027046
5 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/build/smb_build/input.pm
View File

@ -207,13 +207,26 @@ sub import_integrated($$)
}
}
sub add_implicit($$)
{
my ($INPUT, $n) = @_;
$INPUT->{$n} = {
TYPE => "MAKE_RULE",
NAME => $n,
TARGET => lc($n),
LIBS => "\$(".uc($n)."_LIBS)",
CFLAGS => "\$(".uc($n)."_CFLAG)"
};
}
sub calc_unique_deps($$$$$$$$)
{
sub calc_unique_deps($$$$$$$$);
my ($name, $INPUT, $deps, $udeps, $withlibs, $forward, $pubonly, $busy) = @_;
foreach my $n (@$deps) {
die("Dependency unknown: $n (for $name)") unless (defined($INPUT->{$n}));
add_implicit($INPUT, $n) unless (defined($INPUT->{$n}));
die("Recursive dependency: $n, list: " . join(',', @$busy)) if (grep (/^$n$/, @$busy));
next if (grep /^$n$/, @$udeps);
my $dep = $INPUT->{$n};

4
source/build/smb_build/main.pl
View File

@ -19,8 +19,8 @@ my $INPUT = {};
my $mkfile = smb_build::config_mk::run_config_mk($INPUT, $config::config{srcdir}, $config::config{builddir}, "main.mk");
my $subsys_output_type;
#$subsys_output_type = ["MERGED_OBJ"];
$subsys_output_type = ["STATIC_LIBRARY"];
$subsys_output_type = ["MERGED_OBJ"];
#$subsys_output_type = ["STATIC_LIBRARY"];
my $library_output_type;
if ($config::config{USESHARED} eq "true") {

1
source/headermap.txt
View File

@ -120,3 +120,4 @@ lib/util/wrap_xattr.h: wrap_xattr.h
lib/events/events.h: events/events.h
lib/events/events_internal.h: events/events_internal.h
libcli/ldap/ldap_ndr.h: ldb/ldap_ndr.h
lib/gencache/gencache.h: gencache.h

1
source/heimdal_build/config.mk
View File

@ -412,7 +412,6 @@ OBJ_FILES = \
../heimdal/lib/roken/estrdup.o \
../heimdal/lib/roken/erealloc.o \
../heimdal/lib/roken/simple_exec.o \
../heimdal/lib/roken/simple_exec.o \
../heimdal/lib/roken/strcollect.o \
../heimdal/lib/roken/rtbl.o \
replace.o

2
source/libcli/config.mk
View File

@ -118,7 +118,7 @@ PUBLIC_DEPENDENCIES = LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH \
[SUBSYSTEM::LIBCLI_RAW]
PRIVATE_PROTO_HEADER = raw/raw_proto.h
PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE LP_RESOLVE gensec LIBCLI_RESOLVE LIBSECURITY LIBNDR
LDFLAGS = $(LIBCLI_SMB_COMPOSITE_OUTPUT)
#LDFLAGS = $(LIBCLI_SMB_COMPOSITE_OUTPUT)
PUBLIC_DEPENDENCIES = samba-socket LIBPACKET gensec LIBCRYPTO CREDENTIALS
OBJ_FILES = raw/rawfile.o \
raw/smb_signing.o \