diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-16 20:38:21 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-16 20:38:21 +0100 |
| commit | 8d7e2eb68c7c63ef36d24ce59953c20c2579aa5f (patch) | |
| tree | d5be2d69e8ef051c8182093ebbe18f0ffca627b7 /source4/build/smb_build/makefile.pm | |
| parent | d803ff9e724cc91778c1b94a5b78ef935200adb8 (diff) | |
| download | samba-8d7e2eb68c7c63ef36d24ce59953c20c2579aa5f.tar.gz samba-8d7e2eb68c7c63ef36d24ce59953c20c2579aa5f.tar.bz2 samba-8d7e2eb68c7c63ef36d24ce59953c20c2579aa5f.zip | |
Reintroduce mergedobj support.
(This used to be commit 1cf23c58411a9b8a9bb97016c27c10a218e73146)
Diffstat (limited to 'source4/build/smb_build/makefile.pm')
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 9c6d52cfef..6ea3b8d950 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -277,6 +277,24 @@ __EOD__ $self->output("\n"); } +sub MergedObj($$) +{ + my ($self, $ctx) = @_; + + $self->_prepare_list($ctx, "OBJ_LIST"); + $self->_prepare_list($ctx, "FULL_OBJ_LIST"); + push(@{$self->{all_objs}}, "\$($ctx->{NAME}_FULL_OBJ_LIST)"); + $self->output(<< "__EOD__" +# +$ctx->{TARGET_MERGED_OBJ}: \$($ctx->{NAME}_FULL_OBJ_LIST) + \@echo Partially linking \$@ + \@mkdir -p bin/mergedobj + \@\$(LD) -r -o \$@ \$($ctx->{NAME}_FULL_OBJ_LIST) + +__EOD__ +); +} + sub StaticLibrary($$) { my ($self,$ctx) = @_; |