From e6d8fe4717c301925408786aee585fb96912e445 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 5 Feb 2001 18:36:27 +0000 Subject: 2001-02-03 Ralf Corsepius * Makefile.am, arpa/Makefile.am, machine/Makefile.am, net/Makefile.am, netinet/Makefile.am, nfs/Makefile.am, rtems/Makefile.am, rtems_servers/Makefile.am, rtems_webserver/Makefile.am, sys/Makefile.am, vm/Makefile.am: Apply include_*HEADERS instead of H_FILES. * include/Makefile.am: Remove. * Makefile.am: Add handling of *.h files. * configure.in: Remove include/Makefile. --- c/src/exec/libnetworking/ChangeLog | 11 +++++ c/src/exec/libnetworking/Makefile.am | 17 +++++++- c/src/exec/libnetworking/arpa/Makefile.am | 8 ++-- c/src/exec/libnetworking/machine/Makefile.am | 8 ++-- c/src/exec/libnetworking/net/Makefile.am | 8 ++-- c/src/exec/libnetworking/netinet/Makefile.am | 8 ++-- c/src/exec/libnetworking/nfs/Makefile.am | 8 ++-- c/src/exec/libnetworking/rtems/Makefile.am | 10 +++-- c/src/exec/libnetworking/sys/Makefile.am | 10 +++-- c/src/exec/libnetworking/vm/Makefile.am | 8 ++-- c/src/libnetworking/ChangeLog | 11 +++++ c/src/libnetworking/Makefile.am | 17 +++++++- c/src/libnetworking/arpa/Makefile.am | 8 ++-- c/src/libnetworking/configure.in | 1 - c/src/libnetworking/include/Makefile.am | 57 ------------------------- c/src/libnetworking/machine/Makefile.am | 8 ++-- c/src/libnetworking/net/Makefile.am | 8 ++-- c/src/libnetworking/netinet/Makefile.am | 8 ++-- c/src/libnetworking/nfs/Makefile.am | 8 ++-- c/src/libnetworking/rtems/Makefile.am | 10 +++-- c/src/libnetworking/rtems_servers/Makefile.am | 9 ++-- c/src/libnetworking/rtems_webserver/Makefile.am | 5 +++ c/src/libnetworking/sys/Makefile.am | 10 +++-- c/src/libnetworking/vm/Makefile.am | 8 ++-- 24 files changed, 138 insertions(+), 126 deletions(-) delete mode 100644 c/src/libnetworking/include/Makefile.am (limited to 'c') diff --git a/c/src/exec/libnetworking/ChangeLog b/c/src/exec/libnetworking/ChangeLog index 54c410a78e..1df7067298 100644 --- a/c/src/exec/libnetworking/ChangeLog +++ b/c/src/exec/libnetworking/ChangeLog @@ -1,3 +1,14 @@ +2001-02-03 Ralf Corsepius + + * Makefile.am, arpa/Makefile.am, machine/Makefile.am, net/Makefile.am, + netinet/Makefile.am, nfs/Makefile.am, rtems/Makefile.am, + rtems_servers/Makefile.am, rtems_webserver/Makefile.am, + sys/Makefile.am, vm/Makefile.am: + Apply include_*HEADERS instead of H_FILES. + * include/Makefile.am: Remove. + * Makefile.am: Add handling of *.h files. + * configure.in: Remove include/Makefile. + 2001-01-25 Eric Norum * lib/tftpDriver.c: Reduce first timeout interval. This diff --git a/c/src/exec/libnetworking/Makefile.am b/c/src/exec/libnetworking/Makefile.am index 7f09e1d21b..57f87c7b5d 100644 --- a/c/src/exec/libnetworking/Makefile.am +++ b/c/src/exec/libnetworking/Makefile.am @@ -5,11 +5,24 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I ../../../aclocal -SUBDIRS = include arpa kern machine sys vm lib libc net netinet nfs rtems \ +SUBDIRS = arpa kern machine sys vm lib libc net netinet nfs rtems \ rtems_servers pppd modem rtems_webserver wrapup -EXTRA_DIST = CHANGELOG bpfilter.h loop.h netdb.h opt_ipfw.h opt_mrouting.h \ +include_HEADERS = \ + bpfilter.h loop.h netdb.h opt_ipfw.h opt_mrouting.h \ opt_tcpdebug.h poll.h resolv.h syslog.h memory.h +PREINSTALL_FILES += $(PROJECT_INCLUDE) \ + $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) + +$(PROJECT_INCLUDE): + @$(mkinstalldirs) $@ +$(PROJECT_INCLUDE)/%.h: %.h + $(INSTALL_DATA) $< $@ + +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = CHANGELOG + include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/exec/libnetworking/arpa/Makefile.am b/c/src/exec/libnetworking/arpa/Makefile.am index 6109a77ad7..44ff88f334 100644 --- a/c/src/exec/libnetworking/arpa/Makefile.am +++ b/c/src/exec/libnetworking/arpa/Makefile.am @@ -4,12 +4,14 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = ftp.h inet.h nameser.h nameser_compat.h telnet.h -noinst_HEADERS = $(H_FILES) + +include_arpadir = $(includedir)/arpa + +include_arpa_HEADERS = ftp.h inet.h nameser.h nameser_compat.h telnet.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/arpa \ - $(H_FILES:%=$(PROJECT_INCLUDE)/arpa/%) + $(include_arpa_HEADERS:%=$(PROJECT_INCLUDE)/arpa/%) $(PROJECT_INCLUDE)/arpa: @$(mkinstalldirs) $@ diff --git a/c/src/exec/libnetworking/machine/Makefile.am b/c/src/exec/libnetworking/machine/Makefile.am index e703d0b82b..8dda8e015f 100644 --- a/c/src/exec/libnetworking/machine/Makefile.am +++ b/c/src/exec/libnetworking/machine/Makefile.am @@ -4,13 +4,13 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = conf.h cpu.h cpufunc.h endian.h in_cksum.h limits.h param.h \ - types.h vmparam.h +include_machinedir = $(includedir)/machine -noinst_HEADERS = $(H_FILES) +include_machine_HEADERS = conf.h cpu.h cpufunc.h endian.h in_cksum.h limits.h param.h \ + types.h vmparam.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine \ - $(H_FILES:%=$(PROJECT_INCLUDE)/machine/%) + $(include_machine_HEADERS:%=$(PROJECT_INCLUDE)/machine/%) $(PROJECT_INCLUDE)/machine: @$(mkinstalldirs) $@ diff --git a/c/src/exec/libnetworking/net/Makefile.am b/c/src/exec/libnetworking/net/Makefile.am index b6c69607ee..964e52cac6 100644 --- a/c/src/exec/libnetworking/net/Makefile.am +++ b/c/src/exec/libnetworking/net/Makefile.am @@ -4,6 +4,8 @@ AUTOMAKE_OPTIONS = foreign 1.4 +include_netdir = $(includedir)/net + LIBNAME = lib.a LIB = $(ARCH)/$(LIBNAME) @@ -34,14 +36,12 @@ 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 -H_FILES = bpf.h ethernet.h if.h if_arp.h if_dl.h if_llc.h if_ppp.h \ +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 -noinst_HEADERS = $(H_FILES) - PREINSTALL_FILES += $(PROJECT_INCLUDE)/net \ - $(H_FILES:%=$(PROJECT_INCLUDE)/net/%) + $(include_net_HEADERS:%=$(PROJECT_INCLUDE)/net/%) $(PROJECT_INCLUDE)/net: @$(mkinstalldirs) $@ diff --git a/c/src/exec/libnetworking/netinet/Makefile.am b/c/src/exec/libnetworking/netinet/Makefile.am index c3813a456d..435aa77ff3 100644 --- a/c/src/exec/libnetworking/netinet/Makefile.am +++ b/c/src/exec/libnetworking/netinet/Makefile.am @@ -4,6 +4,8 @@ AUTOMAKE_OPTIONS = foreign 1.4 +include_netinetdir = $(includedir)/netinet + LIBNAME = lib.a LIB = $(ARCH)/$(LIBNAME) @@ -39,14 +41,12 @@ 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 -H_FILES = icmp_var.h if_ether.h igmp.h igmp_var.h in.h in_pcb.h in_systm.h \ +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 -noinst_HEADERS = $(H_FILES) - PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet \ - $(H_FILES:%=$(PROJECT_INCLUDE)/netinet/%) + $(include_netinet_HEADERS:%=$(PROJECT_INCLUDE)/netinet/%) $(PROJECT_INCLUDE)/netinet: @$(mkinstalldirs) $@ diff --git a/c/src/exec/libnetworking/nfs/Makefile.am b/c/src/exec/libnetworking/nfs/Makefile.am index 2d9b4dcf4c..e4e6ef9f05 100644 --- a/c/src/exec/libnetworking/nfs/Makefile.am +++ b/c/src/exec/libnetworking/nfs/Makefile.am @@ -4,6 +4,8 @@ AUTOMAKE_OPTIONS = foreign 1.4 +include_nfsdir = $(includedir)/nfs + LIBNAME = lib.a LIB = $(ARCH)/$(LIBNAME) @@ -32,12 +34,10 @@ all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB) EXTRA_DIST = bootp_subr.c -H_FILES = krpc.h nfs.h nfsdiskless.h nfsproto.h rpcv2.h xdr_subs.h - -noinst_HEADERS = $(H_FILES) +include_nfs_HEADERS = krpc.h nfs.h nfsdiskless.h nfsproto.h rpcv2.h xdr_subs.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/nfs \ - $(H_FILES:%=$(PROJECT_INCLUDE)/nfs/%) + $(include_nfs_HEADERS:%=$(PROJECT_INCLUDE)/nfs/%) $(PROJECT_INCLUDE)/nfs: @$(mkinstalldirs) $@ diff --git a/c/src/exec/libnetworking/rtems/Makefile.am b/c/src/exec/libnetworking/rtems/Makefile.am index 6626ad39f9..47846d1c4f 100644 --- a/c/src/exec/libnetworking/rtems/Makefile.am +++ b/c/src/exec/libnetworking/rtems/Makefile.am @@ -4,6 +4,10 @@ AUTOMAKE_OPTIONS = foreign 1.4 + + +include_rtemsdir = $(includedir)/rtems + LIBNAME = lib.a LIB = $(ARCH)/$(LIBNAME) @@ -15,12 +19,10 @@ 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) +include_rtems_HEADERS = rtems_bsdnet.h rtems_bsdnet_internal.h tftp.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \ - $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) + $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%) $(PROJECT_INCLUDE)/rtems: @$(mkinstalldirs) $@ diff --git a/c/src/exec/libnetworking/sys/Makefile.am b/c/src/exec/libnetworking/sys/Makefile.am index b7fc58125d..abedf78d9c 100644 --- a/c/src/exec/libnetworking/sys/Makefile.am +++ b/c/src/exec/libnetworking/sys/Makefile.am @@ -4,16 +4,18 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = buf.h callout.h conf.h domain.h filio.h ioctl.h kernel.h libkern.h \ + + +include_sysdir = $(includedir)/sys + +include_sys_HEADERS = buf.h callout.h conf.h domain.h filio.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 ttydefaults.h ucred.h \ uio.h un.h -noinst_HEADERS = $(H_FILES) - PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys \ - $(H_FILES:%=$(PROJECT_INCLUDE)/sys/%) + $(include_sys_HEADERS:%=$(PROJECT_INCLUDE)/sys/%) $(PROJECT_INCLUDE)/sys: @$(mkinstalldirs) $@ diff --git a/c/src/exec/libnetworking/vm/Makefile.am b/c/src/exec/libnetworking/vm/Makefile.am index b72458f6cc..de5d0c9661 100644 --- a/c/src/exec/libnetworking/vm/Makefile.am +++ b/c/src/exec/libnetworking/vm/Makefile.am @@ -4,12 +4,14 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = vm.h vm_extern.h vm_kern.h vm_param.h -noinst_HEADERS = $(H_FILES) + +include_vmdir = $(includedir)/vm + +include_vm_HEADERS = vm.h vm_extern.h vm_kern.h vm_param.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/vm \ - $(H_FILES:%=$(PROJECT_INCLUDE)/vm/%) + $(include_vm_HEADERS:%=$(PROJECT_INCLUDE)/vm/%) $(PROJECT_INCLUDE)/vm: @$(mkinstalldirs) $@ diff --git a/c/src/libnetworking/ChangeLog b/c/src/libnetworking/ChangeLog index 54c410a78e..1df7067298 100644 --- a/c/src/libnetworking/ChangeLog +++ b/c/src/libnetworking/ChangeLog @@ -1,3 +1,14 @@ +2001-02-03 Ralf Corsepius + + * Makefile.am, arpa/Makefile.am, machine/Makefile.am, net/Makefile.am, + netinet/Makefile.am, nfs/Makefile.am, rtems/Makefile.am, + rtems_servers/Makefile.am, rtems_webserver/Makefile.am, + sys/Makefile.am, vm/Makefile.am: + Apply include_*HEADERS instead of H_FILES. + * include/Makefile.am: Remove. + * Makefile.am: Add handling of *.h files. + * configure.in: Remove include/Makefile. + 2001-01-25 Eric Norum * lib/tftpDriver.c: Reduce first timeout interval. This diff --git a/c/src/libnetworking/Makefile.am b/c/src/libnetworking/Makefile.am index 7f09e1d21b..57f87c7b5d 100644 --- a/c/src/libnetworking/Makefile.am +++ b/c/src/libnetworking/Makefile.am @@ -5,11 +5,24 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I ../../../aclocal -SUBDIRS = include arpa kern machine sys vm lib libc net netinet nfs rtems \ +SUBDIRS = arpa kern machine sys vm lib libc net netinet nfs rtems \ rtems_servers pppd modem rtems_webserver wrapup -EXTRA_DIST = CHANGELOG bpfilter.h loop.h netdb.h opt_ipfw.h opt_mrouting.h \ +include_HEADERS = \ + bpfilter.h loop.h netdb.h opt_ipfw.h opt_mrouting.h \ opt_tcpdebug.h poll.h resolv.h syslog.h memory.h +PREINSTALL_FILES += $(PROJECT_INCLUDE) \ + $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) + +$(PROJECT_INCLUDE): + @$(mkinstalldirs) $@ +$(PROJECT_INCLUDE)/%.h: %.h + $(INSTALL_DATA) $< $@ + +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = CHANGELOG + include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/libnetworking/arpa/Makefile.am b/c/src/libnetworking/arpa/Makefile.am index 6109a77ad7..44ff88f334 100644 --- a/c/src/libnetworking/arpa/Makefile.am +++ b/c/src/libnetworking/arpa/Makefile.am @@ -4,12 +4,14 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = ftp.h inet.h nameser.h nameser_compat.h telnet.h -noinst_HEADERS = $(H_FILES) + +include_arpadir = $(includedir)/arpa + +include_arpa_HEADERS = ftp.h inet.h nameser.h nameser_compat.h telnet.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/arpa \ - $(H_FILES:%=$(PROJECT_INCLUDE)/arpa/%) + $(include_arpa_HEADERS:%=$(PROJECT_INCLUDE)/arpa/%) $(PROJECT_INCLUDE)/arpa: @$(mkinstalldirs) $@ diff --git a/c/src/libnetworking/configure.in b/c/src/libnetworking/configure.in index 3569c0f99f..df9b84fe1d 100644 --- a/c/src/libnetworking/configure.in +++ b/c/src/libnetworking/configure.in @@ -35,7 +35,6 @@ AM_CONDITIONAL(HAS_POSIX,test "$HAS_POSIX_API" = "yes") # Explicitly list all Makefiles here AC_OUTPUT( Makefile -include/Makefile arpa/Makefile machine/Makefile kern/Makefile diff --git a/c/src/libnetworking/include/Makefile.am b/c/src/libnetworking/include/Makefile.am deleted file mode 100644 index 888ef5599d..0000000000 --- a/c/src/libnetworking/include/Makefile.am +++ /dev/null @@ -1,57 +0,0 @@ -## -## $Id$ -## -## -## FIXME: This Makefile.am is pretty ugly and deserves to be reworked :( -## - -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 - -# We only make the install point for the networking header files if needed. - -$(INSTALLDIRS): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/bpfilter.h: ../bpfilter.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/loop.h: ../loop.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/netdb.h: ../netdb.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/opt_ipfw.h: ../opt_ipfw.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/opt_mrouting.h: ../opt_mrouting.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/opt_tcpdebug.h: ../opt_tcpdebug.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/poll.h: ../poll.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/resolv.h: ../resolv.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/syslog.h: ../syslog.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/memory.h: ../memory.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 - -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/libnetworking/machine/Makefile.am b/c/src/libnetworking/machine/Makefile.am index e703d0b82b..8dda8e015f 100644 --- a/c/src/libnetworking/machine/Makefile.am +++ b/c/src/libnetworking/machine/Makefile.am @@ -4,13 +4,13 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = conf.h cpu.h cpufunc.h endian.h in_cksum.h limits.h param.h \ - types.h vmparam.h +include_machinedir = $(includedir)/machine -noinst_HEADERS = $(H_FILES) +include_machine_HEADERS = conf.h cpu.h cpufunc.h endian.h in_cksum.h limits.h param.h \ + types.h vmparam.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine \ - $(H_FILES:%=$(PROJECT_INCLUDE)/machine/%) + $(include_machine_HEADERS:%=$(PROJECT_INCLUDE)/machine/%) $(PROJECT_INCLUDE)/machine: @$(mkinstalldirs) $@ diff --git a/c/src/libnetworking/net/Makefile.am b/c/src/libnetworking/net/Makefile.am index b6c69607ee..964e52cac6 100644 --- a/c/src/libnetworking/net/Makefile.am +++ b/c/src/libnetworking/net/Makefile.am @@ -4,6 +4,8 @@ AUTOMAKE_OPTIONS = foreign 1.4 +include_netdir = $(includedir)/net + LIBNAME = lib.a LIB = $(ARCH)/$(LIBNAME) @@ -34,14 +36,12 @@ 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 -H_FILES = bpf.h ethernet.h if.h if_arp.h if_dl.h if_llc.h if_ppp.h \ +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 -noinst_HEADERS = $(H_FILES) - PREINSTALL_FILES += $(PROJECT_INCLUDE)/net \ - $(H_FILES:%=$(PROJECT_INCLUDE)/net/%) + $(include_net_HEADERS:%=$(PROJECT_INCLUDE)/net/%) $(PROJECT_INCLUDE)/net: @$(mkinstalldirs) $@ diff --git a/c/src/libnetworking/netinet/Makefile.am b/c/src/libnetworking/netinet/Makefile.am index c3813a456d..435aa77ff3 100644 --- a/c/src/libnetworking/netinet/Makefile.am +++ b/c/src/libnetworking/netinet/Makefile.am @@ -4,6 +4,8 @@ AUTOMAKE_OPTIONS = foreign 1.4 +include_netinetdir = $(includedir)/netinet + LIBNAME = lib.a LIB = $(ARCH)/$(LIBNAME) @@ -39,14 +41,12 @@ 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 -H_FILES = icmp_var.h if_ether.h igmp.h igmp_var.h in.h in_pcb.h in_systm.h \ +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 -noinst_HEADERS = $(H_FILES) - PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet \ - $(H_FILES:%=$(PROJECT_INCLUDE)/netinet/%) + $(include_netinet_HEADERS:%=$(PROJECT_INCLUDE)/netinet/%) $(PROJECT_INCLUDE)/netinet: @$(mkinstalldirs) $@ diff --git a/c/src/libnetworking/nfs/Makefile.am b/c/src/libnetworking/nfs/Makefile.am index 2d9b4dcf4c..e4e6ef9f05 100644 --- a/c/src/libnetworking/nfs/Makefile.am +++ b/c/src/libnetworking/nfs/Makefile.am @@ -4,6 +4,8 @@ AUTOMAKE_OPTIONS = foreign 1.4 +include_nfsdir = $(includedir)/nfs + LIBNAME = lib.a LIB = $(ARCH)/$(LIBNAME) @@ -32,12 +34,10 @@ all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB) EXTRA_DIST = bootp_subr.c -H_FILES = krpc.h nfs.h nfsdiskless.h nfsproto.h rpcv2.h xdr_subs.h - -noinst_HEADERS = $(H_FILES) +include_nfs_HEADERS = krpc.h nfs.h nfsdiskless.h nfsproto.h rpcv2.h xdr_subs.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/nfs \ - $(H_FILES:%=$(PROJECT_INCLUDE)/nfs/%) + $(include_nfs_HEADERS:%=$(PROJECT_INCLUDE)/nfs/%) $(PROJECT_INCLUDE)/nfs: @$(mkinstalldirs) $@ diff --git a/c/src/libnetworking/rtems/Makefile.am b/c/src/libnetworking/rtems/Makefile.am index 6626ad39f9..47846d1c4f 100644 --- a/c/src/libnetworking/rtems/Makefile.am +++ b/c/src/libnetworking/rtems/Makefile.am @@ -4,6 +4,10 @@ AUTOMAKE_OPTIONS = foreign 1.4 + + +include_rtemsdir = $(includedir)/rtems + LIBNAME = lib.a LIB = $(ARCH)/$(LIBNAME) @@ -15,12 +19,10 @@ 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) +include_rtems_HEADERS = rtems_bsdnet.h rtems_bsdnet_internal.h tftp.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \ - $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) + $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%) $(PROJECT_INCLUDE)/rtems: @$(mkinstalldirs) $@ diff --git a/c/src/libnetworking/rtems_servers/Makefile.am b/c/src/libnetworking/rtems_servers/Makefile.am index b440fa69e2..bbba6e064c 100644 --- a/c/src/libnetworking/rtems_servers/Makefile.am +++ b/c/src/libnetworking/rtems_servers/Makefile.am @@ -4,6 +4,9 @@ AUTOMAKE_OPTIONS = foreign 1.4 + + + LIBNAME = lib.a LIB = $(ARCH)/$(LIBNAME) @@ -29,11 +32,9 @@ all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB) EXTRA_DIST = ftpd.c ftpd.h -H_FILES = ftpd.h - -noinst_HEADERS = $(H_FILES) +include_HEADERS = ftpd.h -PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ diff --git a/c/src/libnetworking/rtems_webserver/Makefile.am b/c/src/libnetworking/rtems_webserver/Makefile.am index 3870951683..1cbb77b00d 100644 --- a/c/src/libnetworking/rtems_webserver/Makefile.am +++ b/c/src/libnetworking/rtems_webserver/Makefile.am @@ -4,6 +4,8 @@ AUTOMAKE_OPTIONS = foreign 1.4 +include_goaheaddir = $(includedir)/goahead + LIBNAME = lib.a LIB = $(ARCH)/$(LIBNAME) @@ -46,6 +48,9 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems_webserver.h \ $(PROJECT_INCLUDE)/goahead $(H_FILES:%.h=$(PROJECT_INCLUDE)/goahead/%.h) if HAS_POSIX +include_HEADERS = rtems_webserver.h +include_goahead_HEADERS = $(H_FILES) + all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB) endif diff --git a/c/src/libnetworking/sys/Makefile.am b/c/src/libnetworking/sys/Makefile.am index b7fc58125d..abedf78d9c 100644 --- a/c/src/libnetworking/sys/Makefile.am +++ b/c/src/libnetworking/sys/Makefile.am @@ -4,16 +4,18 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = buf.h callout.h conf.h domain.h filio.h ioctl.h kernel.h libkern.h \ + + +include_sysdir = $(includedir)/sys + +include_sys_HEADERS = buf.h callout.h conf.h domain.h filio.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 ttydefaults.h ucred.h \ uio.h un.h -noinst_HEADERS = $(H_FILES) - PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys \ - $(H_FILES:%=$(PROJECT_INCLUDE)/sys/%) + $(include_sys_HEADERS:%=$(PROJECT_INCLUDE)/sys/%) $(PROJECT_INCLUDE)/sys: @$(mkinstalldirs) $@ diff --git a/c/src/libnetworking/vm/Makefile.am b/c/src/libnetworking/vm/Makefile.am index b72458f6cc..de5d0c9661 100644 --- a/c/src/libnetworking/vm/Makefile.am +++ b/c/src/libnetworking/vm/Makefile.am @@ -4,12 +4,14 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = vm.h vm_extern.h vm_kern.h vm_param.h -noinst_HEADERS = $(H_FILES) + +include_vmdir = $(includedir)/vm + +include_vm_HEADERS = vm.h vm_extern.h vm_kern.h vm_param.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/vm \ - $(H_FILES:%=$(PROJECT_INCLUDE)/vm/%) + $(include_vm_HEADERS:%=$(PROJECT_INCLUDE)/vm/%) $(PROJECT_INCLUDE)/vm: @$(mkinstalldirs) $@ -- cgit v1.2.3