summaryrefslogtreecommitdiff
path: root/source4/build/smb_build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-13 18:59:57 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-13 18:59:57 +0100
commit501005c2eb3de794f72121d62bf7769e9109a032 (patch)
treec5df12fe6f8f08bfdf1564e3c9e253052a394009 /source4/build/smb_build
parent8a3f8dc646585c1861ac7322ad67a93353fa0c71 (diff)
downloadsamba-501005c2eb3de794f72121d62bf7769e9109a032.tar.gz
samba-501005c2eb3de794f72121d62bf7769e9109a032.tar.bz2
samba-501005c2eb3de794f72121d62bf7769e9109a032.zip
Put soversions and versions for libraries with a hard-coded version in the
generated .mk file. Move CPPFLAGS to be generated entirely inside configure.ac (simplifies makefile.pm). (This used to be commit a44af7c3872e900e1ea0da74ef796213030e29ac)
Diffstat (limited to 'source4/build/smb_build')
-rw-r--r--source4/build/smb_build/makefile.pm35
1 files changed, 3 insertions, 32 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 50a16c543f..3df1b5671b 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -45,8 +45,6 @@ sub new($$$)
$self->output("################################################\n");
$self->output("\n");
- $self->_prepare_compiler_linker();
-
if (!$self->{automatic_deps}) {
$self->output("ALL_PREDEP = proto\n");
$self->output(".NOTPARALLEL:\n");
@@ -62,36 +60,6 @@ sub output($$)
$self->{output} .= $text;
}
-sub _prepare_compiler_linker($)
-{
- my ($self) = @_;
-
- my $builddir_headers = "";
- my $libdir;
- my $extra_link_flags = "";
-
- if ($self->{config}->{USESHARED} eq "true") {
- $libdir = "\$(builddir)/bin/shared";
- $extra_link_flags = "-Wl,-rpath-link,\$(builddir)/bin/shared";
- } else {
- $libdir = "\$(builddir)/bin/static";
- }
-
- if (!(abs_path($self->{config}->{srcdir}) eq abs_path($self->{config}->{builddir}))) {
- $builddir_headers= "-I\$(builddir)/include -I\$(builddir) -I\$(builddir)/lib ";
- }
-
- $self->output(<< "__EOD__"
-
-CPPFLAGS=$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -I\$(srcdir)/lib/replace -I\$(srcdir)/lib/talloc -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H $self->{config}->{CPPFLAGS}
-
-INSTALL_LINK_FLAGS=$extra_link_flags
-
-INTERN_LDFLAGS = -L$libdir
-__EOD__
-);
-}
-
sub _prepare_mk_files($)
{
my $self = shift;
@@ -251,6 +219,9 @@ sub SharedLibrary($$)
my $has_static_lib = 0;
+ $self->output("$ctx->{NAME}_SOVERSION = $ctx->{SO_VERSION}\n") if (defined($ctx->{SO_VERSION}));
+ $self->output("$ctx->{NAME}_VERSION = $ctx->{VERSION}\n") if (defined($ctx->{VERSION}));
+
push (@{$self->{shared_libs}}, "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}") if (defined($ctx->{SO_VERSION}));
push (@{$self->{installable_shared_libs}}, "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}") if (defined($ctx->{SO_VERSION}));