summaryrefslogtreecommitdiff
path: root/sysdeps/unix/Makefile
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-10-04 21:52:33 +0000
committerRoland McGrath <roland@gnu.org>1995-10-04 21:52:33 +0000
commit57aefafe56f066b56031187ea26e49df076f2ac9 (patch)
tree97b0b16b37fce77f46fa995bbce497007cfbddaa /sysdeps/unix/Makefile
parent5f770861196fee245b039c1f349a25d460d30ade (diff)
* sysdeps/unix/Makefile ($(common-objpfx)ioctls): Remove NULL from
the list. * time/northamerica: Corrections to Canada data from ADO 95i. * sysdeps/unix/sysv/linux/Makefile (headers): Don't append to this unconditionally. In socket subdir, append sys/socketcall.h; in time subdir, append sys/timex.h. (config-LDFLAGS): New variable. * sysdeps/unix/sysv/linux/Dist: New file. * Makeconfig (+link): Pass $(config-LDFLAGS) before $(LDFLAGS).
Diffstat (limited to 'sysdeps/unix/Makefile')
-rw-r--r--sysdeps/unix/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/sysdeps/unix/Makefile b/sysdeps/unix/Makefile
index 6bc0f5a1d0..66a7363b95 100644
--- a/sysdeps/unix/Makefile
+++ b/sysdeps/unix/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
+# Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -197,8 +197,9 @@ endif
$(common-objpfx)ioctls: $(sysdep_dir)/unix/snarf-ioctls \
$(sysincludedir)/sys/ioctl.h $(ioctl-includes)
$(dir $<)$(notdir $<) $(filter-out $<,$^) \
- | fgrep -xv "`$(dir $<)$(notdir $<) $(termbits.h) \
- $(..)termios/sys/ttydefaults.h \
+ | fgrep -xv "`($(dir $<)$(notdir $<) $(termbits.h) \
+ $(..)termios/sys/ttydefaults.h; \
+ echo NULL) \
| sort | uniq`" \
| sort | uniq | tr '\012' ' ' > $@-tmp
mv $@-tmp $@