From 9eadce0a5a535e211fbf4d1ade1a0370fbfd2b1a Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 18 Nov 2002 02:21:19 +0000 Subject: 2002-11-18 Ralf Corsepius * Makefile.am: Merge-in HEADER-handling from net/Makefile.am, netinet/Makefile.am, nfs/Makefile.am. * net/Makefile.am: Remove *_HEADERS. * netinet/Makefile.am: Remove *_HEADERS. * nfs/Makefile.am: Remove *_HEADERS. --- cpukit/libnetworking/ChangeLog | 8 ++++++ cpukit/libnetworking/Makefile.am | 47 +++++++++++++++++++++++++++++++- cpukit/libnetworking/net/Makefile.am | 13 --------- cpukit/libnetworking/netinet/Makefile.am | 13 --------- cpukit/libnetworking/nfs/Makefile.am | 13 --------- 5 files changed, 54 insertions(+), 40 deletions(-) diff --git a/cpukit/libnetworking/ChangeLog b/cpukit/libnetworking/ChangeLog index ae9e89921e..0001e4687f 100644 --- a/cpukit/libnetworking/ChangeLog +++ b/cpukit/libnetworking/ChangeLog @@ -1,3 +1,11 @@ +2002-11-18 Ralf Corsepius + + * Makefile.am: Merge-in HEADER-handling from + net/Makefile.am, netinet/Makefile.am, nfs/Makefile.am. + * net/Makefile.am: Remove *_HEADERS. + * netinet/Makefile.am: Remove *_HEADERS. + * nfs/Makefile.am: Remove *_HEADERS. + 2002-11-15 Ralf Corsepius * Makefile.am: Merge-in arpa/Makefile.am, machine/Makefile.am, diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am index 633f7a43b1..cdd68b7512 100644 --- a/cpukit/libnetworking/Makefile.am +++ b/cpukit/libnetworking/Makefile.am @@ -45,7 +45,52 @@ $(PROJECT_INCLUDE)/machine: PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine \ $(include_machine_HEADERS:%=$(PROJECT_INCLUDE)/%) -# sys +## net + +include_netdir = $(includedir)/net + +include_net_HEADERS = net/bpf.h net/ethernet.h net/if.h net/if_arp.h \ + net/if_dl.h net/if_llc.h net/if_ppp.h net/if_types.h net/netisr.h \ + net/ppp-comp.h net/ppp_defs.h net/radix.h net/raw_cb.h net/route.h \ + net/if_pppvar.h net/pppcompress.h + +$(PROJECT_INCLUDE)/net: + @$(mkinstalldirs) $@ + +PREINSTALL_FILES += $(PROJECT_INCLUDE)/net \ + $(include_net_HEADERS:%=$(PROJECT_INCLUDE)/%) + +## netinet + +include_netinetdir = $(includedir)/netinet + +include_netinet_HEADERS = netinet/icmp_var.h netinet/if_ether.h netinet/igmp.h \ + netinet/igmp_var.h netinet/in.h netinet/in_pcb.h netinet/in_systm.h \ + netinet/in_var.h netinet/ip.h netinet/ip_fw.h netinet/ip_icmp.h \ + netinet/ip_mroute.h netinet/ip_var.h netinet/tcp.h netinet/tcp_debug.h \ + netinet/tcp_fsm.h netinet/tcp_seq.h netinet/tcp_timer.h netinet/tcp_var.h \ + netinet/tcpip.h netinet/udp.h netinet/udp_var.h + +$(PROJECT_INCLUDE)/netinet: + @$(mkinstalldirs) $@ + +PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet \ + $(include_netinet_HEADERS:%=$(PROJECT_INCLUDE)/%) + +## nfs + +include_nfsdir = $(includedir)/nfs + +include_nfs_HEADERS = nfs/krpc.h nfs/nfs.h nfs/nfsdiskless.h nfs/nfsproto.h \ + nfs/rpcv2.h nfs/xdr_subs.h + +$(PROJECT_INCLUDE)/nfs: + @$(mkinstalldirs) $@ + +PREINSTALL_FILES += $(PROJECT_INCLUDE)/nfs \ + $(include_nfs_HEADERS:%=$(PROJECT_INCLUDE)/%) + +## sys include_sysdir = $(includedir)/sys diff --git a/cpukit/libnetworking/net/Makefile.am b/cpukit/libnetworking/net/Makefile.am index d79e88f234..f1d9d082d9 100644 --- a/cpukit/libnetworking/net/Makefile.am +++ b/cpukit/libnetworking/net/Makefile.am @@ -34,17 +34,4 @@ all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB) EXTRA_DIST = if.c if_ethersubr.c if_loop.c radix.c raw_cb.c raw_usrreq.c \ route.c rtsock.c -include_net_HEADERS = bpf.h ethernet.h if.h if_arp.h if_dl.h if_llc.h if_ppp.h \ - if_types.h netisr.h ppp-comp.h ppp_defs.h radix.h raw_cb.h route.h \ - if_pppvar.h pppcompress.h - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/net \ - $(include_net_HEADERS:%=$(PROJECT_INCLUDE)/net/%) - -$(PROJECT_INCLUDE)/net: - @$(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/net/%.h: %.h - $(INSTALL_DATA) $< $@ - include $(top_srcdir)/../automake/local.am diff --git a/cpukit/libnetworking/netinet/Makefile.am b/cpukit/libnetworking/netinet/Makefile.am index f6022fa023..0c31f06786 100644 --- a/cpukit/libnetworking/netinet/Makefile.am +++ b/cpukit/libnetworking/netinet/Makefile.am @@ -39,17 +39,4 @@ EXTRA_DIST = if_ether.c igmp.c igmp_var.h in.c in_cksum.c in_cksum_i386.c \ raw_ip.c tcp_debug.c tcp_input.c tcp_output.c tcp_subr.c tcp_timer.c \ tcp_usrreq.c udp_usrreq.c -include_netinet_HEADERS = icmp_var.h if_ether.h igmp.h igmp_var.h in.h in_pcb.h in_systm.h \ - in_var.h ip.h ip_fw.h ip_icmp.h ip_mroute.h ip_var.h tcp.h tcp_debug.h \ - tcp_fsm.h tcp_seq.h tcp_timer.h tcp_var.h tcpip.h udp.h udp_var.h - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/netinet \ - $(include_netinet_HEADERS:%=$(PROJECT_INCLUDE)/netinet/%) - -$(PROJECT_INCLUDE)/netinet: - @$(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/netinet/%.h: %.h - $(INSTALL_DATA) $< $@ - include $(top_srcdir)/../automake/local.am diff --git a/cpukit/libnetworking/nfs/Makefile.am b/cpukit/libnetworking/nfs/Makefile.am index bcec4c8f95..7adcdb613b 100644 --- a/cpukit/libnetworking/nfs/Makefile.am +++ b/cpukit/libnetworking/nfs/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -include_nfsdir = $(includedir)/nfs - LIB = $(ARCH)/lib.a C_FILES = bootp_subr.c @@ -31,15 +29,4 @@ all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB) EXTRA_DIST = bootp_subr.c -include_nfs_HEADERS = krpc.h nfs.h nfsdiskless.h nfsproto.h rpcv2.h xdr_subs.h - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/nfs \ - $(include_nfs_HEADERS:%=$(PROJECT_INCLUDE)/nfs/%) - -$(PROJECT_INCLUDE)/nfs: - @$(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/nfs/%.h: %.h - $(INSTALL_DATA) $< $@ - include $(top_srcdir)/../automake/local.am -- cgit v1.2.3