From abc116768acbd70f0bb3b7f23a841bf92c5e364f Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 25 Jun 2002 17:41:49 +0000 Subject: 2002-06-25 Ralf Corsepius * configure.ac: RTEMS_TOP(../../../..). AC_CONFIG_AUX_DIR(../../../..). Remove RTEMS_CANONICAL_HOST. Use RTEMS_ENV_RTEMSCPU. Add AC_PROG_RANLIB. * include/rpc/Makefile.am: Include $(top_srcdir)/../automake/*.am. * include/Makefile.am: Include $(top_srcdir)/../automake/*.am. * include/rpcsvc/Makefile.am: Include $(top_srcdir)/../automake/*.am. * Makefile.am: Include $(top_srcdir)/../automake/*.am. ACLOCAL_AMFLAGS = -I ../aclocal. * src/rpc/PSD.doc/Makefile.am: Include $(top_srcdir)/../automake/*.am. * src/rpc/Makefile.am: Include $(top_srcdir)/../automake/*.am. * src/xdr/Makefile.am: Include $(top_srcdir)/../automake/*.am. * src/Makefile.am: Include $(top_srcdir)/../automake/*.am. --- cpukit/librpc/ChangeLog | 17 +++++++++++++++++ cpukit/librpc/Makefile.am | 6 +++--- cpukit/librpc/configure.ac | 12 +++++------- cpukit/librpc/include/Makefile.am | 4 ++-- cpukit/librpc/include/rpc/Makefile.am | 2 +- cpukit/librpc/include/rpcsvc/Makefile.am | 2 +- cpukit/librpc/src/Makefile.am | 4 ++-- cpukit/librpc/src/rpc/Makefile.am | 20 ++++++-------------- cpukit/librpc/src/rpc/PSD.doc/Makefile.am | 2 +- cpukit/librpc/src/xdr/Makefile.am | 19 ++++++------------- 10 files changed, 44 insertions(+), 44 deletions(-) (limited to 'cpukit/librpc') diff --git a/cpukit/librpc/ChangeLog b/cpukit/librpc/ChangeLog index 3ae538c7a4..1dbd678c6d 100644 --- a/cpukit/librpc/ChangeLog +++ b/cpukit/librpc/ChangeLog @@ -1,3 +1,20 @@ +2002-06-25 Ralf Corsepius + + * configure.ac: RTEMS_TOP(../../../..). + AC_CONFIG_AUX_DIR(../../../..). + Remove RTEMS_CANONICAL_HOST. + Use RTEMS_ENV_RTEMSCPU. + Add AC_PROG_RANLIB. + * include/rpc/Makefile.am: Include $(top_srcdir)/../automake/*.am. + * include/Makefile.am: Include $(top_srcdir)/../automake/*.am. + * include/rpcsvc/Makefile.am: Include $(top_srcdir)/../automake/*.am. + * Makefile.am: Include $(top_srcdir)/../automake/*.am. + ACLOCAL_AMFLAGS = -I ../aclocal. + * src/rpc/PSD.doc/Makefile.am: Include $(top_srcdir)/../automake/*.am. + * src/rpc/Makefile.am: Include $(top_srcdir)/../automake/*.am. + * src/xdr/Makefile.am: Include $(top_srcdir)/../automake/*.am. + * src/Makefile.am: Include $(top_srcdir)/../automake/*.am. + 2002-03-27 Ralf Corsepius * configure.ac: diff --git a/cpukit/librpc/Makefile.am b/cpukit/librpc/Makefile.am index 63706cd495..db34413bca 100644 --- a/cpukit/librpc/Makefile.am +++ b/cpukit/librpc/Makefile.am @@ -2,7 +2,7 @@ ## $Id$ ## -ACLOCAL_AMFLAGS = -I ../../../aclocal +ACLOCAL_AMFLAGS = -I ../aclocal if rpc_not_supported SUBDIRS = @@ -12,5 +12,5 @@ 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 index c695777bd5..f2c4b38514 100644 --- a/cpukit/librpc/configure.ac +++ b/cpukit/librpc/configure.ac @@ -5,26 +5,24 @@ AC_PREREQ(2.52) AC_INIT([rtems-c-src-librpc],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([include/rpc]) -RTEMS_TOP(../../..) -AC_CONFIG_AUX_DIR(../../..) +RTEMS_TOP(../../../..) +AC_CONFIG_AUX_DIR(../../../..) RTEMS_CANONICAL_TARGET_CPU -RTEMS_CANONICAL_HOST AM_INIT_AUTOMAKE([no-define foreign 1.6]) AM_MAINTAINER_MODE RTEMS_ENABLE_NETWORKING -RTEMS_ENABLE_BARE -RTEMS_ENV_RTEMSBSP +RTEMS_ENV_RTEMSCPU RTEMS_CHECK_CPU -RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS +AC_PROG_RANLIB -RTEMS_CHECK_NETWORKING(RTEMS_BSP) +RTEMS_CHECK_NETWORKING AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") AM_CONDITIONAL(rpc_not_supported, test "$RTEMS_CPU" = "c4x") diff --git a/cpukit/librpc/include/Makefile.am b/cpukit/librpc/include/Makefile.am index fe331bc2a6..5caf4c1c31 100644 --- a/cpukit/librpc/include/Makefile.am +++ b/cpukit/librpc/include/Makefile.am @@ -5,5 +5,5 @@ SUBDIRS = rpc rpcsvc -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/include/rpc/Makefile.am b/cpukit/librpc/include/rpc/Makefile.am index 23564d4ad6..e92b895980 100644 --- a/cpukit/librpc/include/rpc/Makefile.am +++ b/cpukit/librpc/include/rpc/Makefile.am @@ -24,4 +24,4 @@ all-local: $(PREINSTALL_FILES) EXTRA_DIST = $(H_FILES) -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/cpukit/librpc/include/rpcsvc/Makefile.am b/cpukit/librpc/include/rpcsvc/Makefile.am index 03237f6b8b..e6153355cf 100644 --- a/cpukit/librpc/include/rpcsvc/Makefile.am +++ b/cpukit/librpc/include/rpcsvc/Makefile.am @@ -9,4 +9,4 @@ EXTRA_DIST = bootparam_prot.x crypt.x key_prot.x klm_prot.x mount.x \ rstat.x rwall.x sm_inter.x spray.x yp.x yp_prot.h ypclnt.h yppasswd.x \ ypupdate_prot.x ypxfrd.x -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/cpukit/librpc/src/Makefile.am b/cpukit/librpc/src/Makefile.am index 0e10adbd33..980d0ea432 100644 --- a/cpukit/librpc/src/Makefile.am +++ b/cpukit/librpc/src/Makefile.am @@ -5,5 +5,5 @@ 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 a3c2157658..cd8d96cf80 100644 --- a/cpukit/librpc/src/rpc/Makefile.am +++ b/cpukit/librpc/src/rpc/Makefile.am @@ -2,6 +2,9 @@ ## $Id$ ## +include $(top_srcdir)/../automake/multilib.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/lib.am SUBDIRS = PSD.doc @@ -23,12 +26,6 @@ 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 - -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a - # # Add local stuff here using += # @@ -38,20 +35,15 @@ AM_CPPFLAGS += '-D__P(x)=x' -D_RPC_read=read -D_RPC_write=write -D_RPC_close=clo $(LIB): $(OBJS) $(make-library) -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) - $(INSTALL_DATA) $< $@ - 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) $(OBJS) $(TMPINSTALL_FILES) +all-local: $(ARCH) $(LIB) endif -.PRECIOUS: $(LIB) - EXTRA_DIST = $(C_FILES) DISCLAIMER $(UNUSED_C_FILES) $(noinst_MANS) -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/PSD.doc/Makefile.am b/cpukit/librpc/src/rpc/PSD.doc/Makefile.am index 1cece8e061..24b4d3fc85 100644 --- a/cpukit/librpc/src/rpc/PSD.doc/Makefile.am +++ b/cpukit/librpc/src/rpc/PSD.doc/Makefile.am @@ -4,4 +4,4 @@ EXTRA_DIST = nfs.rfc.ms rpc.prog.ms rpc.rfc.ms rpcgen.ms xdr.nts.ms \ 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 fe92e0a427..26ba69becc 100644 --- a/cpukit/librpc/src/xdr/Makefile.am +++ b/cpukit/librpc/src/xdr/Makefile.am @@ -6,20 +6,18 @@ LIBNAME = libxdr LIB = $(ARCH)/$(LIBNAME).a +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 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 - noinst_MANS = xdr.3 -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a - # # Add local stuff here using += # @@ -29,16 +27,11 @@ AM_CPPFLAGS += '-D__P(x)=x' $(LIB): $(OBJS) $(make-library) -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) - $(INSTALL_DATA) $< $@ - if HAS_NETWORKING man_MANS = $(noinst_MANS) -all-local: $(ARCH) $(OBJS) $(TMPINSTALL_FILES) +all-local: $(ARCH) $(LIB) endif -.PRECIOUS: $(LIB) - EXTRA_DIST = $(C_FILES) $(noinst_MANS) -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../automake/local.am -- cgit v1.2.3