Remove some unused code.

(This used to be commit 8214fb600ec626a8dd01ef3e2af1f4a8bf27dcb2)

2 files changed, 6 insertions, 13 deletions

diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 8220fc7ffb..d00c864f50 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -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");
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 4498d9f019..4778c901d3 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -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__
 	);