1 files changed, 12 insertions, 8 deletions

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 2470fa1459..7728bc4f8d 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -23,12 +23,11 @@ sub new($$$)
 
 	$self->{output} = "";
 
-	$self->{mkfile} = $mkfile;
-
 	$self->output("################################################\n");
 	$self->output("# Autogenerated by build/smb_build/makefile.pm #\n");
 	$self->output("################################################\n");
 	$self->output("\n");
+	$self->output($mkfile);
 
 	return $self;
 }
@@ -203,6 +202,14 @@ __EOD__
 	$self->output("\n");
 }
 
+sub StaticLibraryPrimitives($$)
+{
+	my ($self,$ctx) = @_;
+ 
+ 	$self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
+	$self->_prepare_list($ctx, "FULL_OBJ_LIST");
+}
+
 sub SharedLibraryPrimitives($$)
 {
 	my ($self,$ctx) = @_;
@@ -273,9 +280,6 @@ sub StaticLibrary($$)
 
 	$self->output("STATIC_LIBS += $ctx->{TARGET_STATIC_LIBRARY}\n") if ($ctx->{TYPE} eq "LIBRARY");
 
-	$self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
-	$self->_prepare_list($ctx, "FULL_OBJ_LIST");
-
 	$self->output("$ctx->{RESULT_STATIC_LIBRARY}: \$($ctx->{NAME}_FULL_OBJ_LIST)\n");
 }
 
@@ -324,9 +328,9 @@ sub PythonFiles($$)
 
 	foreach (@{$ctx->{PYTHON_FILES}}) {
 		my $target = "bin/python/".basename($_);
-		my $source = output::add_dir_str($ctx->{BASEDIR}, $_);
+		my $source = "\$(addprefix $ctx->{BASEDIR}/, $target)";
 		$self->output("$target: $source\n\n");
-		$self->output("PYTHON_PYS += $target\n");
+		$self->output("PYTHON_PYS += $source\n");
 	}
 }
 
@@ -334,7 +338,7 @@ sub ProtoHeader($$)
 {
 	my ($self,$ctx) = @_;
 
-	my $priv = output::add_dir_str($ctx->{BASEDIR}, $ctx->{PRIVATE_PROTO_HEADER});
+	my $priv = "\$(addprefix $ctx->{BASEDIR}/, $ctx->{PRIVATE_PROTO_HEADER})";
 	$self->output("PROTO_HEADERS += $priv\n");
 
 	$self->output("$priv: $ctx->{MK_FILE} \$($ctx->{NAME}_OBJ_LIST:.o=.c) \$(srcdir)/script/mkproto.pl\n");