Distributed the preinstall of the header files to the directories

owning the header files.

11 files changed, 139 insertions, 432 deletions

diff --git a/c/src/libnetworking/arpa/Makefile.am b/c/src/libnetworking/arpa/Makefile.am
index dba97b83d5..6ee4bfbe74 100644
--- a/c/src/libnetworking/arpa/Makefile.am
+++ b/c/src/libnetworking/arpa/Makefile.am
@@ -4,6 +4,18 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-EXTRA_DIST = ftp.h inet.h nameser.h nameser_compat.h telnet.h
+H_FILES = ftp.h inet.h nameser.h nameser_compat.h telnet.h
+
+noinst_HEADERS = $(H_FILES)
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/arpa $(H_FILES:%=$(PROJECT_INCLUDE)/arpa/%)
+
+$(PROJECT_INCLUDE)/arpa:
+	@$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/arpa/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
+all-local: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libnetworking/include/Makefile.am b/c/src/libnetworking/include/Makefile.am
index aac9766ccd..888ef5599d 100644
--- a/c/src/libnetworking/include/Makefile.am
+++ b/c/src/libnetworking/include/Makefile.am
@@ -10,56 +10,8 @@ AUTOMAKE_OPTIONS = foreign 1.4
 H_FILES = ../bpfilter.h ../loop.h ../netdb.h ../opt_ipfw.h ../opt_mrouting.h \
     ../opt_tcpdebug.h ../poll.h ../resolv.h ../syslog.h ../memory.h
 
-SYS_H_FILES = ../sys/buf.h ../sys/callout.h ../sys/cdefs.h ../sys/conf.h \
-    ../sys/domain.h ../sys/filio.h ../sys/ioccom.h ../sys/ioctl.h \
-    ../sys/kernel.h ../sys/libkern.h ../sys/malloc.h ../sys/mbuf.h \
-    ../sys/mount.h ../sys/param.h ../sys/proc.h ../sys/protosw.h \
-    ../sys/queue.h ../sys/reboot.h ../sys/resourcevar.h ../sys/rtprio.h \
-    ../sys/select.h ../sys/signalvar.h ../sys/socket.h ../sys/socketvar.h \
-    ../sys/sockio.h ../sys/sysctl.h ../sys/syslimits.h ../sys/syslog.h \
-    ../sys/systm.h ../sys/ttycom.h ../sys/ttydefaults.h ../sys/ucred.h \
-    ../sys/uio.h ../sys/un.h
-
-RTEMS_H_FILES = ../rtems/rtems_bsdnet.h ../rtems/rtems_bsdnet_internal.h \
-    ../rtems/tftp.h
-
-MACHINE_H_FILES = ../machine/conf.h ../machine/cpu.h ../machine/cpufunc.h \
-    ../machine/endian.h ../machine/in_cksum.h ../machine/limits.h \
-    ../machine/param.h ../machine/types.h ../machine/vmparam.h
-
-VM_H_FILES = ../vm/vm.h ../vm/vm_extern.h ../vm/vm_kern.h ../vm/vm_param.h
-
-NET_H_FILES = ../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
-
-NETINET_H_FILES = ../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
-
-ARPA_H_FILES = ../arpa/ftp.h ../arpa/inet.h ../arpa/nameser.h \
-    ../arpa/nameser_compat.h ../arpa/telnet.h
-
-NFS_H_FILES = ../nfs/krpc.h ../nfs/nfs.h ../nfs/nfsdiskless.h \
-    ../nfs/nfsproto.h ../nfs/rpcv2.h ../nfs/xdr_subs.h
-
-RTEMS_SERVERS_H_FILES = ../rtems_servers/ftpd.h
-
-RTEMS_WEBSERVER_H_FILES = ../rtems_webserver/rtems_webserver.h
-
 # We only make the install point for the networking header files if needed.
 
