diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 18:55:37 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 18:55:37 +0100 |
| commit | 6e0522c3cae9c99b589db67727ee1256c6da82ef (patch) | |
| tree | fd04b0a436f989f9c0e07ac021a6a95149a7b3d8 /source4/build/smb_build/makefile.pm | |
| parent | 5022db874b93f896f6e828f762f65a5d41619d61 (diff) | |
| download | samba-6e0522c3cae9c99b589db67727ee1256c6da82ef.tar.gz samba-6e0522c3cae9c99b589db67727ee1256c6da82ef.tar.bz2 samba-6e0522c3cae9c99b589db67727ee1256c6da82ef.zip | |
Build complete static libraries.
(This used to be commit 34e26f4eecdf5bca340133942b242969c4c16dff)
Diffstat (limited to 'source4/build/smb_build/makefile.pm')
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 52149083b1..d11e761ce1 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -255,14 +255,15 @@ sub MergedObj($$) { my ($self, $ctx) = @_; + return unless defined($ctx->{OUTPUT}); + $self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n"); - $self->_prepare_list($ctx, "FULL_OBJ_LIST"); $self->output(<< "__EOD__" # -$ctx->{RESULT_MERGED_OBJ}: \$($ctx->{NAME}_FULL_OBJ_LIST) +$ctx->{RESULT_MERGED_OBJ}: \$($ctx->{NAME}_OBJ_LIST) \@echo Partially linking \$@ \@mkdir -p bin/mergedobj - \$(PARTLINK) -o \$@ \$($ctx->{NAME}_FULL_OBJ_LIST) + \$(PARTLINK) -o \$@ \$($ctx->{NAME}_OBJ_LIST) __EOD__ ); |