From 958602c5b7fd983198a09951bdfd45bf2664fc99 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Fri, 3 Feb 2006 15:53:55 +0000 Subject: 2006-02-03 Thomas Schwinge * Makerules.in: Set no_deps to true if we don't need the dependency files. * i386/linux/Makefile.in: Do care about linux-flags if no_deps is true; reverting the change from 2006-01-31. --- ChangeLog | 5 +++++ Makerules.in | 5 +++++ i386/linux/Makefile.in | 4 ---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e6e2b3e..c93a978 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2006-02-03 Thomas Schwinge + * Makerules.in: Set no_deps to true if we don't need the dependency + files. + * i386/linux/Makefile.in: Do care about linux-flags if no_deps is true; + reverting the change from 2006-01-31. + * Makefile.in: Include Makerules through top_builddir, so that it will automatically be rebuilt if needed. diff --git a/Makerules.in b/Makerules.in index 864bdf3..b0dfc35 100644 --- a/Makerules.in +++ b/Makerules.in @@ -103,6 +103,11 @@ ASFLAGS += -DASSEMBLER # Dependency generation # +# Don't build and include dependency files if they're not needed. +ifeq ($(strip $(filter-out %clean, $(MAKECMDGOALS))),) +no_deps = t +endif + # Include dependency files ifneq ($(no_deps),t) diff --git a/i386/linux/Makefile.in b/i386/linux/Makefile.in index d998b75..ea422fb 100644 --- a/i386/linux/Makefile.in +++ b/i386/linux/Makefile.in @@ -159,8 +159,6 @@ linux-asm-spec-flags = -D__KERNEL__ -D__ASSEMBLY__ -traditional \ # Here is where those specs are found. -ifneq ($(no_deps),t) - -include linux-flags # How to make this file: @@ -197,8 +195,6 @@ ifneq ($(linux-flags-done),$(all-linux-files) $(linux-asm-files)) no_deps=t endif -endif - objfiles += $(sort $(device_drivers)) -- cgit v1.2.3