-INSTALLDIRS = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/sys \
-    $(PROJECT_INCLUDE)/machine $(PROJECT_INCLUDE)/rtems \
-    $(PROJECT_INCLUDE)/vm $(PROJECT_INCLUDE)/net $(PROJECT_INCLUDE)/netinet \
-    $(PROJECT_INCLUDE)/arpa $(PROJECT_INCLUDE)/nfs
-
 $(INSTALLDIRS):
 	$(mkinstalldirs) $@
 
@@ -93,369 +45,12 @@ $(PROJECT_INCLUDE)/syslog.h: ../syslog.h
 $(PROJECT_INCLUDE)/memory.h: ../memory.h
 	$(INSTALL_DATA) $< $@
 
-$(PROJECT_INCLUDE)/sys/buf.h: ../sys/buf.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/callout.h: ../sys/callout.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/cdefs.h: ../sys/cdefs.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/conf.h: ../sys/conf.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/domain.h: ../sys/domain.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/filio.h: ../sys/filio.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/ioccom.h: ../sys/ioccom.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/ioctl.h: ../sys/ioctl.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/kernel.h: ../sys/kernel.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/libkern.h: ../sys/libkern.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/malloc.h: ../sys/malloc.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/mbuf.h: ../sys/mbuf.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/mount.h: ../sys/mount.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/param.h: ../sys/param.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/proc.h: ../sys/proc.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/protosw.h: ../sys/protosw.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/queue.h: ../sys/queue.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/reboot.h: ../sys/reboot.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/resourcevar.h: ../sys/resourcevar.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/rtprio.h: ../sys/rtprio.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/select.h: ../sys/select.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/signalvar.h: ../sys/signalvar.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/socket.h: ../sys/socket.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/socketvar.h: ../sys/socketvar.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/sockio.h: ../sys/sockio.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/sysctl.h: ../sys/sysctl.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/syslimits.h: ../sys/syslimits.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/syslog.h: ../sys/syslog.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/systm.h: ../sys/systm.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/ttycom.h: ../sys/ttycom.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/ttydefaults.h: ../sys/ttydefaults.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/ucred.h: ../sys/ucred.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/uio.h: ../sys/uio.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/sys/un.h: ../sys/un.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/rtems/rtems_bsdnet.h: ../rtems/rtems_bsdnet.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/rtems/rtems_bsdnet_internal.h: \
-    ../rtems/rtems_bsdnet_internal.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/rtems/tftp.h: ../rtems/tftp.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/machine/conf.h: ../machine/conf.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/machine/cpu.h: ../machine/cpu.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/machine/cpufunc.h: ../machine/cpufunc.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/machine/endian.h: ../machine/endian.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/machine/in_cksum.h: ../machine/in_cksum.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/machine/limits.h: ../machine/limits.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/machine/param.h: ../machine/param.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/machine/types.h: ../machine/types.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/machine/vmparam.h: ../machine/vmparam.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/vm/vm.h: ../vm/vm.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/vm/vm_extern.h: ../vm/vm_extern.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/vm/vm_kern.h: ../vm/vm_kern.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/vm/vm_param.h: ../vm/vm_param.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/bpf.h: ../net/bpf.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/ethernet.h: ../net/ethernet.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/if.h: ../net/if.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/if_arp.h: ../net/if_arp.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/if_dl.h: ../net/if_dl.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/if_llc.h: ../net/if_llc.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/if_ppp.h: ../net/if_ppp.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/if_types.h: ../net/if_types.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/netisr.h: ../net/netisr.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/ppp-comp.h: ../net/ppp-comp.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/ppp_defs.h: ../net/ppp_defs.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/radix.h: ../net/radix.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/raw_cb.h: ../net/raw_cb.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/net/route.h: ../net/route.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/icmp_var.h: ../netinet/icmp_var.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/if_ether.h: ../netinet/if_ether.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/igmp.h: ../netinet/igmp.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/igmp_var.h: ../netinet/igmp_var.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/in.h: ../netinet/in.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/in_pcb.h: ../netinet/in_pcb.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/in_systm.h: ../netinet/in_systm.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/in_var.h: ../netinet/in_var.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/ip.h: ../netinet/ip.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/ip_fw.h: ../netinet/ip_fw.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/ip_icmp.h: ../netinet/ip_icmp.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/ip_mroute.h: ../netinet/ip_mroute.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/ip_var.h: ../netinet/ip_var.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/tcp.h: ../netinet/tcp.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/tcp_debug.h: ../netinet/tcp_debug.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/tcp_fsm.h: ../netinet/tcp_fsm.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/tcp_seq.h: ../netinet/tcp_seq.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/tcp_timer.h: ../netinet/tcp_timer.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/tcp_var.h: ../netinet/tcp_var.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/tcpip.h: ../netinet/tcpip.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/udp.h: ../netinet/udp.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/netinet/udp_var.h: ../netinet/udp_var.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/arpa/ftp.h: ../arpa/ftp.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/arpa/inet.h: ../arpa/inet.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/arpa/nameser.h: ../arpa/nameser.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/arpa/nameser_compat.h: ../arpa/nameser_compat.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/arpa/telnet.h: ../arpa/telnet.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/nfs/krpc.h: ../nfs/krpc.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/nfs/nfs.h: ../nfs/nfs.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/nfs/nfsdiskless.h: ../nfs/nfsdiskless.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/nfs/nfsproto.h: ../nfs/nfsproto.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/nfs/rpcv2.h: ../nfs/rpcv2.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/nfs/xdr_subs.h: ../nfs/xdr_subs.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/ftpd.h: ../rtems_servers/ftpd.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/rtems_webserver.h: ../rtems_webserver/rtems_webserver.h
-	$(INSTALL_DATA) $< $@
-
 PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bpfilter.h \
     $(PROJECT_INCLUDE)/loop.h $(PROJECT_INCLUDE)/netdb.h \
     $(PROJECT_INCLUDE)/opt_ipfw.h $(PROJECT_INCLUDE)/opt_mrouting.h \
     $(PROJECT_INCLUDE)/opt_tcpdebug.h $(PROJECT_INCLUDE)/poll.h \
     $(PROJECT_INCLUDE)/resolv.h $(PROJECT_INCLUDE)/syslog.h \
