summaryrefslogtreecommitdiff
path: root/source4/build/smb_build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-10 20:59:17 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-10 20:59:17 +0200
commit6267dd78539863a5ec75b6cadba39184a2efc9b5 (patch)
tree9843465f180c8b0c3ade9701dd9cf7e1afd96eae /source4/build/smb_build
parent640792fb5841ef03e83e59d8d74d65b6f7203756 (diff)
downloadsamba-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')
-rw-r--r--source4/build/smb_build/config_mk.pm2
-rw-r--r--source4/build/smb_build/main.pl2
-rw-r--r--source4/build/smb_build/makefile.pm8
3 files changed, 2 insertions, 10 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index 7b23e83934..81c3363cfb 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -253,7 +253,7 @@ sub run_config_mk($$$$)
next;
}
- die("$parsing_file:$linenum: Bad line while parsing $parsing_file");
+ die("$parsing_file:$linenum: Bad line");
}
$makefile .= "# }END $parsing_file\n";
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index ccaac0b6fc..d31bea73f3 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -51,7 +51,7 @@ foreach my $key (values %$OUTPUT) {
$mkenv->StaticLibraryPrimitives($key) if grep(/STATIC_LIBRARY/, @{$key->{OUTPUT_TYPE}});
$mkenv->MergedObj($key) if grep(/MERGED_OBJ/, @{$key->{OUTPUT_TYPE}});
- $kenv->SharedLibraryPrimitives($key) if ($key->{TYPE} eq "LIBRARY") and
+ $mkenv->SharedLibraryPrimitives($key) if ($key->{TYPE} eq "LIBRARY") and
grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}});
if ($key->{TYPE} eq "LIBRARY" and
${$key->{OUTPUT_TYPE}}[0] eq "SHARED_LIBRARY") {
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) = @_;