From dd695d81b6b71c781b7df92e887e433b2b0b06ad Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 12 Dec 2002 12:15:00 +0000 Subject: 2002-12-12 Ralf Corsepius * Makefile.am: Merge-in kern/Makefile.am, net/Makefile.am, netinet/Makefile.am, netinet/Makefile.am, nfs/Makefile.am, rtems/Makefile.am. * kern/Makefile.am: Remove. * net/Makefile.am: Remove. * netinet/Makefile.am: Remove. * nfs/Makefile.am: Remove. * rtems/Makefile.am: Remove. * wrapup/Makefile.am: Reflect changes above. * configure.ac: Ditto. --- cpukit/libnetworking/ChangeLog | 13 +++++ cpukit/libnetworking/Makefile.am | 84 +++++++++++++++++++++++++++++++- cpukit/libnetworking/configure.ac | 5 -- cpukit/libnetworking/kern/Makefile.am | 31 ------------ cpukit/libnetworking/net/Makefile.am | 35 ------------- cpukit/libnetworking/netinet/Makefile.am | 40 --------------- cpukit/libnetworking/nfs/Makefile.am | 30 ------------ cpukit/libnetworking/rtems/Makefile.am | 50 ------------------- cpukit/libnetworking/wrapup/Makefile.am | 5 +- 9 files changed, 98 insertions(+), 195 deletions(-) delete mode 100644 cpukit/libnetworking/kern/Makefile.am delete mode 100644 cpukit/libnetworking/net/Makefile.am delete mode 100644 cpukit/libnetworking/netinet/Makefile.am delete mode 100644 cpukit/libnetworking/nfs/Makefile.am delete mode 100644 cpukit/libnetworking/rtems/Makefile.am (limited to 'cpukit') diff --git a/cpukit/libnetworking/ChangeLog b/cpukit/libnetworking/ChangeLog index 9cedac683b..3276f58562 100644 --- a/cpukit/libnetworking/ChangeLog +++ b/cpukit/libnetworking/ChangeLog @@ -1,3 +1,16 @@ +2002-12-12 Ralf Corsepius + + * Makefile.am: Merge-in kern/Makefile.am, net/Makefile.am, + netinet/Makefile.am, netinet/Makefile.am, nfs/Makefile.am, + rtems/Makefile.am. + * kern/Makefile.am: Remove. + * net/Makefile.am: Remove. + * netinet/Makefile.am: Remove. + * nfs/Makefile.am: Remove. + * rtems/Makefile.am: Remove. + * wrapup/Makefile.am: Reflect changes above. + * configure.ac: Ditto. + 2002-12-11 Ralf Corsepius * kern/Makefile.am: Remove C_O_FILES; diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am index cdd68b7512..546caed450 100644 --- a/cpukit/libnetworking/Makefile.am +++ b/cpukit/libnetworking/Makefile.am @@ -4,7 +4,17 @@ ACLOCAL_AMFLAGS = -I ../aclocal -SUBDIRS = . kern lib libc net netinet nfs rtems +include $(top_srcdir)/../automake/multilib.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/lib.am + +# Add -DFORWARD_PROTOCOL to enable UDP forwarding -- requires missing net/pf.h +AM_CPPFLAGS += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS -DDIAGNOSTIC \ + -DBOOTP_COMPAT + +LIB = $(ARCH)/libnetworking.a + +SUBDIRS = . lib libc SUBDIRS += wrapup ## poll.h is not in the list because RTEMS does not have poll() @@ -32,6 +42,17 @@ $(PROJECT_INCLUDE)/arpa: PREINSTALL_FILES += $(PROJECT_INCLUDE)/arpa \ $(include_arpa_HEADERS:%=$(PROJECT_INCLUDE)/%) +## kern + +kern_C_FILES = kern/kern_subr.c kern/uipc_domain.c kern/uipc_mbuf.c \ + kern/uipc_socket.c kern/uipc_socket2.c +OBJS = $(kern_C_FILES:kern/%.c=$(ARCH)/%.$(OBJEXT)) + +$(ARCH)/%.$(OBJEXT): kern/%.c + ${COMPILE} -o $@ -c $< + +EXTRA_DIST = $(kern_C_FILES) + ## machine include_machinedir = $(includedir)/machine @@ -60,6 +81,16 @@ $(PROJECT_INCLUDE)/net: PREINSTALL_FILES += $(PROJECT_INCLUDE)/net \ $(include_net_HEADERS:%=$(PROJECT_INCLUDE)/%) +net_C_FILES = net/if.c net/if_ethersubr.c net/if_loop.c net/radix.c \ + net/route.c net/rtsock.c net/raw_cb.c net/raw_usrreq.c net/if_ppp.c \ + net/ppp_tty.c net/pppcompress.c +OBJS += $(net_C_FILES:net/%.c=$(ARCH)/%.$(OBJEXT)) + +$(ARCH)/%.$(OBJEXT): net/%.c + ${COMPILE} -o $@ -c $< + +EXTRA_DIST += $(net_C_FILES) + ## netinet include_netinetdir = $(includedir)/netinet @@ -77,6 +108,20 @@ $(PROJECT_INCLUDE)/netinet: PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet \ $(include_netinet_HEADERS:%=$(PROJECT_INCLUDE)/%) +netinet_C_FILES = netinet/if_ether.c netinet/igmp.c netinet/in.c \ + netinet/in_cksum.c netinet/in_pcb.c netinet/in_proto.c netinet/in_rmx.c \ + netinet/ip_divert.c netinet/ip_fw.c netinet/ip_icmp.c netinet/ip_input.c \ + netinet/ip_mroute.c netinet/ip_output.c netinet/raw_ip.c \ + netinet/tcp_debug.c netinet/tcp_input.c netinet/tcp_output.c \ + netinet/tcp_subr.c netinet/tcp_timer.c netinet/tcp_usrreq.c \ + netinet/udp_usrreq.c +OBJS += $(C_FILES:netinet/%.c=$(ARCH)/%.$(OBJEXT)) + +$(ARCH)/%.$(OBJEXT): netinet/%.c + ${COMPILE} -o $@ -c $< + +EXTRA_DIST += $(netinet_C_FILES) + ## nfs include_nfsdir = $(includedir)/nfs @@ -90,6 +135,38 @@ $(PROJECT_INCLUDE)/nfs: PREINSTALL_FILES += $(PROJECT_INCLUDE)/nfs \ $(include_nfs_HEADERS:%=$(PROJECT_INCLUDE)/%) +nfs_C_FILES = nfs/bootp_subr.c +OBJS += $(nfs_C_FILES:nfs/%.c=$(ARCH)/%.$(OBJEXT)) + +$(ARCH)/%.$(OBJEXT): nfs/%.c + ${COMPILE} -o $@ -c $< + +EXTRA_DIST += $(nfs_C_FILES) + +## rtems + +include_rtemsdir = $(includedir)/rtems + +include_rtems_HEADERS = rtems/rtems_bsdnet.h rtems/rtems_bsdnet_internal.h \ + rtems/tftp.h rtems/ftpfs.h rtems/mkrootfs.h + +$(PROJECT_INCLUDE)/rtems: + @$(mkinstalldirs) $@ + +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \ + $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%) + +rtems_C_FILES = rtems/sghostname.c rtems/issetugid.c rtems/rtems_glue.c rtems/rtems_syscall.c \ + rtems/rtems_bootp.c rtems/rtems_showmbuf.c rtems/rtems_showroute.c rtems/rtems_showifstat.c \ + rtems/rtems_showipstat.c rtems/rtems_showicmpstat.c rtems/rtems_showtcpstat.c \ + rtems/rtems_showudpstat.c rtems/rtems_select.c rtems/mkrootfs.c +OBJS += $(rtems_C_FILES:rtems/%.c=$(ARCH)/%.$(OBJEXT)) + +$(ARCH)/%.$(OBJEXT): rtems/%.c + ${COMPILE} -o $@ -c $< + +EXTRA_DIST += $(rtems_C_FILES) + ## sys include_sysdir = $(includedir)/sys @@ -124,7 +201,10 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/vm \ $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -all-local: $(PREINSTALL_FILES) +$(LIB): $(OBJS) + $(make-library) + +all-local: $(PREINSTALL_FILES) $(ARCH) $(LIB) include $(top_srcdir)/../automake/subdirs.am include $(top_srcdir)/../automake/local.am diff --git a/cpukit/libnetworking/configure.ac b/cpukit/libnetworking/configure.ac index d2f059cd78..d16de9f317 100644 --- a/cpukit/libnetworking/configure.ac +++ b/cpukit/libnetworking/configure.ac @@ -28,13 +28,8 @@ RTEMS_CHECK_NETWORKING # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile -kern/Makefile lib/Makefile libc/Makefile -net/Makefile -netinet/Makefile -nfs/Makefile -rtems/Makefile wrapup/Makefile ]) AC_OUTPUT diff --git a/cpukit/libnetworking/kern/Makefile.am b/cpukit/libnetworking/kern/Makefile.am deleted file mode 100644 index db5f13aac1..0000000000 --- a/cpukit/libnetworking/kern/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -## -## $Id$ -## - -LIB = $(ARCH)/lib.a - -C_FILES = kern_subr.c uipc_domain.c uipc_mbuf.c uipc_socket.c uipc_socket2.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -include $(top_srcdir)/../automake/multilib.am -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/lib.am - -# -# Add local stuff here using += -# - -AM_CPPFLAGS += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS -DDIAGNOSTIC \ - -DBOOTP_COMPAT - -$(LIB): $(OBJS) - $(make-library) - -all-local: $(ARCH) $(LIB) - -.PRECIOUS: $(LIB) - -EXTRA_DIST = kern_subr.c uipc_domain.c uipc_mbuf.c uipc_socket.c \ - uipc_socket2.c - -include $(top_srcdir)/../automake/local.am diff --git a/cpukit/libnetworking/net/Makefile.am b/cpukit/libnetworking/net/Makefile.am deleted file mode 100644 index 4450a8187d..0000000000 --- a/cpukit/libnetworking/net/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -## -## $Id$ -## - - -include_netdir = $(includedir)/net - -LIB = $(ARCH)/lib.a - -C_FILES = if.c if_ethersubr.c if_loop.c radix.c route.c rtsock.c raw_cb.c \ - raw_usrreq.c if_ppp.c ppp_tty.c pppcompress.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -include $(top_srcdir)/../automake/multilib.am -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/lib.am - -# -# Add local stuff here using += -# - -AM_CPPFLAGS += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS -DDIAGNOSTIC \ - -DBOOTP_COMPAT - -$(LIB): $(OBJS) - $(make-library) - -all-local: $(PREINSTALL_FILES) $(ARCH) $(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 - -include $(top_srcdir)/../automake/local.am diff --git a/cpukit/libnetworking/netinet/Makefile.am b/cpukit/libnetworking/netinet/Makefile.am deleted file mode 100644 index b6ad12ff7f..0000000000 --- a/cpukit/libnetworking/netinet/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -## -## $Id$ -## - -include_netinetdir = $(includedir)/netinet - -LIB = $(ARCH)/lib.a - -C_FILES = if_ether.c igmp.c in.c in_cksum.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 -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -include $(top_srcdir)/../automake/multilib.am -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/lib.am - -# -# Add local stuff here using += -# - -# Add -DFORWARD_PROTOCOL to enable UDP forwarding -- requires missing net/pf.h -AM_CPPFLAGS += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS -DDIAGNOSTIC \ - -DBOOTP_COMPAT - -$(LIB): $(OBJS) - $(make-library) - -all-local: $(PREINSTALL_FILES) $(ARCH) $(LIB) - -.PRECIOUS: $(LIB) - -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 - -include $(top_srcdir)/../automake/local.am diff --git a/cpukit/libnetworking/nfs/Makefile.am b/cpukit/libnetworking/nfs/Makefile.am deleted file mode 100644 index a161ff033e..0000000000 --- a/cpukit/libnetworking/nfs/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## -## $Id$ -## - -LIB = $(ARCH)/lib.a - -C_FILES = bootp_subr.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -include $(top_srcdir)/../automake/multilib.am -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/lib.am - -# -# Add local stuff here using += -# - -AM_CPPFLAGS += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS -DDIAGNOSTIC \ - -DBOOTP_COMPAT - -$(LIB): $(OBJS) - $(make-library) - -all-local: $(PREINSTALL_FILES) $(ARCH) $(LIB) - -.PRECIOUS: $(LIB) - -EXTRA_DIST = bootp_subr.c - -include $(top_srcdir)/../automake/local.am diff --git a/cpukit/libnetworking/rtems/Makefile.am b/cpukit/libnetworking/rtems/Makefile.am deleted file mode 100644 index cd310a8dae..0000000000 --- a/cpukit/libnetworking/rtems/Makefile.am +++ /dev/null @@ -1,50 +0,0 @@ -## -## $Id$ -## - -include_rtemsdir = $(includedir)/rtems - -LIB = $(ARCH)/lib.a - -C_FILES = sghostname.c issetugid.c rtems_glue.c rtems_syscall.c \ - rtems_bootp.c rtems_showmbuf.c rtems_showroute.c rtems_showifstat.c \ - rtems_showipstat.c rtems_showicmpstat.c rtems_showtcpstat.c \ - rtems_showudpstat.c rtems_select.c mkrootfs.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -include_rtems_HEADERS = rtems_bsdnet.h rtems_bsdnet_internal.h tftp.h \ - ftpfs.h mkrootfs.h - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \ - $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%) - -$(PROJECT_INCLUDE)/rtems: - @$(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/rtems/%.h: %.h - $(INSTALL_DATA) $< $@ - -include $(top_srcdir)/../automake/multilib.am -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/lib.am - -# -# Add local stuff here using += -# - -AM_CPPFLAGS += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS -DDIAGNOSTIC \ - -DBOOTP_COMPAT - -$(LIB): $(OBJS) - $(make-library) - -all-local: $(PREINSTALL_FILES) $(ARCH) $(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 - -include $(top_srcdir)/../automake/local.am diff --git a/cpukit/libnetworking/wrapup/Makefile.am b/cpukit/libnetworking/wrapup/Makefile.am index a82bbd61bb..3b51766aea 100644 --- a/cpukit/libnetworking/wrapup/Makefile.am +++ b/cpukit/libnetworking/wrapup/Makefile.am @@ -3,8 +3,9 @@ ## -NET_O_PIECES = kern lib libc net netinet nfs rtems -OBJS = $(foreach piece, $(NET_O_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) +NET_O_PIECES = lib libc +OBJS = ../$(ARCH)/*.$(OBJEXT) +OBJS += $(foreach piece, $(NET_O_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) LIB = $(ARCH)/libnetworking.a include $(top_srcdir)/../automake/multilib.am -- cgit v1.2.3