-    $(PROJECT_INCLUDE)/memory.h \
-    $(PROJECT_INCLUDE)/sys $(PROJECT_INCLUDE)/sys/buf.h \
-    $(PROJECT_INCLUDE)/sys/callout.h $(PROJECT_INCLUDE)/sys/cdefs.h \
-    $(PROJECT_INCLUDE)/sys/conf.h $(PROJECT_INCLUDE)/sys/domain.h \
-    $(PROJECT_INCLUDE)/sys/filio.h $(PROJECT_INCLUDE)/sys/ioccom.h \
-    $(PROJECT_INCLUDE)/sys/ioctl.h $(PROJECT_INCLUDE)/sys/kernel.h \
-    $(PROJECT_INCLUDE)/sys/libkern.h $(PROJECT_INCLUDE)/sys/malloc.h \
-    $(PROJECT_INCLUDE)/sys/mbuf.h $(PROJECT_INCLUDE)/sys/mount.h \
-    $(PROJECT_INCLUDE)/sys/param.h $(PROJECT_INCLUDE)/sys/proc.h \
-    $(PROJECT_INCLUDE)/sys/protosw.h $(PROJECT_INCLUDE)/sys/queue.h \
-    $(PROJECT_INCLUDE)/sys/reboot.h $(PROJECT_INCLUDE)/sys/resourcevar.h \
-    $(PROJECT_INCLUDE)/sys/rtprio.h $(PROJECT_INCLUDE)/sys/select.h \
-    $(PROJECT_INCLUDE)/sys/signalvar.h $(PROJECT_INCLUDE)/sys/socket.h \
-    $(PROJECT_INCLUDE)/sys/socketvar.h $(PROJECT_INCLUDE)/sys/sockio.h \
-    $(PROJECT_INCLUDE)/sys/sysctl.h $(PROJECT_INCLUDE)/sys/syslimits.h \
-    $(PROJECT_INCLUDE)/sys/syslog.h $(PROJECT_INCLUDE)/sys/systm.h \
-    $(PROJECT_INCLUDE)/sys/ttycom.h $(PROJECT_INCLUDE)/sys/ttydefaults.h \
-    $(PROJECT_INCLUDE)/sys/ucred.h $(PROJECT_INCLUDE)/sys/uio.h \
-    $(PROJECT_INCLUDE)/sys/un.h \
-    $(PROJECT_INCLUDE)/rtems $(PROJECT_INCLUDE)/rtems/rtems_bsdnet.h \
-    $(PROJECT_INCLUDE)/rtems/rtems_bsdnet_internal.h \
-    $(PROJECT_INCLUDE)/rtems/tftp.h $(PROJECT_INCLUDE)/machine \
-    $(PROJECT_INCLUDE)/machine/conf.h $(PROJECT_INCLUDE)/machine/cpu.h \
-    $(PROJECT_INCLUDE)/machine/cpufunc.h $(PROJECT_INCLUDE)/machine/endian.h \
-    $(PROJECT_INCLUDE)/machine/in_cksum.h \
-    $(PROJECT_INCLUDE)/machine/limits.h $(PROJECT_INCLUDE)/machine/param.h \
-    $(PROJECT_INCLUDE)/machine/types.h $(PROJECT_INCLUDE)/machine/vmparam.h \
-    $(PROJECT_INCLUDE)/vm $(PROJECT_INCLUDE)/vm/vm.h \
-    $(PROJECT_INCLUDE)/vm/vm_extern.h $(PROJECT_INCLUDE)/vm/vm_kern.h \
-    $(PROJECT_INCLUDE)/vm/vm_param.h $(PROJECT_INCLUDE)/net \
-    $(PROJECT_INCLUDE)/net/bpf.h $(PROJECT_INCLUDE)/net/ethernet.h \
-    $(PROJECT_INCLUDE)/net/if.h $(PROJECT_INCLUDE)/net/if_arp.h \
-    $(PROJECT_INCLUDE)/net/if_dl.h $(PROJECT_INCLUDE)/net/if_llc.h \
-    $(PROJECT_INCLUDE)/net/if_ppp.h $(PROJECT_INCLUDE)/net/if_types.h \
-    $(PROJECT_INCLUDE)/net/netisr.h $(PROJECT_INCLUDE)/net/ppp-comp.h \
-    $(PROJECT_INCLUDE)/net/ppp_defs.h $(PROJECT_INCLUDE)/net/radix.h \
-    $(PROJECT_INCLUDE)/net/raw_cb.h $(PROJECT_INCLUDE)/net/route.h \
-    $(PROJECT_INCLUDE)/netinet $(PROJECT_INCLUDE)/netinet/icmp_var.h \
-    $(PROJECT_INCLUDE)/netinet/if_ether.h $(PROJECT_INCLUDE)/netinet/igmp.h \
-    $(PROJECT_INCLUDE)/netinet/igmp_var.h $(PROJECT_INCLUDE)/netinet/in.h \
-    $(PROJECT_INCLUDE)/netinet/in_pcb.h \
-    $(PROJECT_INCLUDE)/netinet/in_systm.h \
-    $(PROJECT_INCLUDE)/netinet/in_var.h $(PROJECT_INCLUDE)/netinet/ip.h \
-    $(PROJECT_INCLUDE)/netinet/ip_fw.h $(PROJECT_INCLUDE)/netinet/ip_icmp.h \
-    $(PROJECT_INCLUDE)/netinet/ip_mroute.h \
-    $(PROJECT_INCLUDE)/netinet/ip_var.h $(PROJECT_INCLUDE)/netinet/tcp.h \
-    $(PROJECT_INCLUDE)/netinet/tcp_debug.h \
-    $(PROJECT_INCLUDE)/netinet/tcp_fsm.h \
-    $(PROJECT_INCLUDE)/netinet/tcp_seq.h \
-    $(PROJECT_INCLUDE)/netinet/tcp_timer.h \
-    $(PROJECT_INCLUDE)/netinet/tcp_var.h $(PROJECT_INCLUDE)/netinet/tcpip.h \
-    $(PROJECT_INCLUDE)/netinet/udp.h $(PROJECT_INCLUDE)/netinet/udp_var.h \
-    $(PROJECT_INCLUDE)/arpa $(PROJECT_INCLUDE)/arpa/ftp.h \
-    $(PROJECT_INCLUDE)/arpa/inet.h $(PROJECT_INCLUDE)/arpa/nameser.h \
-    $(PROJECT_INCLUDE)/arpa/nameser_compat.h \
-    $(PROJECT_INCLUDE)/arpa/telnet.h $(PROJECT_INCLUDE)/nfs \
-    $(PROJECT_INCLUDE)/nfs/krpc.h $(PROJECT_INCLUDE)/nfs/nfs.h \
-    $(PROJECT_INCLUDE)/nfs/nfsdiskless.h $(PROJECT_INCLUDE)/nfs/nfsproto.h \
-    $(PROJECT_INCLUDE)/nfs/rpcv2.h $(PROJECT_INCLUDE)/nfs/xdr_subs.h \
-    $(PROJECT_INCLUDE)/ftpd.h $(PROJECT_INCLUDE)/rtems_webserver.h
+    $(PROJECT_INCLUDE)/memory.h
 
 all-local: $(PREINSTALL_FILES)
 
