diff options
| author | Jakob Kaivo <jkk@ung.org> | 2019-01-28 20:20:56 -0500 |
|---|---|---|
| committer | Jakob Kaivo <jkk@ung.org> | 2019-01-28 20:20:56 -0500 |
| commit | 9798558082fae4ec99c602634c7e4a2cc6273905 (patch) | |
| tree | f2b86f049dde14cf5fe977133af33f24964bc627 | |
| parent | cd03132ea665b2bf0e174c8e81ff9d5d7f99f842 (diff) | |
update reflecting renamed files in 9899-1990
| -rw-r--r-- | .headers.mk | 4 | ||||
| -rw-r--r-- | Makefile | 15 |
2 files changed, 12 insertions, 7 deletions
diff --git a/.headers.mk b/.headers.mk index 700596e1..1b18ebe0 100644 --- a/.headers.mk +++ b/.headers.mk @@ -98,9 +98,9 @@ locale_h_SOURCES = \ std/9899-1990/locale/LC_MONETARY.c \ std/9899-1990/locale/LC_NUMERIC.c \ std/9899-1990/locale/LC_TIME.c \ - std/9899-1990/locale/lconv.c \ std/9899-1990/locale/localeconv.c \ std/9899-1990/locale/setlocale.c \ + std/9899-1990/locale/struct_lconv.c \ std/9899-1990/locale/NULL.ref \ std/9899-1990/stddef/NULL.c @@ -335,9 +335,9 @@ time_h_SOURCES = \ std/9899-1990/time/localtime.c \ std/9899-1990/time/mktime.c \ std/9899-1990/time/strftime.c \ + std/9899-1990/time/struct_tm.c \ std/9899-1990/time/time.c \ std/9899-1990/time/time_t.c \ - std/9899-1990/time/tm.c \ std/9899-1990/time/NULL.ref \ std/9899-1990/stddef/NULL.c \ std/9899-1990/time/size_t.ref \ @@ -23,7 +23,7 @@ libc_OBJS = $(OBJDIR)/libc.o $(OBJDIR)/x86-64.o \ $(OBJDIR)/toupper.o \ $(OBJDIR)/localeconv.o \ $(OBJDIR)/setlocale.o \ - $(OBJDIR)/jmp_buf.o \ + $(OBJDIR)/struct_lconv.o \ $(OBJDIR)/longjmp.o \ $(OBJDIR)/setjmp.o \ $(OBJDIR)/raise.o \ @@ -127,6 +127,7 @@ libc_OBJS = $(OBJDIR)/libc.o $(OBJDIR)/x86-64.o \ $(OBJDIR)/localtime.o \ $(OBJDIR)/mktime.o \ $(OBJDIR)/strftime.o \ + $(OBJDIR)/struct_tm.o \ $(OBJDIR)/time.o libc.a: $(libc_OBJS) @@ -407,10 +408,6 @@ $(OBJDIR)/isxdigit.o: std/9899-1990/ctype/isxdigit.c $(INCDIR)/ctype.h -@mkdir -p $(OBJDIR) $(CC) $(CFLAGS) -c std/9899-1990/ctype/isxdigit.c -o $@ -$(OBJDIR)/jmp_buf.o: std/9899-1990/setjmp/jmp_buf.c $(INCDIR)/setjmp.h - -@mkdir -p $(OBJDIR) - $(CC) $(CFLAGS) -c std/9899-1990/setjmp/jmp_buf.c -o $@ - $(OBJDIR)/labs.o: std/9899-1990/stdlib/labs.c $(INCDIR)/stdlib.h -@mkdir -p $(OBJDIR) $(CC) $(CFLAGS) -c std/9899-1990/stdlib/labs.c -o $@ @@ -667,6 +664,14 @@ $(OBJDIR)/strtoul.o: std/9899-1990/stdlib/strtoul.c $(INCDIR)/stdlib.h -@mkdir -p $(OBJDIR) $(CC) $(CFLAGS) -c std/9899-1990/stdlib/strtoul.c -o $@ +$(OBJDIR)/struct_lconv.o: std/9899-1990/locale/struct_lconv.c $(INCDIR)/locale.h + -@mkdir -p $(OBJDIR) + $(CC) $(CFLAGS) -c std/9899-1990/locale/struct_lconv.c -o $@ + +$(OBJDIR)/struct_tm.o: std/9899-1990/time/struct_tm.c $(INCDIR)/time.h + -@mkdir -p $(OBJDIR) + $(CC) $(CFLAGS) -c std/9899-1990/time/struct_tm.c -o $@ + $(OBJDIR)/strxfrm.o: std/9899-1990/string/strxfrm.c $(INCDIR)/string.h -@mkdir -p $(OBJDIR) $(CC) $(CFLAGS) -c std/9899-1990/string/strxfrm.c -o $@ |