diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 22:50:44 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 22:50:44 +0100 |
| commit | 03ab8f9d79f2a06b357b2f5d392ea8b5be263c5e (patch) | |
| tree | a64ec7eeaaf0dedcf67c6e048ade87424f154fc8 /source4/build/smb_build/makefile.pm | |
| parent | b4017955e19723e48b41b70c7ba313dcfcda5eb9 (diff) | |
| download | samba-03ab8f9d79f2a06b357b2f5d392ea8b5be263c5e.tar.gz samba-03ab8f9d79f2a06b357b2f5d392ea8b5be263c5e.tar.bz2 samba-03ab8f9d79f2a06b357b2f5d392ea8b5be263c5e.zip | |
Remove duplicate code.
(This used to be commit 3074a9c713910f1cec8d252a36fa51aefc308c9a)
Diffstat (limited to 'source4/build/smb_build/makefile.pm')
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 5fd9f359ee..8a99848437 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -248,19 +248,12 @@ sub InitFunctions($$) sub StaticLibrary($$) { my ($self,$ctx) = @_; - $self->output(<< "__EOD__" -# -$ctx->{RESULT_STATIC_LIBRARY}: \$($ctx->{NAME}_FULL_OBJ_LIST) - \@echo Linking \$@ - \@rm -f \$@ - \@mkdir -p $ctx->{STATICDIR} - \@\$(STLD) \$(STLD_FLAGS) \$@ \$($ctx->{NAME}_FULL_OBJ_LIST) return unless (defined($ctx->{OBJ_FILES})); - $self->output("STATIC_LIBS += $ctx->{TARGET_STATIC_LIBRARY}\n") if ($ctx->{TYPE} eq "LIBRARY"); + $self->output("STATIC_LIBS += $ctx->{RESULT_STATIC_LIBRARY}\n") if ($ctx->{TYPE} eq "LIBRARY"); $self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n"); - $self->output("$ctx->{TARGET_STATIC_LIBRARY}: \$($ctx->{NAME}_OBJ_LIST)\n"); + $self->output("$ctx->{RESULT_STATIC_LIBRARY}: \$($ctx->{NAME}_FULL_OBJ_LIST)\n"); } sub Header($$) |