From 14d34d841ed0832fa3998d70c679e2369a70d5ee Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 8 Jul 2003 12:21:36 +0000 Subject: 2003-07-08 Ralf Corsepius * configure.ac: Remove (Merged into ../configure.ac). * Makefile.am, libc/Makefile.am, lib/Makefile.am, wrapup/Makefile.am: Reflect having merged configure.ac into ../configure.ac. * kern/kern_mib.c: Use RTEMS_VERSION to setup osrelease. --- cpukit/libnetworking/ChangeLog | 7 +++++++ cpukit/libnetworking/Makefile.am | 13 ++++++++----- cpukit/libnetworking/configure.ac | 34 --------------------------------- cpukit/libnetworking/kern/kern_mib.c | 2 +- cpukit/libnetworking/lib/Makefile.am | 10 ++++++---- cpukit/libnetworking/libc/Makefile.am | 10 ++++++---- cpukit/libnetworking/wrapup/Makefile.am | 14 ++++++-------- 7 files changed, 34 insertions(+), 56 deletions(-) delete mode 100644 cpukit/libnetworking/configure.ac (limited to 'cpukit') diff --git a/cpukit/libnetworking/ChangeLog b/cpukit/libnetworking/ChangeLog index dc7c502a1f..649351d086 100644 --- a/cpukit/libnetworking/ChangeLog +++ b/cpukit/libnetworking/ChangeLog @@ -1,3 +1,10 @@ +2003-07-08 Ralf Corsepius + + * configure.ac: Remove (Merged into ../configure.ac). + * Makefile.am, libc/Makefile.am, lib/Makefile.am, wrapup/Makefile.am: + Reflect having merged configure.ac into ../configure.ac. + * kern/kern_mib.c: Use RTEMS_VERSION to setup osrelease. + 2003-05-29 Joel Sherrill * rtems/rtems_syscall.c: Removed warnings. diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am index 1fb550e079..cbead878bf 100644 --- a/cpukit/libnetworking/Makefile.am +++ b/cpukit/libnetworking/Makefile.am @@ -4,9 +4,9 @@ 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/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 \ @@ -17,6 +17,7 @@ LIB = $(ARCH)/libnetworking.a SUBDIRS = . lib libc SUBDIRS += wrapup +if HAS_NETWORKING ## poll.h is not in the list because RTEMS does not have poll() ## and installing poll.h confuses autoconf. include_HEADERS = \ @@ -207,5 +208,7 @@ $(LIB): $(OBJS) all-local: $(PREINSTALL_FILES) $(ARCH) $(LIB) -include $(top_srcdir)/../automake/subdirs.am -include $(top_srcdir)/../automake/local.am +endif + +include $(top_srcdir)/automake/subdirs.am +include $(top_srcdir)/automake/local.am diff --git a/cpukit/libnetworking/configure.ac b/cpukit/libnetworking/configure.ac deleted file mode 100644 index 145dd1e0de..0000000000 --- a/cpukit/libnetworking/configure.ac +++ /dev/null @@ -1,34 +0,0 @@ -## Process this file with autoconf to produce a configure script. -## -## $Id$ - -AC_PREREQ(2.57) -AC_INIT([rtems-cpukit-libnetworking],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) -AC_CONFIG_SRCDIR([arpa]) -RTEMS_TOP(../..) - -RTEMS_CANONICAL_TARGET_CPU - -AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2]) -AM_MAINTAINER_MODE - -RTEMS_ENABLE_NETWORKING - -RTEMS_ENV_RTEMSCPU - -RTEMS_CHECK_CPU -RTEMS_CANONICAL_HOST - -RTEMS_PROG_CC_FOR_TARGET -RTEMS_CANONICALIZE_TOOLS -AC_PROG_RANLIB - -RTEMS_CHECK_NETWORKING - -# Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -lib/Makefile -libc/Makefile -wrapup/Makefile -]) -AC_OUTPUT diff --git a/cpukit/libnetworking/kern/kern_mib.c b/cpukit/libnetworking/kern/kern_mib.c index 174ddc69e9..8d0185e053 100644 --- a/cpukit/libnetworking/kern/kern_mib.c +++ b/cpukit/libnetworking/kern/kern_mib.c @@ -59,7 +59,7 @@ #ifdef __rtems__ char machine[] = "SET ME"; -char osrelease[] = PACKAGE_VERSION; +char osrelease[] = RTEMS_VERSION; char ostype[] = "RTEMS"; #endif diff --git a/cpukit/libnetworking/lib/Makefile.am b/cpukit/libnetworking/lib/Makefile.am index cca6ab5046..35501f0092 100644 --- a/cpukit/libnetworking/lib/Makefile.am +++ b/cpukit/libnetworking/lib/Makefile.am @@ -7,9 +7,9 @@ LIB = $(ARCH)/lib.a C_FILES = getprotoby.c rtems_bsdnet_ntp.c ftpfs.c syslog.c tftpDriver.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 +include $(top_srcdir)/automake/multilib.am +include $(top_srcdir)/automake/compile.am +include $(top_srcdir)/automake/lib.am # # Add local stuff here using += @@ -17,13 +17,15 @@ include $(top_srcdir)/../automake/lib.am AM_CPPFLAGS += -DNOPOLL -DNOSELECT +if HAS_NETWORKING $(LIB): $(OBJS) $(make-library) all-local: $(ARCH) $(LIB) +endif .PRECIOUS: $(LIB) EXTRA_DIST = README getprotoby.c rtems_bsdnet_ntp.c syslog.c tftpDriver.c -include $(top_srcdir)/../automake/local.am +include $(top_srcdir)/automake/local.am diff --git a/cpukit/libnetworking/libc/Makefile.am b/cpukit/libnetworking/libc/Makefile.am index 9c3700b9f9..cc7497801a 100644 --- a/cpukit/libnetworking/libc/Makefile.am +++ b/cpukit/libnetworking/libc/Makefile.am @@ -15,10 +15,11 @@ C_FILES = addr2ascii.c ascii2addr.c base64.c gethostbydns.c gethostbyht.c \ res_stubs.c res_update.c strsep.c rcmd.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 +include $(top_srcdir)/automake/multilib.am +include $(top_srcdir)/automake/compile.am +include $(top_srcdir)/automake/lib.am +if HAS_NETWORKING man_MANS = addr2ascii.3 byteorder.3 ethers.3 gethostbyname.3 getnetent.3 \ getprotoent.3 getservent.3 inet.3 iso_addr.3 linkaddr.3 ns.3 rcmd.3 \ resolver.3 @@ -33,6 +34,7 @@ $(LIB): $(OBJS) $(make-library) all-local: $(ARCH) $(LIB) +endif .PRECIOUS: $(LIB) @@ -50,4 +52,4 @@ EXTRA_DIST = addr2ascii.3 addr2ascii.c ascii2addr.c base64.c byteorder.3 \ 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 +include $(top_srcdir)/automake/local.am diff --git a/cpukit/libnetworking/wrapup/Makefile.am b/cpukit/libnetworking/wrapup/Makefile.am index 3b51766aea..54e8a166ad 100644 --- a/cpukit/libnetworking/wrapup/Makefile.am +++ b/cpukit/libnetworking/wrapup/Makefile.am @@ -8,17 +8,15 @@ OBJS = ../$(ARCH)/*.$(OBJEXT) OBJS += $(foreach piece, $(NET_O_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) LIB = $(ARCH)/libnetworking.a -include $(top_srcdir)/../automake/multilib.am -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/lib.am - -# -# (OPTIONAL) Add local stuff here using += -# +include $(top_srcdir)/automake/multilib.am +include $(top_srcdir)/automake/compile.am +include $(top_srcdir)/automake/lib.am +if HAS_NETWORKING $(LIB): $(OBJS) $(make-library) all-local: $(ARCH) $(LIB) +endif -include $(top_srcdir)/../automake/local.am +include $(top_srcdir)/automake/local.am -- cgit v1.2.3