diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-14 17:54:19 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-14 17:54:19 +0200 |
commit | 0fa663cc5dcbcf6a35f6d245881a5edff1a87108 (patch) | |
tree | 89123446110c515964fa771e9b043252426f87ba /source4/build/smb_build/makefile.pm | |
parent | e9017ba418202b4b191c5a9ad4a96857558ce606 (diff) | |
download | samba-0fa663cc5dcbcf6a35f6d245881a5edff1a87108.tar.gz samba-0fa663cc5dcbcf6a35f6d245881a5edff1a87108.tar.bz2 samba-0fa663cc5dcbcf6a35f6d245881a5edff1a87108.zip |
Fix order of variables in the makefile.
(This used to be commit f64c1d53ba50bb50d32f819adf8727513468ccd7)
Diffstat (limited to 'source4/build/smb_build/makefile.pm')
-rw-r--r-- | source4/build/smb_build/makefile.pm | 20 |
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"); |