From 1548e7327a8b3a7967b9b37d6362297a20ab4582 Mon Sep 17 00:00:00 2001
From: josh <josh@5b3e749e-e535-0410-8002-a9bb6afbdfca>
Date: Tue, 30 Jun 2009 17:54:09 +0000
Subject: [PATCH] added SUBDIRS support to subdir.mak for recursive building

git-svn-id: svn://anubis/hos/trunk@23 5b3e749e-e535-0410-8002-a9bb6afbdfca
---
 kernel/subdir.mak | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/kernel/subdir.mak b/kernel/subdir.mak
index dcded74..4b33387 100644
--- a/kernel/subdir.mak
+++ b/kernel/subdir.mak
@@ -6,10 +6,14 @@ CDEPS           := $(COBJS:.o=.dep)
 CXXDEPS         := $(CXXOBJS:.o=.dep)
 OUTPUT_FILE     := $(SUBDIR)_all.o
 
+ifdef SUBDIRS
+SUBDIRS_clean   := $(SUBDIRS:%=%.clean)
+endif
+
 all: $(OUTPUT_FILE)
 
-$(OUTPUT_FILE): $(ASMOBJS) $(COBJS) $(CXXOBJS)
-	$(LD) -r -o $@ $^
+$(OUTPUT_FILE): $(ASMOBJS) $(COBJS) $(CXXOBJS) $(SUBDIRS)
+	$(LD) -r -o $@ $(ASMOBJS) $(COBJS) $(CXXOBJS) $(foreach subdir,$(SUBDIRS),$(subdir)/$(subdir)_all.o)
 
 %.o: %.asm
 	$(NASM) -f elf -o $@ $<
@@ -20,14 +24,25 @@ $(OUTPUT_FILE): $(ASMOBJS) $(COBJS) $(CXXOBJS)
 %.o: %.cc
 	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) $<
 
+ifdef SUBDIRS
+.PHONY: $(SUBDIRS)
+$(SUBDIRS):
+	$(MAKE) -C $@ SUBDIR=$@
+endif
+
 # Make dependency files
 %.dep: %.c
 	@set -e; rm -f $@; \
 	  $(CC) -MM $(CPPFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
 
-clean:
+clean: $(SUBDIRS_clean)
 	-rm -f *.o *.dep *~
 
+ifdef SUBDIRS
+%.clean:
+	$(MAKE) -C $* clean clean=1
+endif
+
 # Include dependency files
 ifndef clean
 -include $(DEPS)