diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 11:59:02 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 11:59:02 +0100 |
| commit | 4e750552b789054f094c3dc42f091cebdc4f715e (patch) | |
| tree | 6231d9969f39482b5b9e74e7ee519a96cc989653 /source4/build/smb_build/makefile.pm | |
| parent | 85ac8dc17ad8cd01bb773383fd30261b9f357292 (diff) | |
| parent | e8cf95773df914e8d71dcc1ce713fe0cc723d946 (diff) | |
| download | samba-4e750552b789054f094c3dc42f091cebdc4f715e.tar.gz samba-4e750552b789054f094c3dc42f091cebdc4f715e.tar.bz2 samba-4e750552b789054f094c3dc42f091cebdc4f715e.zip | |
Merge branch 'v4-0-trivial' into v4-0-gmake3
Conflicts:
source/build/smb_build/main.pl
source/build/smb_build/makefile.pm
(This used to be commit d31987461984aebf8c6f2513e83c92757c0f83c7)
Diffstat (limited to 'source4/build/smb_build/makefile.pm')
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index ecbf554fc7..072e3c0c4b 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -222,6 +222,25 @@ __EOD__ $self->output("endif\n"); } +sub MergedObj($$) +{ + my ($self, $ctx) = @_; + + $self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n"); + $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 + \$(PARTLINK) -o \$@ \$($ctx->{NAME}_FULL_OBJ_LIST) + +__EOD__ +); +} + sub StaticLibraryPrimitives($$) { my ($self,$ctx) = @_; |