From 1261f0e0e4199c865313c2980334d420b750b100 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 12 Dec 2007 10:18:32 +0100 Subject: r26414: build: bring in the content of EXT_LIB's for the .pc files TODO: we need to check if we need to recursivly expand the dependencies as we do for the Makefile rules metze (This used to be commit 5cc9673778838e42999363f75220cc882098d282) --- source4/build/smb_build/makefile.pm | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'source4/build') diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 3b43dfb0b7..804a728457 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -567,7 +567,16 @@ sub PkgConfig($$$) if (defined($ctx->{PUBLIC_DEPENDENCIES})) { foreach (@{$ctx->{PUBLIC_DEPENDENCIES}}) { next if ($other->{$_}->{ENABLE} eq "NO"); - if ($other->{$_}->{TYPE} eq "LIBRARY") { + if ($other->{$_}->{TYPE} eq "EXT_LIB") { + my $e = $other->{$_}; + + my $ldflags = join(" ", @{$e->{LDFLAGS}}); + $ldflags .= " " unless $ldflags eq ""; + my $libs = join(" ", @{$e->{LIBS}}); + $libs .= " " unless $libs eq ""; + + $pubs .= $ldflags.$libs; + } elsif ($other->{$_}->{TYPE} eq "LIBRARY") { s/^LIB//g; $_ = lc($_); @@ -584,7 +593,16 @@ sub PkgConfig($$$) if (defined($ctx->{PRIVATE_DEPENDENCIES})) { foreach (@{$ctx->{PRIVATE_DEPENDENCIES}}) { next if ($other->{$_}->{ENABLE} eq "NO"); - if ($other->{$_}->{TYPE} eq "LIBRARY") { + if ($other->{$_}->{TYPE} eq "EXT_LIB") { + my $e = $other->{$_}; + + my $ldflags = join(" ", @{$e->{LDFLAGS}}); + $ldflags .= " " unless $ldflags eq ""; + my $libs = join(" ", @{$e->{LIBS}}); + $libs .= " " unless $libs eq ""; + + $privlibs .= $ldflags.$libs; + } elsif ($other->{$_}->{TYPE} eq "LIBRARY") { s/^LIB//g; $_ = lc($_); -- cgit