diff options
| author | Andreas Jaeger <aj@suse.de> | 2012-03-15 09:55:49 +0100 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2012-03-15 09:55:49 +0100 |
| commit | 556b0b6130a6f4163a2aa6c82c5176e053292385 (patch) | |
| tree | 69684db3b4145576984d20c2997bd9479f477657 /sysdeps/unix | |
| parent | 22417c803dbcfab05a7b94b903610cc53aef9af7 (diff) | |
| parent | 559398ab746fd7dbbe09e847813a1b917b9ded14 (diff) | |
| download | glibc-556b0b6130a6f4163a2aa6c82c5176e053292385.zip glibc-556b0b6130a6f4163a2aa6c82c5176e053292385.tar.gz glibc-556b0b6130a6f4163a2aa6c82c5176e053292385.tar.bz2 | |
Merge branch 'master' into bug13658-branch
Diffstat (limited to 'sysdeps/unix')
| -rw-r--r-- | sysdeps/unix/sysv/linux/Makefile | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index a97487f..120d544 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -34,9 +34,7 @@ sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \ bits/a.out.h sys/inotify.h sys/signalfd.h sys/eventfd.h \ sys/timerfd.h sys/fanotify.h bits/eventfd.h bits/inotify.h \ bits/signalfd.h bits/timerfd.h bits/epoll.h \ - bits/socket_type.h - -install-others += $(inst_includedir)/bits/syscall.h + bits/socket_type.h bits/syscall.h tests += tst-clone @@ -62,7 +60,7 @@ ifndef syscall-list-includes syscall-list-includes := bits/wordsize.h endif -$(objpfx)syscall-%.h $(objpfx)syscall-%.d: ../sysdeps/unix/sysv/linux/sys/syscall.h +$(objpfx)bits/syscall%h $(objpfx)bits/syscall%d: ../sysdeps/unix/sysv/linux/sys/syscall.h $(make-target-directory) { \ echo '/* Generated at libc build time from kernel syscall list. */';\ @@ -97,17 +95,11 @@ endif rm -f $(foreach v,$(syscall-list-variants),$(@:.h=.d)-t$(v)) mv -f $(@:.h=.d)-t3 $(@:.h=.d) -$(inst_includedir)/bits/syscall.h: $(objpfx)syscall-list.h $(+force) - $(make-target-directory) - if test -r $@ && cmp -s $< $@; \ - then echo 'bits/syscall.h unchanged'; \ - else $(INSTALL_DATA) $< $@; fi - ifndef no_deps # Get the generated list of dependencies (probably /usr/include/asm/unistd.h). --include $(objpfx)syscall-list.d +-include $(objpfx)bits/syscall.d endif -generated += syscall-list.h syscall-list.d +generated += bits/syscall.h bits/syscall.d endif ifeq ($(subdir),time) |