summaryrefslogtreecommitdiff
path: root/source4/build/smb_build/makefile.pm
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-11-23 18:03:11 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:28:27 -0500
commit60e7b4d995e83176647c3199ef31c6bb6558ab83 (patch)
tree3ef623d0437c91dceee970247936b4d3996d3ff5 /source4/build/smb_build/makefile.pm
parent0b4bd706160bf68cfd5dac7f494f3d308b25a5da (diff)
downloadsamba-60e7b4d995e83176647c3199ef31c6bb6558ab83.tar.gz
samba-60e7b4d995e83176647c3199ef31c6bb6558ab83.tar.bz2
samba-60e7b4d995e83176647c3199ef31c6bb6558ab83.zip
r19863: Create -uninstalled.pc files. This should reenable compilation and running
of the pidl testsuite as part of the testsuite. (This used to be commit db237ad52f3a42c7b35753df99549ed6d540cec2)
Diffstat (limited to 'source4/build/smb_build/makefile.pm')
-rw-r--r--source4/build/smb_build/makefile.pm48
1 files changed, 37 insertions, 11 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index d872f0189b..63bf3c0916 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -265,8 +265,7 @@ __EOD__
my $soarg = "";
my $soargdebug = "";
- if ($self->{config}->{SONAMEFLAG} ne "" and
- defined($ctx->{LIBRARY_SONAME})) {
+ if ($self->{config}->{SONAMEFLAG} ne "" and defined($ctx->{LIBRARY_SONAME})) {
$soarg = "$self->{config}->{SONAMEFLAG}$ctx->{LIBRARY_SONAME} ";
if ($ctx->{LIBRARY_REALNAME} ne $ctx->{LIBRARY_SONAME}) {
$soargdebug = "\n\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_SONAME}";
@@ -291,7 +290,7 @@ $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_
\$($ctx->{TYPE}_$ctx->{NAME}\_FULL_OBJ_LIST) \\
\$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) $extraflags \\
$soarg \\
- $init_obj $singlesoarg
+ $init_obj $singlesoarg$soargdebug
__EOD__
);
@@ -395,9 +394,9 @@ sub Manpage($$)
push (@{$self->{manpages}}, "$dir/$ctx->{MANPAGE}");
}
-sub PkgConfig($$)
+sub PkgConfig($$$)
{
- my ($self,$ctx) = @_;
+ my ($self,$ctx,$other) = @_;
my $link_name = $ctx->{NAME};
@@ -415,30 +414,57 @@ sub PkgConfig($$)
if (defined($ctx->{PUBLIC_DEPENDENCIES})) {
foreach (@{$ctx->{PUBLIC_DEPENDENCIES}}) {
-# next unless ($self-> ) {
+ next unless ($other->{$_}->{TYPE} eq "LIBRARY");
-#FIXME $pubs .= "$_ ";
+ s/^LIB//g;
+ $_ = lc($_);
+
+ $pubs .= "$_ ";
}
}
if (defined($ctx->{PRIVATE_DEPENDENCIES})) {
foreach (@{$ctx->{PRIVATE_DEPENDENCIES}}) {
-# next unless ($self-> ) {
+ next unless ($other->{$_}->{TYPE} eq "LIBRARY");
+
+ s/^LIB//g;
+ $_ = lc($_);
-#FIXME $privs .= "$_ ";
+ $privs .= "$_ ";
}
}
smb_build::env::PkgConfig($self,
$path,
$link_name,
- "-l$link_name",
+ "-L\${libdir} -l$link_name",
"",
"$ctx->{VERSION}",
$ctx->{DESCRIPTION},
defined($ctx->{INIT_FUNCTIONS}),
$pubs,
- $privs
+ $privs,
+ {
+ "prefix" => $self->{config}->{prefix},
+ "exec_prefix" => $self->{config}->{exec_prefix},
+ "libdir" => $self->{config}->{libdir},
+ "includedir" => $self->{config}->{includedir}
+ }
+ );
+ smb_build::env::PkgConfig($self,
+ "bin/pkgconfig/$link_name-uninstalled.pc",
+ $link_name,
+ "-Lbin/shared -Lbin/static -l$link_name",
+ "-I. -Iinclude -Ilib -Ilib/replace",
+ "$ctx->{VERSION}",
+ $ctx->{DESCRIPTION},
+ defined($ctx->{INIT_FUNCTIONS}),
+ $pubs,
+ $privs,
+ {
+ "prefix" => "bin/",
+ "includedir" => "$ctx->{BASEDIR}"
+ }
);
}