diff --git a/c/src/libnetworking/machine/Makefile.am b/c/src/libnetworking/machine/Makefile.am
index 1afebd3827..e703d0b82b 100644
--- a/c/src/libnetworking/machine/Makefile.am
+++ b/c/src/libnetworking/machine/Makefile.am
@@ -4,7 +4,20 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-EXTRA_DIST = conf.h cpu.h cpufunc.h endian.h in_cksum.h limits.h param.h \
+H_FILES = conf.h cpu.h cpufunc.h endian.h in_cksum.h limits.h param.h \
     types.h vmparam.h
 
+noinst_HEADERS = $(H_FILES)
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine \
+    $(H_FILES:%=$(PROJECT_INCLUDE)/machine/%)
+
+$(PROJECT_INCLUDE)/machine:
+	@$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/machine/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
+all-local: $(PREINSTALL_FILES)
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libnetworking/net/Makefile.am b/c/src/libnetworking/net/Makefile.am
index 353ecbfae0..eda18a9c76 100644
--- a/c/src/libnetworking/net/Makefile.am
+++ b/c/src/libnetworking/net/Makefile.am
@@ -26,12 +26,24 @@ AM_CPPFLAGS += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS -DDIAGNOSTIC \
 $(LIB): $(OBJS)
 	$(make-library)
 
