summaryrefslogtreecommitdiff
path: root/source4/build/smb_build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-03-19 02:23:52 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:58:45 -0500
commitc84cfc0ecc46ef05dc7997a128ba9486516cb112 (patch)
treeb15c6874419ac593174973ec49fda9d78322be9b /source4/build/smb_build
parent781d122fb646aef0d20f033cacb677ea9e89d2ff (diff)
downloadsamba-c84cfc0ecc46ef05dc7997a128ba9486516cb112.tar.gz
samba-c84cfc0ecc46ef05dc7997a128ba9486516cb112.tar.bz2
samba-c84cfc0ecc46ef05dc7997a128ba9486516cb112.zip
r14554: Write out header dependencies. This means all C files affected will be
rebuilt when a header file is changed. It also means parallel builds work now. It will take a minute or so to generate all the dependency information, but there should be no need to rebuild that information later on, unless a file changes. This behaviour is only enabled when building in developer mode (--enable-developer) and requires a GNU make (or compatible). In all other cases, the file 'static_deps.mk' is included, which contains some basic hardcoded dependency information. (This used to be commit eb435386f015ce1d89eb6f7e7837622ebd9e1951)
Diffstat (limited to 'source4/build/smb_build')
-rwxr-xr-xsource4/build/smb_build/cflags.pm1
-rw-r--r--source4/build/smb_build/makefile.pm9
2 files changed, 4 insertions, 6 deletions
diff --git a/source4/build/smb_build/cflags.pm b/source4/build/smb_build/cflags.pm
index b5525173a0..299cbab025 100755
--- a/source4/build/smb_build/cflags.pm
+++ b/source4/build/smb_build/cflags.pm
@@ -21,6 +21,7 @@ sub create_cflags($$)
my $ofile = $_;
my $dfile = $_;
$dfile =~ s/\.o$/.d/;
+ $dfile =~ s/\.ho$/.d/;
print CFLAGS_TXT "$ofile $dfile: CFLAGS+=$key->{EXTRA_CFLAGS}\n";
}
}
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index aeffc79e4d..3ac4ad53bc 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -509,12 +509,9 @@ sub write($$)
$self->output($self->{mkfile});
if ($self->{developer}) {
- $self->output(<<__EOD__
-
--include \$(DEP_FILES)
-
-__EOD__
-);
+ $self->output("-include \$(DEP_FILES)\n");
+ } else {
+ $self->output("include static_deps.mk\n");
}
open(MAKEFILE,">$file") || die ("Can't open $file\n");