summaryrefslogtreecommitdiff
path: root/source4/build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-25 18:05:47 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-29 15:39:44 +0100
commitbb176a124ee9c36a66092f9a60aa6893ad9555f9 (patch)
tree7ea12b26b90f008fa2d4f41c84fc42c06d883433 /source4/build
parent21b54de82fc1bbbd80c80908d351fde2409a3feb (diff)
downloadsamba-bb176a124ee9c36a66092f9a60aa6893ad9555f9.tar.gz
samba-bb176a124ee9c36a66092f9a60aa6893ad9555f9.tar.bz2
samba-bb176a124ee9c36a66092f9a60aa6893ad9555f9.zip
Move automatic dependencies code out of perl code.
(This used to be commit 58a93ef94b878ff2d2d0029fc2d443551842e712)
Diffstat (limited to 'source4/build')
-rw-r--r--source4/build/smb_build/makefile.pm37
1 files changed, 2 insertions, 35 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index c5cc3d3e8c..26f986eacf 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -30,11 +30,6 @@ sub new($$$)
$self->output("################################################\n");
$self->output("\n");
- if (!$self->{automatic_deps}) {
- $self->output("ALL_PREDEP = proto\n");
- $self->output(".NOTPARALLEL:\n");
- }
-
return $self;
}
@@ -78,23 +73,17 @@ sub _prepare_mk_files($)
push (@tmp, $_);
}
- if ($self->{gnu_make}) {
- $self->output("
+ $self->output("
ifneq (\$(MAKECMDGOALS),clean)
ifneq (\$(MAKECMDGOALS),distclean)
ifneq (\$(MAKECMDGOALS),realdistclean)
");
- }
-
$self->output("MK_FILES = " . array2oneperline(\@tmp) . "\n");
-
- if ($self->{gnu_make}) {
- $self->output("
+ $self->output("
endif
endif
endif
");
- }
}
sub array2oneperline($)
@@ -369,28 +358,6 @@ sub write($$)
$self->output($self->{mkfile});
- if ($self->{automatic_deps}) {
- $self->output("
-ifneq (\$(MAKECMDGOALS),clean)
-ifneq (\$(MAKECMDGOALS),distclean)
-ifneq (\$(MAKECMDGOALS),realdistclean)
-ifneq (\$(SKIP_DEP_FILES),yes)
--include \$(DEP_FILES)
-endif
-endif
-endif
-endif
-
-ifneq (\$(SKIP_DEP_FILES),yes)
-clean::
- \@echo Removing dependency files
- \@find . -name '*.d' -o -name '*.hd' | xargs rm -f
-endif
-");
- } else {
- $self->output("include \$(srcdir)/static_deps.mk\n");
- }
-
open(MAKEFILE,">$file") || die ("Can't open $file\n");
print MAKEFILE $self->{output};
close(MAKEFILE);