diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-03-09 01:42:42 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-03-09 01:42:42 +0100 |
| commit | 17c7f7cc7417e87828fb9e87070f94d7e442e937 (patch) | |
| tree | 45cedfec4d0350e63d9d2feaef3229dadc5c03d0 /source4/build | |
| parent | b44dcae6bb201d4c243672d1fd8877ab17d5c636 (diff) | |
| download | samba-17c7f7cc7417e87828fb9e87070f94d7e442e937.tar.gz samba-17c7f7cc7417e87828fb9e87070f94d7e442e937.tar.bz2 samba-17c7f7cc7417e87828fb9e87070f94d7e442e937.zip | |
Remove extra line for partial linkage objects, simplify binary handling.
(This used to be commit df899e14cb6cdf9725bedc085649bc1ac8749205)
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 50aec93a1e..1f66fabf72 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -165,8 +165,7 @@ sub MergedObj($$) { my ($self, $ctx) = @_; - $self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n"); - $self->output("\$(call partial_link_template, \$($ctx->{NAME}_OUTPUT), \$($ctx->{NAME}_OBJ_FILES))\n"); + $self->output("\$(call partial_link_template, $ctx->{OUTPUT}, \$($ctx->{NAME}_OBJ_FILES))\n"); } sub StaticLibraryPrimitives($$) @@ -197,7 +196,7 @@ sub Binary($$) my ($self,$ctx) = @_; unless (defined($ctx->{INSTALLDIR})) { - $self->output("binaries:: $ctx->{TARGET_BINARY}\n"); + $self->output("BINARIES += $ctx->{TARGET_BINARY}\n"); } elsif ($ctx->{INSTALLDIR} eq "SBINDIR") { $self->output("SBIN_PROGS += $ctx->{RESULT_BINARY}\n"); } elsif ($ctx->{INSTALLDIR} eq "BINDIR") { |