-all-local: $(ARCH) $(OBJS) $(LIB)
+all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB)
 
 .PRECIOUS: $(LIB)
 
-EXTRA_DIST = bpf.h ethernet.h if.c if.h if_arp.h if_dl.h if_ethersubr.c \
-    if_llc.h if_loop.c if_ppp.h if_types.h netisr.h ppp-comp.h ppp_defs.h \
-    radix.c radix.h raw_cb.c raw_cb.h raw_usrreq.c route.c route.h rtsock.c
+EXTRA_DIST = if.c if_ethersubr.c if_loop.c \
+    radix.c raw_cb.c raw_usrreq.c route.c rtsock.c
+
+H_FILES = 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
+
+noinst_HEADERS = $(H_FILES)
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/net $(H_FILES:%=$(PROJECT_INCLUDE)/net/%)
+
+$(PROJECT_INCLUDE)/net:
+	@$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/net/%.h: %.h
+	$(INSTALL_DATA) $< $@
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libnetworking/netinet/Makefile.am b/c/src/libnetworking/netinet/Makefile.am
index 861cb45ad9..dedeb31ac7 100644
--- a/c/src/libnetworking/netinet/Makefile.am
+++ b/c/src/libnetworking/netinet/Makefile.am
@@ -28,16 +28,30 @@ AM_CPPFLAGS += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS -DDIAGNOSTIC \
 $(LIB): $(OBJS)
 	$(make-library)
 
-all-local: $(ARCH) $(OBJS) $(LIB)
+all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB)
 
 .PRECIOUS: $(LIB)
 
