From 57aefafe56f066b56031187ea26e49df076f2ac9 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Wed, 4 Oct 1995 21:52:33 +0000
Subject: * 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).
---
 sysdeps/unix/Makefile            | 7 ++++---
 sysdeps/unix/sysv/linux/Dist     | 2 ++
 sysdeps/unix/sysv/linux/Makefile | 7 ++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 sysdeps/unix/sysv/linux/Dist

(limited to 'sysdeps/unix')

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 $@
diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
new file mode 100644
index 0000000000..db5ff9596a
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/Dist
@@ -0,0 +1,2 @@
+sys/socketcall.h
+sys/timex.h
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 702ad047a3..6e1dd8ccb2 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -12,10 +12,15 @@ endif
 
 ifeq ($(subdir), time)
 sysdep_routines := $(sysdep_routines) adjtimex
+headers += sys/timex.h
 endif
 
 ifeq ($(subdir), sysvipc)
 sysdep_routines := $(sysdep_routines) ipc
 endif
 
-headers := $(headers) sys/socketcall.h sys/timex.h
+ifeq ($(subdir), socket)
+headers += sys/socketcall.h 
+endif
+
+config-LDFLAGS = -Wl,-dynamic-linker=/lib/ld-gnu.so.1
-- 
cgit 1.4.1