diff options
| -rw-r--r-- | klibc/klibc/Makefile | 12 | ||||
| -rw-r--r-- | klibc/klibc/socketcalls.pl | 4 | ||||
| -rw-r--r-- | klibc/klibc/syscalls.pl | 2 | ||||
| -rw-r--r-- | klibc/version | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/klibc/klibc/Makefile b/klibc/klibc/Makefile index 181a226151..dff813fc59 100644 --- a/klibc/klibc/Makefile +++ b/klibc/klibc/Makefile @@ -139,8 +139,8 @@ syscalls.nrs: ../include/sys/syscall.h $(CC) $(CFLAGS) -Wp,-dM -x c -E -o $@ $< syscalls.dir: SYSCALLS.i syscalls.pl arch/$(ARCH)/sysstub.ph syscommon.h syscalls.nrs - rm -rf syscalls - mkdir syscalls + rm -f syscalls/*.[Ssco] syscalls/*.obj + mkdir -p syscalls $(PERL) syscalls.pl SYSCALLS.i arch/$(ARCH)/sysstub.ph $(ARCH) \ $(BITSIZE) syscalls.nrs \ syscalls ../include/klibc/havesyscall.h @@ -150,8 +150,8 @@ syscalls.dir: SYSCALLS.i syscalls.pl arch/$(ARCH)/sysstub.ph syscommon.h syscall : Generated by side effect socketcalls.dir: SOCKETCALLS.def socketcalls.pl socketcommon.h - rm -rf socketcalls - mkdir socketcalls + rm -f socketcalls/*.[Ssco] socketcalls/*.obj + mkdir -p socketcalls $(PERL) socketcalls.pl SOCKETCALLS.def $(ARCH) socketcalls touch $@ @@ -167,8 +167,8 @@ clean: archclean find . -type f -a \( -name \*.[isoa] -o -name \*.l[iso] \) -print0 | xargs -0rt rm -f rm -f *.a *.so *.hash *.syms *.stripped rm -f $(TESTS) tests/*.stripped - rm -rf syscalls syscalls.dir - rm -rf socketcalls socketcalls.dir + rm -f syscalls/*.[Ssco] syscalls/*.obj syscalls.dir + rm -f socketcalls/*.[Ssco] socketcalls/*.obj socketcalls.dir rm -f sha1hash errlist.c spotless: clean diff --git a/klibc/klibc/socketcalls.pl b/klibc/klibc/socketcalls.pl index 024483f716..68f0fa164b 100644 --- a/klibc/klibc/socketcalls.pl +++ b/klibc/klibc/socketcalls.pl @@ -40,7 +40,7 @@ while ( defined($line = <FILE>) ) { push(@cargs, "$arg a".$i++); } $nargs = $i; - print " \\\n\tsocketcalls/${name}.o"; + print " \\\n\t${name}.o"; if ( $arch eq 'i386' ) { open(OUT, '>', "${outputdir}/${name}.S") @@ -61,7 +61,7 @@ while ( defined($line = <FILE>) ) { open(OUT, '>', "${outputdir}/${name}.c") or die "$0: Cannot open ${outputdir}/${name}.c\n"; - print OUT "#include \"socketcommon.h\"\n"; + print OUT "#include \"../socketcommon.h\"\n"; print OUT "\n"; print OUT "#ifndef __NR_${name}\n\n"; diff --git a/klibc/klibc/syscalls.pl b/klibc/klibc/syscalls.pl index 9cea63097b..0575fa6648 100644 --- a/klibc/klibc/syscalls.pl +++ b/klibc/klibc/syscalls.pl @@ -107,7 +107,7 @@ while ( defined($line = <FILE>) ) { @args = split(/\s*\,\s*/, $argv); print HAVESYS "#define _KLIBC_HAVE_SYSCALL_${fname} ${sname}\n"; - print " \\\n\tsyscalls/${fname}.o"; + print " \\\n\t${fname}.o"; make_sysstub($outputdir, $fname, $type, $sname, $stype, @args); } else { die "$file:$.: Could not parse input: \"$line\"\n"; diff --git a/klibc/version b/klibc/version index af0b7ddbff..238d6e882a 100644 --- a/klibc/version +++ b/klibc/version @@ -1 +1 @@ -1.0.6 +1.0.7 |