-EXTRA_DIST = icmp_var.h if_ether.c if_ether.h igmp.c igmp.h igmp_var.h in.c \
-    in.h in_cksum.c in_cksum_i386.c in_cksum_m68k.c in_cksum_powerpc.c \
-    in_pcb.c in_pcb.h in_proto.c in_rmx.c in_systm.h in_var.h ip.h \
-    ip_divert.c ip_fw.c ip_fw.h ip_icmp.c ip_icmp.h ip_input.c ip_mroute.c \
-    ip_mroute.h ip_output.c ip_var.h raw_ip.c tcp.h tcp_debug.c tcp_debug.h \
-    tcp_fsm.h tcp_input.c tcp_output.c tcp_seq.h tcp_subr.c tcp_timer.c \
-    tcp_timer.h tcp_usrreq.c tcp_var.h tcpip.h udp.h udp_usrreq.c udp_var.h
+EXTRA_DIST = if_ether.c igmp.c igmp_var.h in.c in_cksum.c in_cksum_i386.c \
+    in_cksum_m68k.c in_cksum_powerpc.c in_pcb.c in_proto.c in_rmx.c \
+    ip_divert.c ip_fw.c ip_icmp.c ip_input.c ip_mroute.c ip_output.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 
+
+H_FILES = 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
+
+noinst_HEADERS = $(H_FILES)
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet \
+    $(H_FILES:%=$(PROJECT_INCLUDE)/netinet/%)
+
+$(PROJECT_INCLUDE)/netinet:
+	@$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/netinet/%.h: %.h
+	$(INSTALL_DATA) $< $@
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libnetworking/nfs/Makefile.am b/c/src/libnetworking/nfs/Makefile.am
index 270a1be262..9a8b43e31a 100644
--- a/c/src/libnetworking/nfs/Makefile.am
+++ b/c/src/libnetworking/nfs/Makefile.am
@@ -25,11 +25,23 @@ AM_CPPFLAGS += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS -DDIAGNOSTIC \
 $(LIB): $(OBJS)
 	$(make-library)
 
-all-local: $(ARCH) $(OBJS) $(LIB)
+all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB)
 
 .PRECIOUS: $(LIB)
 
-EXTRA_DIST = bootp_subr.c krpc.h nfs.h nfsdiskless.h nfsproto.h rpcv2.h \
-    xdr_subs.h
+EXTRA_DIST = bootp_subr.c 
+
+H_FILES = krpc.h nfs.h nfsdiskless.h nfsproto.h rpcv2.h xdr_subs.h
+
+noinst_HEADERS = $(H_FILES)
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/nfs $(H_FILES:%=$(PROJECT_INCLUDE)/nfs/%)
+
+$(PROJECT_INCLUDE)/nfs:
+	@$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/nfs/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libnetworking/rtems/Makefile.am b/c/src/libnetworking/rtems/Makefile.am
index b5cae85006..dfcac20c4b 100644
--- a/c/src/libnetworking/rtems/Makefile.am
+++ b/c/src/libnetworking/rtems/Makefile.am
@@ -15,6 +15,19 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 OBJS = $(C_O_FILES)
 
+H_FILES = rtems_bsdnet.h rtems_bsdnet_internal.h tftp.h
+
+noinst_HEADERS = $(H_FILES)
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
+
+$(PROJECT_INCLUDE)/rtems:
+	@$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/rtems/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
+
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../automake/lib.am
 
@@ -28,14 +41,12 @@ AM_CPPFLAGS += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS -DDIAGNOSTIC \
 $(LIB): $(OBJS)
 	$(make-library)
 
-all-local: $(ARCH) $(OBJS) $(LIB)
+all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB)
 
 .PRECIOUS: $(LIB)
 
-EXTRA_DIST = issetugid.c rtems_bootp.c rtems_bsdnet.h \
-    rtems_bsdnet_internal.h rtems_glue.c rtems_select.c rtems_showicmpstat.c \
+EXTRA_DIST = issetugid.c rtems_bootp.c rtems_glue.c rtems_select.c rtems_showicmpstat.c \
     rtems_showifstat.c rtems_showipstat.c rtems_showmbuf.c rtems_showroute.c \
