From 943f61be400c332f583d87da7ef96ca7f8cbb306 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 25 Feb 2008 18:05:47 +0100
Subject: Move automatic dependencies code out of perl code. (This used to be
 commit 9e9d98d75d52846bca88ec7d12b91b140b069868)

---
 source4/Makefile                    | 30 +++++++++++++++++++++++++++++-
 source4/build/smb_build/makefile.pm | 37 ++-----------------------------------
 source4/rules.mk                    |  3 ---
 3 files changed, 31 insertions(+), 39 deletions(-)

(limited to 'source4')

diff --git a/source4/Makefile b/source4/Makefile
index f9a753eb67..75c1c6db35 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -19,12 +19,40 @@ BNLD_FLAGS = $(LDFLAGS) $(SYS_LDFLAGS)
 HOSTCC_FLAGS = -D_SAMBA_HOSTCC_ $(CFLAGS)
 HOSTLD_FLAGS = $(LDFLAGS) $(SYS_LDFLAGS)
 
-default: all
+.DEFAULT_GOAL := all
+
+ifneq ($(automatic_deps),yes)
+ALL_PREDEP = proto
+.NOTPARALLEL:
+endif
 
 include rules.mk
 include data.mk
 include extra_cflags.txt
 
+DEP_FILES = $(patsubst %.ho,%.hd,$(patsubst %.o,%.d,$(ALL_OBJS))) \
+		   include/includes.d
+
+ifeq ($(automatic_deps),yes)
+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
+include $(srcdir)/static_deps.mk
+endif
+
 DEFAULT_HEADERS = $(srcdir)/lib/util/dlinklist.h \
 		  $(srcdir)/version.h
 
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);
diff --git a/source4/rules.mk b/source4/rules.mk
index b3a786a2c9..7e36ca2647 100644
--- a/source4/rules.mk
+++ b/source4/rules.mk
@@ -168,9 +168,6 @@ DOCBOOK_MANPAGE_URL = http://docbook.sourceforge.net/release/xsl/current/manpage
 .8.xml.8:
 	$(XSLTPROC) -o $@ $(DOCBOOK_MANPAGE_URL) $<
 
-DEP_FILES = $(patsubst %.ho,%.hd,$(patsubst %.o,%.d,$(ALL_OBJS))) \
-		   include/includes.d
-
 dist:: idl_full manpages configure distclean 
 
 configure: 
-- 
cgit