Merge branch 'v4-0-trivial' into v4-0-gmake3

Conflicts:

	source/build/smb_build/makefile.pm
(This used to be commit 4d190270463f8db475c152f5502c9de01765d904)

2 files changed, 16 insertions, 3 deletions

diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index 9c7ffc850e..6be48fcc67 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -207,13 +207,26 @@ sub import_integrated($$)
 	}
 }
 
+sub add_implicit($$)
+{
+	my ($INPUT, $n) = @_;
+
+	$INPUT->{$n} = {
+		TYPE => "MAKE_RULE",
+		NAME => $n,
+		TARGET => lc($n),
+		LIBS => "\$(".uc($n)."_LIBS)",
+		CFLAGS => "\$(".uc($n)."_CFLAG)"
+	};
+}
+
 sub calc_unique_deps($$$$$$$$)
 {
 	sub calc_unique_deps($$$$$$$$);
 	my ($name, $INPUT, $deps, $udeps, $withlibs, $forward, $pubonly, $busy) = @_;
 
 	foreach my $n (@$deps) {
-		die("Dependency unknown: $n (for $name)") unless (defined($INPUT->{$n}));
+		add_implicit($INPUT, $n) unless (defined($INPUT->{$n}));
 		die("Recursive dependency: $n, list: " . join(',', @$busy)) if (grep (/^$n$/, @$busy));
 		next if (grep /^$n$/, @$udeps);
 		my $dep = $INPUT->{$n};
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 0717cd9b0b..3911a11773 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -19,8 +19,8 @@ my $INPUT = {};
 my $mkfile = smb_build::config_mk::run_config_mk($INPUT, $config::config{srcdir}, $config::config{builddir}, "main.mk");
 
 my $subsys_output_type;
-#$subsys_output_type = ["MERGED_OBJ"];
-$subsys_output_type = ["STATIC_LIBRARY"];
+$subsys_output_type = ["MERGED_OBJ"];
+#$subsys_output_type = ["STATIC_LIBRARY"];
 
 my $library_output_type;
 if ($config::config{USESHARED} eq "true") {