From 3ad34cadc23bf85f1153a123e597fb1976231d4a Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 8 Jul 2003 17:02:24 +0000 Subject: 2003-07-08 Ralf Corsepius * configure.ac: Remove (Merged-in into ../configure.ac) * Makefile.am, include/Makefile.am, src/Makefile.am, src/rpc/Makefile.am, src/xdr/Makefile.am: Reflect having merged configure.ac into ../configure.ac. --- cpukit/librpc/ChangeLog | 7 +++++++ cpukit/librpc/Makefile.am | 10 ++-------- cpukit/librpc/configure.ac | 39 --------------------------------------- cpukit/librpc/src/Makefile.am | 5 ++--- cpukit/librpc/src/rpc/Makefile.am | 10 +++++----- cpukit/librpc/src/xdr/Makefile.am | 10 +++++----- 6 files changed, 21 insertions(+), 60 deletions(-) delete mode 100644 cpukit/librpc/configure.ac diff --git a/cpukit/librpc/ChangeLog b/cpukit/librpc/ChangeLog index e0a50e6fb3..c8a28becce 100644 --- a/cpukit/librpc/ChangeLog +++ b/cpukit/librpc/ChangeLog @@ -1,3 +1,10 @@ +2003-07-08 Ralf Corsepius + + * configure.ac: Remove (Merged-in into ../configure.ac) + * Makefile.am, include/Makefile.am, src/Makefile.am, + src/rpc/Makefile.am, src/xdr/Makefile.am: + Reflect having merged configure.ac into ../configure.ac. + 2003-02-11 Ralf Corsepius * configure.ac: AM_INIT_AUTOMAKE([1.7.2]). diff --git a/cpukit/librpc/Makefile.am b/cpukit/librpc/Makefile.am index db34413bca..e2594d7b97 100644 --- a/cpukit/librpc/Makefile.am +++ b/cpukit/librpc/Makefile.am @@ -2,15 +2,9 @@ ## $Id$ ## -ACLOCAL_AMFLAGS = -I ../aclocal - -if rpc_not_supported -SUBDIRS = -else SUBDIRS = include src -endif EXTRA_DIST = README_RTEMS -include $(top_srcdir)/../automake/subdirs.am -include $(top_srcdir)/../automake/local.am +include $(top_srcdir)/automake/subdirs.am +include $(top_srcdir)/automake/local.am diff --git a/cpukit/librpc/configure.ac b/cpukit/librpc/configure.ac deleted file mode 100644 index 09a880886c..0000000000 --- a/cpukit/librpc/configure.ac +++ /dev/null @@ -1,39 +0,0 @@ -## Process this file with autoconf to produce a configure script. -## -## $Id$ - -AC_PREREQ(2.57) -AC_INIT([rtems-cpukit-librpc],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) -AC_CONFIG_SRCDIR([include/rpc]) -RTEMS_TOP(../..) -AC_CONFIG_AUX_DIR(../..) - -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_PROG_CC_FOR_TARGET -RTEMS_CANONICALIZE_TOOLS -AC_PROG_RANLIB - -RTEMS_CHECK_NETWORKING - -AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") -AM_CONDITIONAL(rpc_not_supported, test "$RTEMS_CPU" = "c4x" \ -|| test "$RTEMS_CPU" = "or32" \ -) - -# Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -include/Makefile -src/Makefile -src/xdr/Makefile -src/rpc/Makefile -]) -AC_OUTPUT diff --git a/cpukit/librpc/src/Makefile.am b/cpukit/librpc/src/Makefile.am index 980d0ea432..b561cda3c4 100644 --- a/cpukit/librpc/src/Makefile.am +++ b/cpukit/librpc/src/Makefile.am @@ -2,8 +2,7 @@ ## $Id$ ## - SUBDIRS = xdr rpc -include $(top_srcdir)/../automake/subdirs.am -include $(top_srcdir)/../automake/local.am +include $(top_srcdir)/automake/subdirs.am +include $(top_srcdir)/automake/local.am diff --git a/cpukit/librpc/src/rpc/Makefile.am b/cpukit/librpc/src/rpc/Makefile.am index 5ae49c7261..235e05ee8b 100644 --- a/cpukit/librpc/src/rpc/Makefile.am +++ b/cpukit/librpc/src/rpc/Makefile.am @@ -2,9 +2,9 @@ ## $Id$ ## -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 LIB = $(ARCH)/librpc.a @@ -29,13 +29,13 @@ OBJS = $(C_O_FILES) AM_CPPFLAGS += '-D__P(x)=x' -D_RPC_read=read -D_RPC_write=write -D_RPC_close=close -D_RTEMS_RPC_INTERNAL_ +if LIBRPC $(LIB): $(OBJS) $(make-library) noinst_MANS = bindresvport.3 getrpcent.3 publickey.3 rpc.3 rpc_secure.3 \ rstat_svc.8 des_crypt.3 getrpcport.3 publickey.5 rpc.5 rstat.1 rtime.3 -if HAS_NETWORKING man_MANS = $(noinst_MANS) all-local: $(ARCH) $(LIB) endif @@ -45,4 +45,4 @@ EXTRA_DIST = $(C_FILES) DISCLAIMER $(UNUSED_C_FILES) $(noinst_MANS) EXTRA_DIST += PSD.doc/nfs.rfc.ms PSD.doc/rpc.prog.ms PSD.doc/rpc.rfc.ms \ PSD.doc/rpcgen.ms PSD.doc/xdr.nts.ms PSD.doc/xdr.rfc.ms -include $(top_srcdir)/../automake/local.am +include $(top_srcdir)/automake/local.am diff --git a/cpukit/librpc/src/xdr/Makefile.am b/cpukit/librpc/src/xdr/Makefile.am index 8bfdc15ec6..81c8443cf0 100644 --- a/cpukit/librpc/src/xdr/Makefile.am +++ b/cpukit/librpc/src/xdr/Makefile.am @@ -4,9 +4,9 @@ LIB = $(ARCH)/libxdr.a -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 C_FILES = xdr.c xdr_array.c xdr_float.c xdr_mem.c xdr_rec.c xdr_reference.c \ xdr_sizeof.c xdr_stdio.c @@ -22,14 +22,14 @@ noinst_MANS = xdr.3 AM_CPPFLAGS += '-D__P(x)=x' +if LIBRPC $(LIB): $(OBJS) $(make-library) -if HAS_NETWORKING man_MANS = $(noinst_MANS) all-local: $(ARCH) $(LIB) endif EXTRA_DIST = $(C_FILES) $(noinst_MANS) -include $(top_srcdir)/../automake/local.am +include $(top_srcdir)/automake/local.am -- cgit v1.2.3