sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-28 09:49:30 +03:00
Code Activity

Remove some unused code.

Browse Source
This commit is contained in:
Jelmer Vernooij
2008-02-16 17:40:45 +01:00
parent 6d3c45889f
commit 8214fb600e
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,8 +69,6 @@ foreach my $key (values %$OUTPUT) {
$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});
}
foreach my $key (values %$OUTPUT) {
@ -89,6 +87,8 @@ foreach my $key (values %$OUTPUT) {
$key->{TYPE} eq "PYTHON") and
grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}});
$mkenv->Binary($key) if grep(/BINARY/, @{$key->{OUTPUT_TYPE}});
$mkenv->ProtoHeader($key) if defined($key->{PRIVATE_PROTO_HEADER}) or
defined($key->{PUBLIC_PROTO_HEADER});
}
$mkenv->write("data.mk");

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

@ -296,28 +296,21 @@ sub Binary($$)
{
my ($self,$ctx) = @_;
my $installdir;
my $extradir = "";
my $localdir = "bin$extradir";
$installdir = "bin$extradir";
unless (defined($ctx->{INSTALLDIR})) {
} elsif ($ctx->{INSTALLDIR} eq "SBINDIR") {
$self->output("SBIN_PROGS += $installdir/$ctx->{BINARY}\n");
$self->output("SBIN_PROGS += bin/$ctx->{BINARY}\n");
} elsif ($ctx->{INSTALLDIR} eq "BINDIR") {
$self->output("BIN_PROGS += $installdir/$ctx->{BINARY}\n");
$self->output("BIN_PROGS += bin/$ctx->{BINARY}\n");
}
$self->output("binaries:: $localdir/$ctx->{BINARY}\n");
$self->output("binaries:: bin/$ctx->{BINARY}\n");
$self->_prepare_list($ctx, "OBJ_LIST");
$self->_prepare_list($ctx, "DEPEND_LIST");
$self->_prepare_list($ctx, "LINK_FLAGS");
$self->output(<< "__EOD__"
$installdir/$ctx->{BINARY}: \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_OBJ_LIST)
bin/$ctx->{BINARY}: \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_OBJ_LIST)
\@echo Linking \$\@
__EOD__
);