diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-25 18:05:47 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-25 18:05:47 +0100 |
| commit | 943f61be400c332f583d87da7ef96ca7f8cbb306 (patch) | |
| tree | 7faab287f7aa9f09a6e639f5df38cbc12e4dd95f /source4/build | |
| parent | 738fd7fd504c3412128cfae4f8f59ac4f212ae0f (diff) | |
| download | samba-943f61be400c332f583d87da7ef96ca7f8cbb306.tar.gz samba-943f61be400c332f583d87da7ef96ca7f8cbb306.tar.bz2 samba-943f61be400c332f583d87da7ef96ca7f8cbb306.zip | |
Move automatic dependencies code out of perl code.
(This used to be commit 9e9d98d75d52846bca88ec7d12b91b140b069868)
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 37 |
1 files changed, 2 insertions, 35 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 9dfc2e327d..387e929a9e 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; } @@ -55,23 +50,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($) @@ -366,28 +355,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); |