From 2548d14b82b4baab29b7b680ec799042983dff8f Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 10 Sep 2018 17:38:14 +0200 Subject: build: Include header.am in cpukit/Makefile.am Include all cpukit/*/header.am files in cpukit/Makefile.am. This gets rid of all subtree Makefile.am and the sudirs hack. --- cpukit/libnetworking/Makefile.am | 3 - cpukit/libnetworking/headers.am | 245 ++++++++++++++++++--------------------- 2 files changed, 110 insertions(+), 138 deletions(-) delete mode 100644 cpukit/libnetworking/Makefile.am (limited to 'cpukit/libnetworking') diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am deleted file mode 100644 index dd7ee7ab31..0000000000 --- a/cpukit/libnetworking/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -if LIBNETWORKING -include $(srcdir)/headers.am -endif diff --git a/cpukit/libnetworking/headers.am b/cpukit/libnetworking/headers.am index 72eca05d9f..3d52fa216a 100644 --- a/cpukit/libnetworking/headers.am +++ b/cpukit/libnetworking/headers.am @@ -1,150 +1,125 @@ ## In contrast to the other headers.am files, this file must be maintained by ## hand. -include_HEADERS = -include_HEADERS += ifaddrs.h -include_HEADERS += librtemsNfs.h -include_HEADERS += loop.h -include_HEADERS += resolv.h +include_HEADERS += libnetworking/ifaddrs.h +include_HEADERS += libnetworking/librtemsNfs.h +include_HEADERS += libnetworking/loop.h +include_HEADERS += libnetworking/resolv.h -include_arpadir = $(includedir)/arpa -include_arpa_HEADERS = -include_arpa_HEADERS += arpa/nameser.h -include_arpa_HEADERS += arpa/nameser_compat.h +include_arpa_HEADERS += libnetworking/arpa/nameser.h +include_arpa_HEADERS += libnetworking/arpa/nameser_compat.h -include_dev_miidir = $(includedir)/dev/mii -include_dev_mii_HEADERS = -include_dev_mii_HEADERS += dev/mii/mii.h +include_dev_mii_HEADERS += libnetworking/dev/mii/mii.h -include_machinedir = $(includedir)/machine -include_machine_HEADERS = -include_machine_HEADERS += machine/_align.h -include_machine_HEADERS += machine/_kernel_if.h -include_machine_HEADERS += machine/_kernel_lock.h -include_machine_HEADERS += machine/_kernel_socket.h -include_machine_HEADERS += machine/cpu.h -include_machine_HEADERS += machine/cpufunc.h -include_machine_HEADERS += machine/in_cksum.h -include_machine_HEADERS += machine/limits.h -include_machine_HEADERS += machine/vmparam.h +include_machine_HEADERS += libnetworking/machine/_align.h +include_machine_HEADERS += libnetworking/machine/_kernel_if.h +include_machine_HEADERS += libnetworking/machine/_kernel_lock.h +include_machine_HEADERS += libnetworking/machine/_kernel_socket.h +include_machine_HEADERS += libnetworking/machine/cpu.h +include_machine_HEADERS += libnetworking/machine/cpufunc.h +include_machine_HEADERS += libnetworking/machine/in_cksum.h +include_machine_HEADERS += libnetworking/machine/limits.h +include_machine_HEADERS += libnetworking/machine/vmparam.h -include_netdir = $(includedir)/net -include_net_HEADERS = -include_net_HEADERS += net/bpf.h -include_net_HEADERS += net/ethernet.h -include_net_HEADERS += net/if_arp.h -include_net_HEADERS += net/if_dl.h -include_net_HEADERS += net/if_llc.h -include_net_HEADERS += net/if_media.h -include_net_HEADERS += net/if_ppp.h -include_net_HEADERS += net/if_pppvar.h -include_net_HEADERS += net/if_types.h -include_net_HEADERS += net/if_var.h -include_net_HEADERS += net/netisr.h -include_net_HEADERS += net/ppp_comp.h -include_net_HEADERS += net/ppp_defs.h -include_net_HEADERS += net/radix.h -include_net_HEADERS += net/raw_cb.h -include_net_HEADERS += net/route.h -include_net_HEADERS += net/slcompress.h +include_net_HEADERS += libnetworking/net/bpf.h +include_net_HEADERS += libnetworking/net/ethernet.h +include_net_HEADERS += libnetworking/net/if_arp.h +include_net_HEADERS += libnetworking/net/if_dl.h +include_net_HEADERS += libnetworking/net/if_llc.h +include_net_HEADERS += libnetworking/net/if_media.h +include_net_HEADERS += libnetworking/net/if_ppp.h +include_net_HEADERS += libnetworking/net/if_pppvar.h +include_net_HEADERS += libnetworking/net/if_types.h +include_net_HEADERS += libnetworking/net/if_var.h +include_net_HEADERS += libnetworking/net/netisr.h +include_net_HEADERS += libnetworking/net/ppp_comp.h +include_net_HEADERS += libnetworking/net/ppp_defs.h +include_net_HEADERS += libnetworking/net/radix.h +include_net_HEADERS += libnetworking/net/raw_cb.h +include_net_HEADERS += libnetworking/net/route.h +include_net_HEADERS += libnetworking/net/slcompress.h -include_netinetdir = $(includedir)/netinet -include_netinet_HEADERS = -include_netinet_HEADERS += netinet/icmp_var.h -include_netinet_HEADERS += netinet/if_ether.h -include_netinet_HEADERS += netinet/igmp.h -include_netinet_HEADERS += netinet/igmp_var.h -include_netinet_HEADERS += netinet/in_pcb.h -include_netinet_HEADERS += netinet/in_systm.h -include_netinet_HEADERS += netinet/in_var.h -include_netinet_HEADERS += netinet/ip.h -include_netinet_HEADERS += netinet/ip_fw.h -include_netinet_HEADERS += netinet/ip_icmp.h -include_netinet_HEADERS += netinet/ip_mroute.h -include_netinet_HEADERS += netinet/ip_var.h -include_netinet_HEADERS += netinet/tcp_debug.h -include_netinet_HEADERS += netinet/tcp_fsm.h -include_netinet_HEADERS += netinet/tcp_seq.h -include_netinet_HEADERS += netinet/tcp_timer.h -include_netinet_HEADERS += netinet/tcp_var.h -include_netinet_HEADERS += netinet/tcpip.h -include_netinet_HEADERS += netinet/udp.h -include_netinet_HEADERS += netinet/udp_var.h +include_netinet_HEADERS += libnetworking/netinet/icmp_var.h +include_netinet_HEADERS += libnetworking/netinet/if_ether.h +include_netinet_HEADERS += libnetworking/netinet/igmp.h +include_netinet_HEADERS += libnetworking/netinet/igmp_var.h +include_netinet_HEADERS += libnetworking/netinet/in_pcb.h +include_netinet_HEADERS += libnetworking/netinet/in_systm.h +include_netinet_HEADERS += libnetworking/netinet/in_var.h +include_netinet_HEADERS += libnetworking/netinet/ip.h +include_netinet_HEADERS += libnetworking/netinet/ip_fw.h +include_netinet_HEADERS += libnetworking/netinet/ip_icmp.h +include_netinet_HEADERS += libnetworking/netinet/ip_mroute.h +include_netinet_HEADERS += libnetworking/netinet/ip_var.h +include_netinet_HEADERS += libnetworking/netinet/tcp_debug.h +include_netinet_HEADERS += libnetworking/netinet/tcp_fsm.h +include_netinet_HEADERS += libnetworking/netinet/tcp_seq.h +include_netinet_HEADERS += libnetworking/netinet/tcp_timer.h +include_netinet_HEADERS += libnetworking/netinet/tcp_var.h +include_netinet_HEADERS += libnetworking/netinet/tcpip.h +include_netinet_HEADERS += libnetworking/netinet/udp.h +include_netinet_HEADERS += libnetworking/netinet/udp_var.h -include_nfsdir = $(includedir)/nfs -include_nfs_HEADERS = -include_nfs_HEADERS += nfs/nfsproto.h -include_nfs_HEADERS += nfs/rpcv2.h -include_nfs_HEADERS += nfs/xdr_subs.h +include_nfs_HEADERS += libnetworking/nfs/nfsproto.h +include_nfs_HEADERS += libnetworking/nfs/rpcv2.h +include_nfs_HEADERS += libnetworking/nfs/xdr_subs.h -include_nfsclientdir = $(includedir)/nfsclient -include_nfsclient_HEADERS = -include_nfsclient_HEADERS += nfsclient/nfsargs.h -include_nfsclient_HEADERS += nfsclient/nfsdiskless.h +include_nfsclient_HEADERS += libnetworking/nfsclient/nfsargs.h +include_nfsclient_HEADERS += libnetworking/nfsclient/nfsdiskless.h -include_rpcdir = $(includedir)/rpc -include_rpc_HEADERS = -include_rpc_HEADERS += rpc/auth.h -include_rpc_HEADERS += rpc/auth_unix.h -include_rpc_HEADERS += rpc/clnt.h -include_rpc_HEADERS += rpc/clnt_soc.h -include_rpc_HEADERS += rpc/clnt_stat.h -include_rpc_HEADERS += rpc/pmap_clnt.h -include_rpc_HEADERS += rpc/pmap_prot.h -include_rpc_HEADERS += rpc/pmap_rmt.h -include_rpc_HEADERS += rpc/rpc.h -include_rpc_HEADERS += rpc/rpc_com.h -include_rpc_HEADERS += rpc/rpc_msg.h -include_rpc_HEADERS += rpc/rpcent.h -include_rpc_HEADERS += rpc/svc.h -include_rpc_HEADERS += rpc/svc_auth.h -include_rpc_HEADERS += rpc/svc_soc.h -include_rpc_HEADERS += rpc/types.h -include_rpc_HEADERS += rpc/xdr.h +include_rpc_HEADERS += libnetworking/rpc/auth.h +include_rpc_HEADERS += libnetworking/rpc/auth_unix.h +include_rpc_HEADERS += libnetworking/rpc/clnt.h +include_rpc_HEADERS += libnetworking/rpc/clnt_soc.h +include_rpc_HEADERS += libnetworking/rpc/clnt_stat.h +include_rpc_HEADERS += libnetworking/rpc/pmap_clnt.h +include_rpc_HEADERS += libnetworking/rpc/pmap_prot.h +include_rpc_HEADERS += libnetworking/rpc/pmap_rmt.h +include_rpc_HEADERS += libnetworking/rpc/rpc.h +include_rpc_HEADERS += libnetworking/rpc/rpc_com.h +include_rpc_HEADERS += libnetworking/rpc/rpc_msg.h +include_rpc_HEADERS += libnetworking/rpc/rpcent.h +include_rpc_HEADERS += libnetworking/rpc/svc.h +include_rpc_HEADERS += libnetworking/rpc/svc_auth.h +include_rpc_HEADERS += libnetworking/rpc/svc_soc.h +include_rpc_HEADERS += libnetworking/rpc/types.h +include_rpc_HEADERS += libnetworking/rpc/xdr.h -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = -include_rtems_HEADERS += rtems/bootp.h -include_rtems_HEADERS += rtems/dhcp.h -include_rtems_HEADERS += rtems/mkrootfs.h -include_rtems_HEADERS += rtems/rtems_bsdnet.h -include_rtems_HEADERS += rtems/rtems_bsdnet_internal.h -include_rtems_HEADERS += rtems/rtems_dhcp_failsafe.h -include_rtems_HEADERS += rtems/rtems_mii_ioctl.h -include_rtems_HEADERS += rtems/rtems_netdb.h -include_rtems_HEADERS += rtems/rtems_netinet_in.h -include_rtems_HEADERS += rtems/rtems_syscall.h +include_rtems_HEADERS += libnetworking/rtems/bootp.h +include_rtems_HEADERS += libnetworking/rtems/dhcp.h +include_rtems_HEADERS += libnetworking/rtems/mkrootfs.h +include_rtems_HEADERS += libnetworking/rtems/rtems_bsdnet.h +include_rtems_HEADERS += libnetworking/rtems/rtems_bsdnet_internal.h +include_rtems_HEADERS += libnetworking/rtems/rtems_dhcp_failsafe.h +include_rtems_HEADERS += libnetworking/rtems/rtems_mii_ioctl.h +include_rtems_HEADERS += libnetworking/rtems/rtems_netdb.h +include_rtems_HEADERS += libnetworking/rtems/rtems_netinet_in.h +include_rtems_HEADERS += libnetworking/rtems/rtems_syscall.h -include_rtems_bsdnetdir = $(includedir)/rtems/bsdnet -include_rtems_bsdnet_HEADERS = -include_rtems_bsdnet_HEADERS += rtems/bsdnet/_types.h -include_rtems_bsdnet_HEADERS += rtems/bsdnet/servers.h +include_rtems_bsdnet_HEADERS += libnetworking/rtems/bsdnet/_types.h +include_rtems_bsdnet_HEADERS += libnetworking/rtems/bsdnet/servers.h -include_sysdir = $(includedir)/sys -include_sys_HEADERS = -include_sys_HEADERS += sys/callout.h -include_sys_HEADERS += sys/conf.h -include_sys_HEADERS += sys/domain.h -include_sys_HEADERS += sys/kernel.h -include_sys_HEADERS += sys/libkern.h -include_sys_HEADERS += sys/linker_set.h -include_sys_HEADERS += sys/malloc.h -include_sys_HEADERS += sys/mbuf.h -include_sys_HEADERS += sys/mount.h -include_sys_HEADERS += sys/proc.h -include_sys_HEADERS += sys/protosw.h -include_sys_HEADERS += sys/reboot.h -include_sys_HEADERS += sys/resourcevar.h -include_sys_HEADERS += sys/selinfo.h -include_sys_HEADERS += sys/signalvar.h -include_sys_HEADERS += sys/socketvar.h -include_sys_HEADERS += sys/sysctl.h -include_sys_HEADERS += sys/systm.h -include_sys_HEADERS += sys/ucred.h +include_sys_HEADERS += libnetworking/sys/callout.h +include_sys_HEADERS += libnetworking/sys/conf.h +include_sys_HEADERS += libnetworking/sys/domain.h +include_sys_HEADERS += libnetworking/sys/kernel.h +include_sys_HEADERS += libnetworking/sys/libkern.h +include_sys_HEADERS += libnetworking/sys/linker_set.h +include_sys_HEADERS += libnetworking/sys/malloc.h +include_sys_HEADERS += libnetworking/sys/mbuf.h +include_sys_HEADERS += libnetworking/sys/mount.h +include_sys_HEADERS += libnetworking/sys/proc.h +include_sys_HEADERS += libnetworking/sys/protosw.h +include_sys_HEADERS += libnetworking/sys/reboot.h +include_sys_HEADERS += libnetworking/sys/resourcevar.h +include_sys_HEADERS += libnetworking/sys/selinfo.h +include_sys_HEADERS += libnetworking/sys/signalvar.h +include_sys_HEADERS += libnetworking/sys/socketvar.h +include_sys_HEADERS += libnetworking/sys/sysctl.h +include_sys_HEADERS += libnetworking/sys/systm.h +include_sys_HEADERS += libnetworking/sys/ucred.h -include_vmdir = $(includedir)/vm -include_vm_HEADERS = -include_vm_HEADERS += vm/vm.h -include_vm_HEADERS += vm/vm_extern.h -include_vm_HEADERS += vm/vm_kern.h -include_vm_HEADERS += vm/vm_param.h +include_vm_HEADERS += libnetworking/vm/vm.h +include_vm_HEADERS += libnetworking/vm/vm_extern.h +include_vm_HEADERS += libnetworking/vm/vm_kern.h +include_vm_HEADERS += libnetworking/vm/vm_param.h -- cgit v1.2.3