diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-18 22:30:08 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-18 22:30:08 +0200 |
| commit | 4c8756f147f8b9a2806fd76e4cb06bb99d391516 (patch) | |
| tree | b36bf9822e23170774aaca4e5c164d883a27ecff /source4/build | |
| parent | e3a615172e43347f31ad260f0f7ce28a39265257 (diff) | |
| download | samba-4c8756f147f8b9a2806fd76e4cb06bb99d391516.tar.gz samba-4c8756f147f8b9a2806fd76e4cb06bb99d391516.tar.bz2 samba-4c8756f147f8b9a2806fd76e4cb06bb99d391516.zip | |
Create prototype headers from Makefile directory, without smb_build in the middle.
(This used to be commit f4a77b96f9c17d853348b70794026e5b9e384942)
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/smb_build/config_mk.pm | 8 | ||||
| -rw-r--r-- | source4/build/smb_build/main.pl | 1 | ||||
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 8 |
3 files changed, 0 insertions, 17 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm index 56ad0c87c9..88e24a5876 100644 --- a/source4/build/smb_build/config_mk.pm +++ b/source4/build/smb_build/config_mk.pm @@ -33,8 +33,6 @@ my $section_types = { "ENABLE" => "bool", - "PRIVATE_PROTO_HEADER" => "string", - "CFLAGS" => "list", "LDFLAGS" => "list", "STANDARD_VISIBILITY" => "string", @@ -53,8 +51,6 @@ my $section_types = { "OUTPUT_TYPE" => "list", - "PRIVATE_PROTO_HEADER" => "string", - "CFLAGS" => "list" }, "BINARY" => { @@ -64,8 +60,6 @@ my $section_types = { "ENABLE" => "bool", "INSTALLDIR" => "string", - "PRIVATE_PROTO_HEADER" => "string", - "CFLAGS" => "list", "LDFLAGS" => "list", "STANDARD_VISIBILITY" => "string", @@ -84,8 +78,6 @@ my $section_types = { "ENABLE" => "bool", - "PRIVATE_PROTO_HEADER" => "string", - "CFLAGS" => "list", "LDFLAGS" => "list", "STANDARD_VISIBILITY" => "string" diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index ab889b0e5a..3ff34eedcf 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -92,7 +92,6 @@ foreach my $key (values %$OUTPUT) { grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}})); $mkenv->PythonModule($key) if ($key->{TYPE} eq "PYTHON"); $mkenv->Binary($key) if grep(/BINARY/, @{$key->{OUTPUT_TYPE}}); - $mkenv->ProtoHeader($key) if defined($key->{PRIVATE_PROTO_HEADER}); $mkenv->InitFunctions($key) if defined($key->{INIT_FUNCTIONS}); } diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index f2df09d9cd..a0fee2736b 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -223,14 +223,6 @@ sub PythonFiles($$) } } -sub ProtoHeader($$) -{ - my ($self,$ctx) = @_; - - my $target = "$ctx->{BASEDIR}/$ctx->{PRIVATE_PROTO_HEADER}"; - $self->output("\$(call proto_header_template,$target,\$($ctx->{NAME}_OBJ_FILES:.o=.c))\n"); -} - sub write($$) { my ($self, $file) = @_; |