Install bits/syscall.h through install-headers.

This commit is contained in:
Joseph Myers 2012-03-14 20:09:44 +00:00
parent e29652e7b2
commit bd951ccbe8
2 changed files with 16 additions and 12 deletions

View File

@ -1,3 +1,15 @@
2012-03-14 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add
bits/syscall.h.
($(objpfx)syscall-%.h): Rename rule to $(objpfx)bits/syscall%h.
($(objpfx)syscall-%.d): Rename rule to $(objpfx)bits/syscall%d.
($(inst_includedir)/bits/syscall.h): Remove rule.
($(objpfx)bits/syscall.d): Include instead of
$(objpfx)syscall-list.d.
(generated): Change syscall-list.h and syscall-list.d to
bits/syscall.h and bits/syscall.d.
2012-03-14 Roland McGrath <roland@hack.frob.com>
[BZ #13846]

View File

@ -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)