use new dependency system

1 files changed, 17 insertions, 23 deletions

diff --git a/Makefile b/Makefile
index e16e2aeb..5c8b77fb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,32 +1,26 @@
 .POSIX:
-default: all
 
-include .config.mk
-
-all: $(TOPDIR)/.deps.mk $(INCDIR)
-	@mkdir -p $(OBJDIR)
-	$(MAKE) -f .build.mk
-
-deps: $(TOPDIR)/.headers.mk $(TOPDIR)/.deps.mk
-
-$(TOPDIR)/.deps.mk: $(TOPDIR)/mk.sh
-	sh -c '. $(TOPDIR)/mk.sh; cd $(TOPDIR); make_deps_mk'
+AR=ar
+ARFLAGS=rU
+BASE_CFLAGS=-g -Wall -Wextra -nostdinc -Iinclude -Isrc
+OBJDIR=obj
+SRCDIR=src
 
-$(TOPDIR)/.headers.mk: $(TOPDIR)/mk.sh
-	sh -c '. $(TOPDIR)/mk.sh; cd $(TOPDIR); make_headers_mk'
+all: libc_C.0
 
-#headers $(INCDIR): $(TOPDIR)/.headers.mk $(TOPDIR)/mkh.sh
-#	$(MAKE) -f $(TOPDIR)/.headers.mk headers
+include mk/all.mk
+include .config.mk
 
-test:
-	$(MAKE) all
-	cd tests && $(MAKE) && ./testlibc $(TESTS)
+cleandeps:
+	$(RM) -f mk/*.mk
+	$(RM) -f mk/*.d
 
-ctags:
-	ctags $$(find src -name \*.c)
+newdeps: cleandeps
+	printf '.POSIX:\n\nall:\n\n' > mk/deps.mk
+	for i in $$(find src -name \*.c); do sh mk/deps.sh $$i; done
 
 clean:
-	rm -rf $(OBJDIR) *.a
+	$(RM) -rf *.a $(OBJDIR)
 
-extra-clean: clean
-	rm -rf .deps .deps.mk .headers.mk $(INCDIR)
+tags:
+	ctags $$(find src -name \*.c)