diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-10 20:59:17 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-10 20:59:17 +0200 |
commit | 6267dd78539863a5ec75b6cadba39184a2efc9b5 (patch) | |
tree | 9843465f180c8b0c3ade9701dd9cf7e1afd96eae /source4/build/smb_build/makefile.pm | |
parent | 640792fb5841ef03e83e59d8d74d65b6f7203756 (diff) | |
download | samba-6267dd78539863a5ec75b6cadba39184a2efc9b5.tar.gz samba-6267dd78539863a5ec75b6cadba39184a2efc9b5.tar.bz2 samba-6267dd78539863a5ec75b6cadba39184a2efc9b5.zip |
Clean up some git merges gone wrong.
(This used to be commit 42eb6b33462228467e65a51bbf624c481802b090)
Diffstat (limited to 'source4/build/smb_build/makefile.pm')
-rw-r--r-- | source4/build/smb_build/makefile.pm | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index c56fdbf8cc..495c8fb967 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -176,14 +176,6 @@ sub MergedObj($$) $self->output("\$(call partial_link_template, $ctx->{OUTPUT}, \$($ctx->{NAME}_OBJ_FILES))\n"); } -sub StaticLibraryPrimitives($$) -{ - my ($self,$ctx) = @_; - - $self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n"); - $self->_prepare_list($ctx, "FULL_OBJ_LIST"); -} - sub InitFunctions($$) { my ($self, $ctx) = @_; |