summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-03-16 14:12:38 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:57:30 -0500
commit86314203e68062f8b35562ccd77068f76c9f025b (patch)
tree5dfb972223cb816cb67118890fd62c30b4aa6d05 /source4
parent71b4fd97922933b24424924acee606389bfecb2d (diff)
downloadsamba-86314203e68062f8b35562ccd77068f76c9f025b.tar.gz
samba-86314203e68062f8b35562ccd77068f76c9f025b.tar.bz2
samba-86314203e68062f8b35562ccd77068f76c9f025b.zip
r14478: Remove unused proto_objs variable
(This used to be commit acd23e351e92c59c4bbc12c06d0686e355fa82e8)
Diffstat (limited to 'source4')
-rw-r--r--source4/build/smb_build/makefile.pm21
1 files changed, 0 insertions, 21 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index bb3be1946d..8252c0181b 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -236,10 +236,6 @@ sub SharedLibrary($$)
push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)");
- if ($ctx->{NOPROTO} eq "NO") {
- push(@{$self->{proto_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST\)");
- }
-
if ($ctx->{TYPE} eq "MODULE" and defined($ctx->{INIT_FUNCTION})) {
my $init_fn = $ctx->{INIT_FUNCTION_TYPE};
$init_fn =~ s/\(\*\)/init_module/;
@@ -303,10 +299,6 @@ sub MergedObj($$)
push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)");
- if ($ctx->{NOPROTO} eq "NO") {
- push(@{$self->{proto_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST\)");
- }
-
$self->output("$ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)\n");
$self->output("\t\@echo \"Pre-Linking $ctx->{TYPE} $ctx->{NAME}\"\n");
@@ -322,10 +314,6 @@ sub ObjList($$)
push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)");
- if ($ctx->{NOPROTO} eq "NO") {
- push(@{$self->{proto_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST\)");
- }
-
$self->_prepare_list($ctx, "OBJ_LIST");
$self->_prepare_list($ctx, "CFLAGS");
$self->_prepare_list($ctx, "DEPEND_LIST");
@@ -349,10 +337,6 @@ sub StaticLibrary($$)
push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)");
- if ($ctx->{NOPROTO} eq "NO") {
- push(@{$self->{proto_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST\)");
- }
-
$self->output(<< "__EOD__"
#
$ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)
@@ -387,10 +371,6 @@ sub Binary($$)
push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)");
- if ($ctx->{NOPROTO} eq "NO") {
- push(@{$self->{proto_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST\)");
- }
-
unless (defined($ctx->{INSTALLDIR})) {
} elsif ($ctx->{INSTALLDIR} eq "SBINDIR") {
push (@{$self->{sbin_progs}}, "$installdir/$ctx->{BINARY}");
@@ -505,7 +485,6 @@ sub write($$)
$self->output("PUBLIC_HEADERS = " . array2oneperline($self->{headers}) . "\n");
$self->output("PC_FILES = " . array2oneperline($self->{pc_files}) . "\n");
$self->output("ALL_OBJS = " . array2oneperline($self->{all_objs}) . "\n");
- $self->output("PROTO_OBJS = " . array2oneperline($self->{proto_objs}) . "\n");
$self->output("PROTO_HEADERS = " . array2oneperline($self->{proto_headers}) . "\n");
$self->output("SHARED_MODULES = " . array2oneperline($self->{shared_modules}) . "\n");
$self->output("PLUGINS = " . array2oneperline($self->{plugins}) . "\n");