diff options
| author | Roland McGrath <roland@gnu.org> | 1998-09-05 03:58:56 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1998-09-05 03:58:56 +0000 |
| commit | 59cacc8162df151f12590ea4918cccb624abc275 (patch) | |
| tree | 5d9adb1a17aa0298319d0c54e81e49b03a3ed97c | |
| parent | a361203e5c2854f50ef19a69c37e3cb3ae80e80a (diff) | |
| download | glibc-59cacc8162df151f12590ea4918cccb624abc275.tar.gz glibc-59cacc8162df151f12590ea4918cccb624abc275.tar.xz glibc-59cacc8162df151f12590ea4918cccb624abc275.zip | |
* sysdeps/unix/sysv/linux/Makefile [$(subdir)=inet] (sysdep_headers):
Don't add netinet/udp.h, netinet/ip_icmp.h here. * sysdeps/gnu/Makefile: Do it here instead. * sysdeps/unix/sysv/linux/Dist: Move those files from here ... * sysdeps/gnu/Dist: ... to here.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/gnu/Dist | 3 | ||||
| -rw-r--r-- | sysdeps/gnu/Makefile | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/Dist | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/Makefile | 5 |
5 files changed, 16 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index f22c7300de..3d08e58ad8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 1998-09-05 Roland McGrath <roland@baalperazim.frob.com> + * sysdeps/unix/sysv/linux/Makefile [$(subdir)=inet] (sysdep_headers): + Don't add netinet/udp.h, netinet/ip_icmp.h here. + * sysdeps/gnu/Makefile: Do it here instead. + * sysdeps/unix/sysv/linux/Dist: Move those files from here ... + * sysdeps/gnu/Dist: ... to here. + * sysdeps/unix/sysv/linux/netinet/ip_icmp.h, sysdeps/unix/sysv/linux/netinet/tcp.h, sysdeps/unix/sysv/linux/netinet/udp.h: Moved to sysdeps/gnu/netinet. diff --git a/sysdeps/gnu/Dist b/sysdeps/gnu/Dist index d20d528d03..afbfd721e0 100644 --- a/sysdeps/gnu/Dist +++ b/sysdeps/gnu/Dist @@ -1,3 +1,6 @@ errlist.awk utmpx.h bits/utmpx.h +netinet/tcp.h +netinet/udp.h +netinet/ip_icmp.h diff --git a/sysdeps/gnu/Makefile b/sysdeps/gnu/Makefile index 77f0b230fd..48932c3c8a 100644 --- a/sysdeps/gnu/Makefile +++ b/sysdeps/gnu/Makefile @@ -35,3 +35,8 @@ sysdep_routines += setutxent getutxent endutxent getutxid getutxline \ sysdep_headers += utmpx.h bits/utmpx.h endif + + +ifeq ($(subdir),inet) +sysdep_headers += netinet/udp.h netinet/ip_icmp.h +endif diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist index e10e24a678..e96ef14c92 100644 --- a/sysdeps/unix/sysv/linux/Dist +++ b/sysdeps/unix/sysv/linux/Dist @@ -33,10 +33,7 @@ netinet/if_tr.h netinet/igmp.h netinet/in_systm.h netinet/ip_fw.h -netinet/ip_icmp.h netpacket/packet.h -netinet/tcp.h -netinet/udp.h netipx/ipx.h netrom/netrom.h netrose/rose.h diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index dd8db415b3..13b1c1f251 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -80,10 +80,9 @@ sysdep_headers += bits/pthreadtypes.h endif ifeq ($(subdir),inet) -sysdep_headers += netinet/in_systm.h netinet/udp.h \ +sysdep_headers += sys/socketvar.h netinet/in_systm.h netinet/ip_fw.h \ netinet/if_fddi.h netinet/if_tr.h netinet/igmp.h \ - netinet/ip_fw.h netinet/ip_icmp.h netipx/ipx.h \ - sys/socketvar.h netash/ash.h netax25/ax25.h netatalk/at.h \ + netipx/ipx.h netash/ash.h netax25/ax25.h netatalk/at.h \ netrom/netrom.h netpacket/packet.h netrose/rose.h endif |