diff options
| author | Jakob Kaivo <jkk@ung.org> | 2020-08-14 22:29:46 -0400 |
|---|---|---|
| committer | Jakob Kaivo <jkk@ung.org> | 2020-08-14 22:29:46 -0400 |
| commit | 420a60e5ebee84ce714c1f31a8e54e1ae2d21f30 (patch) | |
| tree | f9125ce3403ba5ab91a0e8a491ed578c0e07d211 | |
| parent | 5e22f8ab246eae8f38b5c3f3582fb49f3d16d418 (diff) | |
use new dependency system
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 40 | ||||
| -rw-r--r-- | mk/all.mk | 1 | ||||
| -rw-r--r-- | mk/sigset_t.d | 9 |
4 files changed, 17 insertions, 34 deletions
@@ -1,4 +1,3 @@ obj *.a -.build.mk .config.mk @@ -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) @@ -967,7 +967,6 @@ include mk/regex.d include mk/__loc1.d include mk/raise.d include mk/sigismember.d -include mk/sigset_t.d include mk/siginterrupt.d include mk/signal.d include mk/kill.d diff --git a/mk/sigset_t.d b/mk/sigset_t.d deleted file mode 100644 index c0b5cbbc..00000000 --- a/mk/sigset_t.d +++ /dev/null @@ -1,9 +0,0 @@ -libc_P.1: libc.a(sigset_t.o) -libc.a(sigset_t.o): $(OBJDIR)/sigset_t.o - @$(AR) $(ARFLAGS) $@ $(OBJDIR)/$% - -$(OBJDIR)/sigset_t.o: src/signal/sigset_t.c -$(OBJDIR)/sigset_t.o: - @echo " [CC] $@" - @mkdir -p $(@D) - @$(CC) -c -o $@ $(CFLAGS) src/signal/sigset_t.c |