-    rtems_showtcpstat.c rtems_showudpstat.c rtems_syscall.c sghostname.c \
-    tftp.h
+    rtems_showtcpstat.c rtems_showudpstat.c rtems_syscall.c sghostname.c
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libnetworking/rtems_servers/Makefile.am b/c/src/libnetworking/rtems_servers/Makefile.am
index c2e1491b6f..2c1d356fab 100644
--- a/c/src/libnetworking/rtems_servers/Makefile.am
+++ b/c/src/libnetworking/rtems_servers/Makefile.am
@@ -22,10 +22,19 @@ include $(top_srcdir)/../../../automake/lib.am
 $(LIB): $(OBJS)
 	$(make-library)
 
-all-local: $(ARCH) $(OBJS) $(LIB)
+all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB)
 
 .PRECIOUS: $(LIB)
 
 EXTRA_DIST = ftpd.c ftpd.h
 
+H_FILES = ftpd.h
+
+noinst_HEADERS = $(H_FILES)
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%)
+
+$(PROJECT_INCLUDE)/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libnetworking/rtems_webserver/Makefile.am b/c/src/libnetworking/rtems_webserver/Makefile.am
index 58e22c8e17..f14ceaaf67 100644
--- a/c/src/libnetworking/rtems_webserver/Makefile.am
+++ b/c/src/libnetworking/rtems_webserver/Makefile.am
@@ -37,7 +37,11 @@ $(PROJECT_INCLUDE)/goahead:
 $(PROJECT_INCLUDE)/goahead/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/goahead \
+$(PROJECT_INCLUDE)/rtems_webserver.h: rtems_webserver.h
+	$(INSTALL_DATA) $< $@
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE) \
+    $(PROJECT_INCLUDE)/rtems_webserver.h $(PROJECT_INCLUDE)/goahead \
     $(H_FILES:%.h=$(PROJECT_INCLUDE)/goahead/%.h)
 
 if HAS_POSIX
diff --git a/c/src/libnetworking/sys/Makefile.am b/c/src/libnetworking/sys/Makefile.am
index 4614b5be90..07888ddcc7 100644
--- a/c/src/libnetworking/sys/Makefile.am
+++ b/c/src/libnetworking/sys/Makefile.am
@@ -4,10 +4,22 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-EXTRA_DIST = buf.h callout.h cdefs.h conf.h domain.h filio.h ioccom.h \
+H_FILES = buf.h callout.h cdefs.h conf.h domain.h filio.h ioccom.h \
     ioctl.h kernel.h libkern.h malloc.h mbuf.h mount.h param.h proc.h \
     protosw.h queue.h reboot.h resourcevar.h rtprio.h select.h signalvar.h \
     socket.h socketvar.h sockio.h sysctl.h syslimits.h syslog.h systm.h \
     ttycom.h ttydefaults.h ucred.h uio.h un.h
 
+noinst_HEADERS = $(H_FILES)
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys $(H_FILES:%=$(PROJECT_INCLUDE)/sys/%)
+
+$(PROJECT_INCLUDE)/sys:
+	@$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/sys/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
+all-local: $(PREINSTALL_FILES)
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libnetworking/vm/Makefile.am b/c/src/libnetworking/vm/Makefile.am
index e08abfe950..b72458f6cc 100644
--- a/c/src/libnetworking/vm/Makefile.am
+++ b/c/src/libnetworking/vm/Makefile.am
@@ -4,6 +4,19 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-EXTRA_DIST = vm.h vm_extern.h vm_kern.h vm_param.h
+H_FILES = vm.h vm_extern.h vm_kern.h vm_param.h
+
+noinst_HEADERS = $(H_FILES)
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/vm \
+    $(H_FILES:%=$(PROJECT_INCLUDE)/vm/%)
+
+$(PROJECT_INCLUDE)/vm:
+	@$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/vm/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
+all-local: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am