From 5bcbd9d68e4b37ab0ef0e50dc80330907f71a434 Mon Sep 17 00:00:00 2001 From: Travis Geiselbrecht Date: Sat, 24 Jan 2009 20:15:32 -0800 Subject: [PATCH] move the stray .mk files from the root dir into a make/ subdir --- build.mk => make/build.mk | 0 macros.mk => make/macros.mk | 0 module.mk => make/module.mk | 2 +- makefile | 6 +++--- 4 files changed, 4 insertions(+), 4 deletions(-) rename build.mk => make/build.mk (100%) rename macros.mk => make/macros.mk (100%) rename module.mk => make/module.mk (95%) diff --git a/build.mk b/make/build.mk similarity index 100% rename from build.mk rename to make/build.mk diff --git a/macros.mk b/make/macros.mk similarity index 100% rename from macros.mk rename to make/macros.mk diff --git a/module.mk b/make/module.mk similarity index 95% rename from module.mk rename to make/module.mk index 3e078136..9e82ef3b 100644 --- a/module.mk +++ b/make/module.mk @@ -15,7 +15,7 @@ MODULES := $(info including $(INCMODULES)) include $(addsuffix /rules.mk,$(INCMODULES)) -include module.mk +include make/module.mk endif diff --git a/makefile b/makefile index fe533da3..b045e719 100644 --- a/makefile +++ b/makefile @@ -1,5 +1,5 @@ -include local.mk -include macros.mk +include make/macros.mk PROJECT ?= beagle-test DEBUG ?= 2 @@ -65,7 +65,7 @@ include dev/rules.mk # recursively include any modules in the MODULE variable, leaving a trail of included # modules in the ALLMODULES list -include module.mk +include make/module.mk # any extra top level build dependencies that someone declared all:: $(EXTRA_BUILDDEPS) @@ -106,7 +106,7 @@ NM := $(TOOLCHAIN_PREFIX)nm NOECHO ?= @ # the logic to compile and link stuff is in here -include build.mk +include make/build.mk clean: $(EXTRA_CLEANDEPS) rm -f $(ALLOBJS) $(DEPS) $(GENERATED) $(OUTBIN) $(OUTELF) $(OUTELF).lst