sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

r12638: fix the build on BSD systems

Browse Source 
metze
(This used to be commit cd3cc29fdc)
This commit is contained in:
Stefan Metzmacher 2005-12-31 08:19:48 +00:00 committed by Gerald (Jerry) Carter
parent 7dae041b1a
commit d73156d2c4
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source4/build/smb_build/config_mk.pm
View File

@ -29,8 +29,8 @@ my $section_types = {
"MANPAGE" => "string",
"PUBLIC_PROTO_HEADER" => "string",
"PRIVATE_PROTO_HEADER" => "string"
"PUBLIC_PROTO_HEADER" => "string",
"PRIVATE_PROTO_HEADER" => "string"
},
"MODULE" => {
"SUBSYSTEM" => "string",
@ -44,7 +44,7 @@ my $section_types = {
"NOPROTO" => "bool",
"MANPAGE" => "string",
"PRIVATE_PROTO_HEADER" => "string"
"PRIVATE_PROTO_HEADER" => "string"
},
"BINARY" => {
"OBJ_FILES" => "list",
@ -56,7 +56,7 @@ my $section_types = {
"MANPAGE" => "string",
"INSTALLDIR" => "string",
"PRIVATE_PROTO_HEADER" => "string"
"PRIVATE_PROTO_HEADER" => "string"
},
"LIBRARY" => {
"MAJOR_VERSION" => "string",
@ -65,7 +65,7 @@ my $section_types = {
"OBJ_FILES" => "list",
"DESCRIPTION" => "string",
"DESCRIPTION" => "string",
"REQUIRED_SUBSYSTEMS" => "list",
@ -74,10 +74,10 @@ my $section_types = {
"MANPAGE" => "string",
"PUBLIC_HEADERS" => "list",
"PUBLIC_HEADERS" => "list",
"PUBLIC_PROTO_HEADER" => "string",
"PRIVATE_PROTO_HEADER" => "string"
"PUBLIC_PROTO_HEADER" => "string",
"PRIVATE_PROTO_HEADER" => "string"
}
};
@ -174,7 +174,7 @@ sub run_config_mk($$$)
$input->{$name}{NAME} = $name;
$input->{$name}{TYPE} = $type;
$input->{$name}{BASEDIR} = $srcdir."/".dirname($filename);
$input->{$name}{BASEDIR} = dirname($filename);
foreach my $key (values %{$result->{$section}}) {
$key->{VAL} = smb_build::input::strtrim($key->{VAL});

8
source4/lib/registry/config.mk
View File

@ -16,9 +16,11 @@ REQUIRED_SUBSYSTEMS = TDR
NOPROTO = YES
OBJ_FILES = tdr_regf.o
$(srcdir)/lib/registry/reg_backend_nt4.c: $(builddir)/lib/registry/tdr_regf.c
$(builddir)/lib/registry/tdr_regf.c: $(srcdir)/lib/registry/regf.idl
@CPP="$(CPP)" $(PERL) pidl/pidl $(PIDL_ARGS) --header --outputdir=$(builddir)/lib/registry --tdr-parser -- $(srcdir)/lib/registry/regf.idl
lib/registry/reg_backend_nt4.c: lib/registry/tdr_regf.c
lib/registry/tdr_regf.c: lib/registry/regf.idl
@CPP="$(CPP)" $(PERL) pidl/pidl $(PIDL_ARGS) \
--header --outputdir=lib/registry \
--tdr-parser -- lib/registry/regf.idl
################################################
# Start MODULE registry_w95