From 094769618e180cae404f5951b969e9c6c778e421 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 18 Feb 2008 19:46:27 +0100
Subject: Use implicit build system element creation for external libraries.
 (This used to be commit 3b08f190c9dd4567e684c804a22e2612f405bbec)

---
 source4/build/smb_build/input.pm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'source4/build/smb_build/input.pm')

diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index d636ecc898..da90e9db48 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -92,7 +92,7 @@ sub check_module($$$)
 
 	if (not defined($mod->{OUTPUT_TYPE})) {
 		if ($INPUT->{$mod->{SUBSYSTEM}}->{TYPE} eq "EXT_LIB") {
-			$mod->{OUTPUT_TYPE} = ["SHARED_LIBRARY"];
+			$mod->{OUTPUT_TYPE} = undef;
 		} else {
 			$mod->{OUTPUT_TYPE} = $default_ot;
 		}
@@ -163,7 +163,7 @@ sub check_python($$$)
 		$python->{LIBRARY_REALNAME} = "$basename.\$(SHLIBEXT)";
 		$python->{INIT_FUNCTION} = "{ (char *)\"$basename\", init$basename }";
 	}
-	push (@{$python->{CFLAGS}}, @{$INPUT->{EXT_LIB_PYTHON}->{CFLAGS}});
+	push (@{$python->{CFLAGS}}, "\$(EXT_LIB_PYTHON_CFLAGS)");
 
 	$python->{SUBSYSTEM} = "LIBPYTHON";
 
@@ -189,9 +189,12 @@ sub add_implicit($$)
 	$INPUT->{$n} = {
 		TYPE => "MAKE_RULE",
 		NAME => $n,
-		TARGET => lc($n),
-		LIBS => "\$(".uc($n)."_LIBS)",
-		CFLAGS => "\$(".uc($n)."_CFLAG)"
+		TARGET => "",
+		OUTPUT_TYPE => undef,
+		LIBS => ["\$(".uc($n)."_LIBS)"],
+		LDFLAGS => ["\$(".uc($n)."_LDFLAGS)"],
+		CFLAGS => ["\$(".uc($n)."_CFLAGS)"],
+		CPPFLAGS => ["\$(".uc($n)."_CPPFLAGS)"]
 	};
 }
 
-- 
cgit