From 9b28bea577dc0d6781d2895b61c07a5d311d24b5 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 5 Sep 2000 16:07:35 +0000 Subject: 2000-09-04 Ralf Corsepius * kern/Makefile.am, lib/Makefile.am, libc/Makefile.am, net/Makefile.am, netinet/Makefile.am, nfs/Makefile.am, pppd/Makefile.am, rtems/Makefile.am, rtems_servers/Makefile.am, rtems_webserver/Makefile.am, wrapup/Makefile.am: Include compile.am --- cpukit/ftpd/Makefile.am | 1 + cpukit/httpd/Makefile.am | 14 +++++++------- cpukit/libnetworking/ChangeLog | 7 +++++++ cpukit/libnetworking/arpa/Makefile.am | 3 ++- cpukit/libnetworking/kern/Makefile.am | 1 + cpukit/libnetworking/lib/Makefile.am | 1 + cpukit/libnetworking/libc/Makefile.am | 13 +++++++------ cpukit/libnetworking/net/Makefile.am | 12 +++++++----- cpukit/libnetworking/netinet/Makefile.am | 10 +++++----- cpukit/libnetworking/nfs/Makefile.am | 7 ++++--- cpukit/libnetworking/rtems/Makefile.am | 12 +++++++----- cpukit/libnetworking/sys/Makefile.am | 13 +++++++------ cpukit/libnetworking/wrapup/Makefile.am | 1 + cpukit/pppd/Makefile.am | 1 + 14 files changed, 58 insertions(+), 38 deletions(-) (limited to 'cpukit') diff --git a/cpukit/ftpd/Makefile.am b/cpukit/ftpd/Makefile.am index 2c1d356fab..b440fa69e2 100644 --- a/cpukit/ftpd/Makefile.am +++ b/cpukit/ftpd/Makefile.am @@ -13,6 +13,7 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am # diff --git a/cpukit/httpd/Makefile.am b/cpukit/httpd/Makefile.am index c85580a0c2..3b99ffa0ad 100644 --- a/cpukit/httpd/Makefile.am +++ b/cpukit/httpd/Makefile.am @@ -7,10 +7,10 @@ AUTOMAKE_OPTIONS = foreign 1.4 LIBNAME = lib.a LIB = $(ARCH)/$(LIBNAME) -C_FILES = asp.c balloc.c base64.c default.c ejlex.c ejparse.c emfdb.c \ - form.c h.c handler.c md5c.c mime.c misc.c webpage.c ringq.c rom.c \ - security.c socket.c sym.c uemf.c um.c url.c value.c webrom.c webs.c \ - websuemf.c webmain.c +C_FILES = asp.c balloc.c base64.c default.c ejlex.c ejparse.c emfdb.c form.c \ + h.c handler.c md5c.c mime.c misc.c webpage.c ringq.c rom.c security.c \ + socket.c sym.c uemf.c um.c url.c value.c webrom.c webs.c websuemf.c \ + webmain.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) @@ -18,6 +18,7 @@ OBJS = $(C_O_FILES) H_FILES = ej.h ejIntrn.h emfdb.h md5.h uemf.h um.h webs.h wsIntrn.h include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am # @@ -41,9 +42,8 @@ $(PROJECT_INCLUDE)/goahead/%.h: %.h $(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) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems_webserver.h \ + $(PROJECT_INCLUDE)/goahead $(H_FILES:%.h=$(PROJECT_INCLUDE)/goahead/%.h) if HAS_POSIX all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB) diff --git a/cpukit/libnetworking/ChangeLog b/cpukit/libnetworking/ChangeLog index f74b13bcf9..9b94d434a8 100644 --- a/cpukit/libnetworking/ChangeLog +++ b/cpukit/libnetworking/ChangeLog @@ -1,3 +1,10 @@ +2000-09-04 Ralf Corsepius + + * kern/Makefile.am, lib/Makefile.am, libc/Makefile.am, + net/Makefile.am, netinet/Makefile.am, nfs/Makefile.am, + pppd/Makefile.am, rtems/Makefile.am, rtems_servers/Makefile.am, + rtems_webserver/Makefile.am, wrapup/Makefile.am: Include compile.am + 2000-09-05 Joel Sherrill * rtems/rtems_syscall.c: Changed from O_NONBLOCK to internal diff --git a/cpukit/libnetworking/arpa/Makefile.am b/cpukit/libnetworking/arpa/Makefile.am index 6ee4bfbe74..6109a77ad7 100644 --- a/cpukit/libnetworking/arpa/Makefile.am +++ b/cpukit/libnetworking/arpa/Makefile.am @@ -8,7 +8,8 @@ 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/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/arpa \ + $(H_FILES:%=$(PROJECT_INCLUDE)/arpa/%) $(PROJECT_INCLUDE)/arpa: @$(mkinstalldirs) $@ diff --git a/cpukit/libnetworking/kern/Makefile.am b/cpukit/libnetworking/kern/Makefile.am index 878f23612e..45008915a4 100644 --- a/cpukit/libnetworking/kern/Makefile.am +++ b/cpukit/libnetworking/kern/Makefile.am @@ -13,6 +13,7 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am # diff --git a/cpukit/libnetworking/lib/Makefile.am b/cpukit/libnetworking/lib/Makefile.am index 64e3a0e8f4..d3ea98ebcb 100644 --- a/cpukit/libnetworking/lib/Makefile.am +++ b/cpukit/libnetworking/lib/Makefile.am @@ -13,6 +13,7 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am # diff --git a/cpukit/libnetworking/libc/Makefile.am b/cpukit/libnetworking/libc/Makefile.am index aca9052ee2..e920f6ee6b 100644 --- a/cpukit/libnetworking/libc/Makefile.am +++ b/cpukit/libnetworking/libc/Makefile.am @@ -21,6 +21,7 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am man_MANS = addr2ascii.3 byteorder.3 ethers.3 gethostbyname.3 getnetent.3 \ @@ -47,11 +48,11 @@ EXTRA_DIST = addr2ascii.3 addr2ascii.c ascii2addr.c base64.c byteorder.3 \ getprotoent.c getprotoname.c getservbyname.c getservbyport.c \ getservent.3 getservent.c herror.c inet.3 inet_addr.c inet_lnaof.c \ inet_makeaddr.c inet_net_ntop.c inet_net_pton.c inet_neta.c inet_netof.c \ - inet_netof.c inet_network.c inet_ntoa.c inet_ntop.c inet_pton.c map_v4v6.c \ - linkaddr.3 linkaddr.c map_v4v6.c ns.3 ns_addr.c ns_name.c ns_netint.c \ - ns_ntoa.c ns_parse.c ns_print.c ns_ttl.c nsap_addr.c rcmd.3 rcmd.c \ - recv.c res_comp.c res_config.h res_data.c res_debug.c res_init.c \ - res_mkquery.c res_mkupdate.c res_query.c res_send.c res_stubs.c \ - res_update.c resolver.3 send.c strsep.c + inet_network.c inet_ntoa.c inet_ntop.c inet_pton.c map_v4v6.c linkaddr.3 \ + linkaddr.c ns.3 ns_addr.c ns_name.c ns_netint.c ns_ntoa.c ns_parse.c \ + ns_print.c ns_ttl.c nsap_addr.c rcmd.3 rcmd.c recv.c res_comp.c \ + res_config.h res_data.c res_debug.c res_init.c res_mkquery.c \ + res_mkupdate.c res_query.c res_send.c res_stubs.c res_update.c \ + resolver.3 send.c strsep.c include $(top_srcdir)/../../../automake/local.am diff --git a/cpukit/libnetworking/net/Makefile.am b/cpukit/libnetworking/net/Makefile.am index eda18a9c76..73423b7f49 100644 --- a/cpukit/libnetworking/net/Makefile.am +++ b/cpukit/libnetworking/net/Makefile.am @@ -14,6 +14,7 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am # @@ -30,15 +31,16 @@ all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB) .PRECIOUS: $(LIB) -EXTRA_DIST = if.c if_ethersubr.c if_loop.c \ - radix.c raw_cb.c raw_usrreq.c route.c 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 +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/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/net \ + $(H_FILES:%=$(PROJECT_INCLUDE)/net/%) $(PROJECT_INCLUDE)/net: @$(mkinstalldirs) $@ diff --git a/cpukit/libnetworking/netinet/Makefile.am b/cpukit/libnetworking/netinet/Makefile.am index dedeb31ac7..c3813a456d 100644 --- a/cpukit/libnetworking/netinet/Makefile.am +++ b/cpukit/libnetworking/netinet/Makefile.am @@ -16,6 +16,7 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am # @@ -36,12 +37,11 @@ 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 + 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 +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) diff --git a/cpukit/libnetworking/nfs/Makefile.am b/cpukit/libnetworking/nfs/Makefile.am index 9a8b43e31a..2d9b4dcf4c 100644 --- a/cpukit/libnetworking/nfs/Makefile.am +++ b/cpukit/libnetworking/nfs/Makefile.am @@ -13,6 +13,7 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am # @@ -29,13 +30,14 @@ all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB) .PRECIOUS: $(LIB) -EXTRA_DIST = bootp_subr.c +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/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/nfs \ + $(H_FILES:%=$(PROJECT_INCLUDE)/nfs/%) $(PROJECT_INCLUDE)/nfs: @$(mkinstalldirs) $@ @@ -43,5 +45,4 @@ $(PROJECT_INCLUDE)/nfs: $(PROJECT_INCLUDE)/nfs/%.h: %.h $(INSTALL_DATA) $< $@ - include $(top_srcdir)/../../../automake/local.am diff --git a/cpukit/libnetworking/rtems/Makefile.am b/cpukit/libnetworking/rtems/Makefile.am index dfcac20c4b..6626ad39f9 100644 --- a/cpukit/libnetworking/rtems/Makefile.am +++ b/cpukit/libnetworking/rtems/Makefile.am @@ -19,7 +19,8 @@ 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/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \ + $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) $(PROJECT_INCLUDE)/rtems: @$(mkinstalldirs) $@ @@ -27,8 +28,8 @@ $(PROJECT_INCLUDE)/rtems: $(PROJECT_INCLUDE)/rtems/%.h: %.h $(INSTALL_DATA) $< $@ - include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am # @@ -45,8 +46,9 @@ all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB) .PRECIOUS: $(LIB) -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 +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 include $(top_srcdir)/../../../automake/local.am diff --git a/cpukit/libnetworking/sys/Makefile.am b/cpukit/libnetworking/sys/Makefile.am index c317f06716..1ee0547379 100644 --- a/cpukit/libnetworking/sys/Makefile.am +++ b/cpukit/libnetworking/sys/Makefile.am @@ -4,15 +4,16 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = 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 \ - ttycom.h ttydefaults.h ucred.h uio.h un.h +H_FILES = 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 ttycom.h ttydefaults.h \ + ucred.h uio.h un.h noinst_HEADERS = $(H_FILES) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys $(H_FILES:%=$(PROJECT_INCLUDE)/sys/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys \ + $(H_FILES:%=$(PROJECT_INCLUDE)/sys/%) $(PROJECT_INCLUDE)/sys: @$(mkinstalldirs) $@ diff --git a/cpukit/libnetworking/wrapup/Makefile.am b/cpukit/libnetworking/wrapup/Makefile.am index 5553252d11..8637ff6620 100644 --- a/cpukit/libnetworking/wrapup/Makefile.am +++ b/cpukit/libnetworking/wrapup/Makefile.am @@ -14,6 +14,7 @@ OBJS = $(foreach piece, $(NET_O_PIECES), ../$(piece)/$(ARCH)/*.o) LIB = $(ARCH)/libnetworking.a include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am # diff --git a/cpukit/pppd/Makefile.am b/cpukit/pppd/Makefile.am index e6a27c80c8..dd78bc0c7a 100644 --- a/cpukit/pppd/Makefile.am +++ b/cpukit/pppd/Makefile.am @@ -15,6 +15,7 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am # -- cgit v1.2.3