summaryrefslogtreecommitdiff
path: root/source4/build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2004-11-15 00:32:37 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:50 -0500
commit34ddb33b4bf14587f4cd5d7972095df6ffa33e02 (patch)
tree9d36dabb726ad35b68560645a31b7db3acd2a950 /source4/build
parentc66dbe0c3e57eabacd28658891e356b724fd3fba (diff)
downloadsamba-34ddb33b4bf14587f4cd5d7972095df6ffa33e02.tar.gz
samba-34ddb33b4bf14587f4cd5d7972095df6ffa33e02.tar.bz2
samba-34ddb33b4bf14587f4cd5d7972095df6ffa33e02.zip
r3744: Support building subsystems as a shared library. Modules don't work yet,
so while this does compile, it does not work yet. (This used to be commit 3d885562c9f83d60c5d4957b067e35387dfa50dd)
Diffstat (limited to 'source4/build')
-rw-r--r--source4/build/smb_build/makefile.pm2
-rw-r--r--source4/build/smb_build/output.pm3
-rw-r--r--source4/build/smb_build/smb_build_h.pm3
3 files changed, 5 insertions, 3 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 228c1d7e9b..bdeb6d02df 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -356,7 +356,7 @@ LIBRARY_$ctx->{NAME}_SHARED_LINK_LIST =$tmpshlink
LIBRARY_$ctx->{NAME}_SHARED_LINK_FLAGS =$tmpshflag
#
-# Shared $ctx->{LIBRARY_REALNAME}
+# Shared $ctx->{LIBRARY_NAME}
$ctx->{OUTPUT}: \$(LIBRARY_$ctx->{NAME}_DEPEND_LIST) bin/.dummy
\@echo Linking \$\@
\@\$(SHLD) \$(SHLD_FLAGS) -o \$\@ \\
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index d0e00c7565..f04c544910 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -101,7 +101,8 @@ sub create_output($)
push(@{$part->{SUBSYSTEM_INIT_FUNCTIONS}}, @{$elem->{INIT_FUNCTION}}) if
$part->{OUTPUT_TYPE} eq "BINARY" and
defined($elem->{INIT_FUNCTION}) and
- $elem->{INIT_FUNCTION} ne "";
+ $elem->{INIT_FUNCTION} ne "" and
+ $part->{OUTPUT_TYPE} ne "SHARED_LIBRARY";
}
}
diff --git a/source4/build/smb_build/smb_build_h.pm b/source4/build/smb_build/smb_build_h.pm
index 6d67eedf60..f3b0a2b837 100644
--- a/source4/build/smb_build/smb_build_h.pm
+++ b/source4/build/smb_build/smb_build_h.pm
@@ -64,7 +64,8 @@ sub _prepare_smb_build_h($)
next if $key->{OUTPUT_TYPE} ne "SHARED_LIBRARY";
my $name = $key->{NAME};
- my $func = $key->{INIT_FUNCTION};
+ next if not defined($key->{INIT_FUNCTION});
+ my $func = join(' ', @{$key->{INIT_FUNCTION}});
next if $func eq "";
my $DEFINE = ();