From 07347cb5e79d1d651655e7975b69cb8a45243017 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 7 Jan 2004 17:48:16 +0000 Subject: 2004-01-07 Ralf Corsepius * Makefile.am: Build library using EXTRA_LIBRARIES and automake rules. --- cpukit/libnetworking/Makefile.am | 117 +++++++++++++++++---------------------- 1 file changed, 51 insertions(+), 66 deletions(-) (limited to 'cpukit/libnetworking/Makefile.am') diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am index af575a1cef..9e14f5d6bd 100644 --- a/cpukit/libnetworking/Makefile.am +++ b/cpukit/libnetworking/Makefile.am @@ -5,16 +5,26 @@ ACLOCAL_AMFLAGS = -I ../aclocal include $(top_srcdir)/automake/multilib.am -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am +include $(top_srcdir)/automake/amcompile.am AM_CPPFLAGS += -I$(top_builddir) if HAS_NETWORKING + # Add -DFORWARD_PROTOCOL to enable UDP forwarding -- requires missing net/pf.h libnetworking_CPPFLAGS = -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS \ -DDIAGNOSTIC -DBOOTP_COMPAT +EXTRA_LIBRARIES = o-optimize/libnetworking.a +o_optimize_libnetworking_a_SOURCES = +o_optimize_libnetworking_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \ +$(libnetworking_CPPFLAGS) + +EXTRA_LIBRARIES += o-debug/libnetworking.a +o_debug_libnetworking_a_SOURCES = +o_debug_libnetworking_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \ +$(libnetworking_CPPFLAGS) + TMP_LIBS = $(ARCH)/libnetworking.a ## poll.h is not in the list because RTEMS does not have poll() @@ -34,12 +44,8 @@ include_arpa_HEADERS = arpa/ftp.h arpa/inet.h arpa/nameser.h \ kern_C_FILES = kern/kern_mib.c kern/kern_subr.c kern/kern_sysctl.c \ kern/uipc_domain.c kern/uipc_mbuf.c kern/uipc_socket.c \ kern/uipc_socket2.c -libnetworking_OBJS = $(kern_C_FILES:kern/%.c=$(ARCH)/%.$(OBJEXT)) - -$(ARCH)/%.$(OBJEXT): kern/%.c $(ARCH)/$(dirstamp) - ${COMPILE} $(libnetworking_CPPFLAGS) -o $@ -c $< - -EXTRA_DIST = $(kern_C_FILES) +o_optimize_libnetworking_a_SOURCES += $(kern_C_FILES) +o_debug_libnetworking_a_SOURCES += $(kern_C_FILES) ## machine @@ -60,12 +66,8 @@ include_net_HEADERS = net/bpf.h net/ethernet.h net/if.h net/if_arp.h \ 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 -libnetworking_OBJS += $(net_C_FILES:net/%.c=$(ARCH)/%.$(OBJEXT)) - -$(ARCH)/%.$(OBJEXT): net/%.c $(ARCH)/$(dirstamp) - ${COMPILE} $(libnetworking_CPPFLAGS) -o $@ -c $< - -EXTRA_DIST += $(net_C_FILES) +o_optimize_libnetworking_a_SOURCES += $(net_C_FILES) +o_debug_libnetworking_a_SOURCES += $(net_C_FILES) ## netinet @@ -86,12 +88,8 @@ netinet_C_FILES = netinet/if_ether.c netinet/igmp.c netinet/in.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 -libnetworking_OBJS += $(netinet_C_FILES:netinet/%.c=$(ARCH)/%.$(OBJEXT)) - -$(ARCH)/%.$(OBJEXT): netinet/%.c $(ARCH)/$(dirstamp) - ${COMPILE} $(libnetworking_CPPFLAGS) -o $@ -c $< - -EXTRA_DIST += $(netinet_C_FILES) +o_optimize_libnetworking_a_SOURCES += $(netinet_C_FILES) +o_debug_libnetworking_a_SOURCES += $(netinet_C_FILES) ## nfs @@ -101,12 +99,8 @@ include_nfs_HEADERS = nfs/krpc.h nfs/nfs.h nfs/nfsdiskless.h nfs/nfsproto.h \ nfs/rpcv2.h nfs/xdr_subs.h nfs_C_FILES = nfs/bootp_subr.c -libnetworking_OBJS += $(nfs_C_FILES:nfs/%.c=$(ARCH)/%.$(OBJEXT)) - -$(ARCH)/%.$(OBJEXT): nfs/%.c $(ARCH)/$(dirstamp) - ${COMPILE} $(libnetworking_CPPFLAGS) -o $@ -c $< - -EXTRA_DIST += $(nfs_C_FILES) +o_optimize_libnetworking_a_SOURCES += $(nfs_C_FILES) +o_debug_libnetworking_a_SOURCES += $(nfs_C_FILES) ## rtems @@ -121,12 +115,8 @@ rtems_C_FILES = rtems/sghostname.c rtems/issetugid.c rtems/rtems_glue.c \ rtems/rtems_showipstat.c rtems/rtems_showicmpstat.c \ rtems/rtems_showtcpstat.c rtems/rtems_showudpstat.c rtems/rtems_select.c \ rtems/mkrootfs.c rtems/rtems_bsdnet_malloc_starvation.c -libnetworking_OBJS += $(rtems_C_FILES:rtems/%.c=$(ARCH)/%.$(OBJEXT)) - -$(ARCH)/%.$(OBJEXT): rtems/%.c $(ARCH)/$(dirstamp) - ${COMPILE} $(libnetworking_CPPFLAGS) -o $@ -c $< - -EXTRA_DIST += $(rtems_C_FILES) +o_optimize_libnetworking_a_SOURCES += $(rtems_C_FILES) +o_debug_libnetworking_a_SOURCES += $(rtems_C_FILES) ## sys @@ -147,6 +137,18 @@ include_vm_HEADERS = vm/vm.h vm/vm_extern.h vm/vm_kern.h vm/vm_param.h ## libc +libc_CPPFLAGS = -DNOPOLL -DNOSELECT + +EXTRA_LIBRARIES += o-optimize/libc.a +o_optimize_libc_a_SOURCES = +o_optimize_libc_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \ +$(libc_CPPFLAGS) + +EXTRA_LIBRARIES += o-debug/libc.a +o_debug_libc_a_SOURCES = +o_debug_libc_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \ +$(libc_CPPFLAGS) + libc_C_FILES = libc/addr2ascii.c libc/ascii2addr.c libc/base64.c \ libc/gethostbydns.c libc/gethostbyht.c libc/gethostbynis.c \ libc/gethostnamadr.c libc/getnetbydns.c libc/getnetbyht.c \ @@ -160,28 +162,17 @@ libc_C_FILES = libc/addr2ascii.c libc/ascii2addr.c libc/base64.c \ libc/res_comp.c libc/res_data.c libc/res_debug.c libc/res_init.c \ libc/res_mkquery.c libc/res_mkupdate.c libc/res_query.c libc/res_send.c \ libc/res_stubs.c libc/res_update.c libc/strsep.c libc/rcmd.c -libc_OBJS = $(libc_C_FILES:libc/%.c=libc/$(ARCH)/%.$(OBJEXT)) +o_optimize_libc_a_SOURCES += $(libc_C_FILES) +o_debug_libc_a_SOURCES += $(libc_C_FILES) man_MANS = libc/addr2ascii.3 libc/byteorder.3 libc/ethers.3 \ libc/gethostbyname.3 libc/getnetent.3 libc/getprotoent.3 \ libc/getservent.3 libc/inet.3 libc/iso_addr.3 libc/linkaddr.3 libc/ns.3 \ libc/rcmd.3 libc/resolver.3 -libc_CPPFLAGS = -DNOPOLL -DNOSELECT - -libc/$(ARCH)/$(dirstamp): - @$(mkdir_p) libc/$(ARCH) - @: > libc/$(ARCH)/$(dirstamp) -libc/$(ARCH)/%.$(OBJEXT): libc/%.c libc/$(ARCH)/$(dirstamp) - ${COMPILE} $(libc_CPPFLAGS) -o $@ -c $< -libc/$(ARCH)/lib.a: $(libc_OBJS) - $(make-library) +TMP_LIBS += $(ARCH)/libc.a -TMP_LIBS += libc/$(ARCH)/lib.a - -CLEANDIRS = libc/o-optimize libc/o-debug - -EXTRA_DIST += libc/addr2ascii.3 libc/addr2ascii.c libc/ascii2addr.c \ +EXTRA_DIST = libc/addr2ascii.3 libc/addr2ascii.c libc/ascii2addr.c \ libc/base64.c libc/byteorder.3 libc/ether_addr.c libc/ethers.3 \ libc/gethostbydns.c libc/gethostbyht.c libc/gethostbyname.3 \ libc/gethostbynis.c libc/gethostnamadr.c libc/gethostname.c \ @@ -202,32 +193,26 @@ EXTRA_DIST += libc/addr2ascii.3 libc/addr2ascii.c libc/ascii2addr.c \ ## lib -lib_C_FILES = lib/getprotoby.c lib/rtems_bsdnet_ntp.c lib/ftpfs.c \ - lib/syslog.c lib/tftpDriver.c -lib_OBJS = $(lib_C_FILES:lib/%.c=lib/$(ARCH)/%.$(OBJEXT)) - lib_CPPFLAGS = -DNOPOLL -DNOSELECT -lib/$(ARCH)/$(dirstamp): - @$(mkdir_p) lib/$(ARCH) - @: > lib/$(ARCH)/$(dirstamp) -lib/$(ARCH)/%.$(OBJEXT): lib/%.c lib/$(ARCH)/$(dirstamp) - ${COMPILE} $(lib_CPPFLAGS) -o $@ -c $< -lib/$(ARCH)/lib.a: $(lib_OBJS) - $(make-library) +EXTRA_LIBRARIES += o-optimize/lib.a +o_optimize_lib_a_SOURCES = +o_optimize_lib_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \ +$(lib_CPPFLAGS) -TMP_LIBS += lib/$(ARCH)/lib.a +EXTRA_LIBRARIES += o-debug/lib.a +o_debug_lib_a_SOURCES = +o_debug_lib_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \ +$(lib_CPPFLAGS) -CLEANDIRS += lib/o-optimize lib/o-debug - -EXTRA_DIST += lib/README lib/getprotoby.c lib/rtems_bsdnet_ntp.c \ +lib_C_FILES = lib/getprotoby.c lib/rtems_bsdnet_ntp.c lib/ftpfs.c \ lib/syslog.c lib/tftpDriver.c +o_optimize_lib_a_SOURCES += $(lib_C_FILES) +o_debug_lib_a_SOURCES += $(lib_C_FILES) -# --- - -$(ARCH)/libnetworking.a: $(libnetworking_OBJS) - $(make-library) +TMP_LIBS += $(ARCH)/lib.a +# --- all-local: $(PREINSTALL_FILES) $(TMP_LIBS) endif -- cgit v1.2.3