From 3108b76c7d17e82fae4d198eadf50bd0135e8ffa Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 25 Mar 1999 01:02:33 +0000 Subject: Regenerated. --- aclocal.m4 | 12 ++++++++- c/build-tools/Makefile.in | 51 ++++++++----------------------------- c/src/exec/wrapup/rtems/Makefile.in | 2 +- configure | 10 +++++--- tools/build/Makefile.in | 51 ++++++++----------------------------- 5 files changed, 40 insertions(+), 86 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index f8cf506795..619dc3bc0c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,14 @@ -dnl aclocal.m4 generated automatically by aclocal 1.2 +dnl aclocal.m4 generated automatically by aclocal 1.4 + +dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without +dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A +dnl PARTICULAR PURPOSE. dnl $Id$ diff --git a/c/build-tools/Makefile.in b/c/build-tools/Makefile.in index d8325d1fee..3c276795be 100644 --- a/c/build-tools/Makefile.in +++ b/c/build-tools/Makefile.in @@ -97,8 +97,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs CONFIG_HEADER = ./src/config.h CONFIG_CLEAN_FILES = -DIST_COMMON = Makefile.am Makefile.in aclocal.m4 configure configure.in \ -src/config.h.in src/stamp-h.in +DIST_COMMON = Makefile.am Makefile.in aclocal.m4 configure configure.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -122,34 +121,6 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) -src/config.h: src/stamp-h - @if test ! -f $@; then \ - rm -f src/stamp-h; \ - $(MAKE) src/stamp-h; \ - else :; fi -src/stamp-h: $(srcdir)/src/config.h.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES= CONFIG_HEADERS=src/config.h \ - $(SHELL) ./config.status - @echo timestamp > src/stamp-h 2> /dev/null -$(srcdir)/src/config.h.in: $(srcdir)/src/stamp-h.in - @if test ! -f $@; then \ - rm -f $(srcdir)/src/stamp-h.in; \ - $(MAKE) $(srcdir)/src/stamp-h.in; \ - else :; fi -$(srcdir)/src/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOHEADER) - @echo timestamp > $(srcdir)/src/stamp-h.in 2> /dev/null - -mostlyclean-hdr: - -clean-hdr: - -distclean-hdr: - -rm -f src/config.h - -maintainer-clean-hdr: - # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -338,32 +309,32 @@ distclean-generic: -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic +mostlyclean-am: mostlyclean-tags mostlyclean-generic mostlyclean: mostlyclean-recursive -clean-am: clean-hdr clean-tags clean-generic mostlyclean-am +clean-am: clean-tags clean-generic mostlyclean-am clean: clean-recursive -distclean-am: distclean-hdr distclean-tags distclean-generic clean-am +distclean-am: distclean-tags distclean-generic clean-am distclean: distclean-recursive -rm -f config.status -maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \ - maintainer-clean-generic distclean-am +maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-recursive -rm -f config.status -.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ -install-data-recursive uninstall-data-recursive install-exec-recursive \ -uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ -all-recursive check-recursive installcheck-recursive info-recursive \ -dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ +.PHONY: install-data-recursive uninstall-data-recursive \ +install-exec-recursive uninstall-exec-recursive installdirs-recursive \ +uninstalldirs-recursive all-recursive check-recursive \ +installcheck-recursive info-recursive dvi-recursive \ +mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ diff --git a/c/src/exec/wrapup/rtems/Makefile.in b/c/src/exec/wrapup/rtems/Makefile.in index 702f4edf26..863a622e17 100644 --- a/c/src/exec/wrapup/rtems/Makefile.in +++ b/c/src/exec/wrapup/rtems/Makefile.in @@ -51,7 +51,7 @@ CLOBBER_ADDITIONS += $(LIB): ${OBJS} $(make-library) cd $(PROJECT_ROOT) ; \ - $(PROJECT_RELEASE)/bin/size_rtems $(RTEMS_BSP) $(ARCH) \ + $(PROJECT_RELEASE)/../c/src/exec/score/tools/generic/size_rtems $(RTEMS_BSP) $(ARCH) \ >$(PROJECT_RELEASE)/lib/sizeinfo$(LIB_VARIANT).txt all: ${ARCH} $(SRCS) $(LIB) diff --git a/configure b/configure index 8f51c521e9..cac8c9df6a 100644 --- a/configure +++ b/configure @@ -3857,12 +3857,13 @@ fi + # pick up all the Makefiles in required parts of the tree echo $ac_n "checking for Makefile.in in make""... $ac_c" 1>&6 -echo "configure:3866: checking for Makefile.in in make" >&5 +echo "configure:3867: checking for Makefile.in in make" >&5 if test -d $srcdir/make; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3877,7 +3878,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libchip""... $ac_c" 1>&6 -echo "configure:3881: checking for Makefile.in in c/src/lib/libchip" >&5 +echo "configure:3882: checking for Makefile.in in c/src/lib/libchip" >&5 if test -d $srcdir/c/src/lib/libchip; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3892,7 +3893,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libmisc""... $ac_c" 1>&6 -echo "configure:3896: checking for Makefile.in in c/src/lib/libmisc" >&5 +echo "configure:3897: checking for Makefile.in in c/src/lib/libmisc" >&5 if test -d $srcdir/c/src/lib/libmisc; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3907,7 +3908,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/tests/samples""... $ac_c" 1>&6 -echo "configure:3911: checking for Makefile.in in c/src/tests/samples" >&5 +echo "configure:3912: checking for Makefile.in in c/src/tests/samples" >&5 if test -d $srcdir/c/src/tests/samples; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -4170,6 +4171,7 @@ s%@rtems_cv_prog_cc_cross@%$rtems_cv_prog_cc_cross%g s%@RTEMS_BSP_LIST@%$RTEMS_BSP_LIST%g s%@RTEMS_LIBC_DIR@%$RTEMS_LIBC_DIR%g s%@RTEMS_USE_OWN_PDIR@%$RTEMS_USE_OWN_PDIR%g +s%@RTEMS_HAS_MULTIPROCESSING@%$RTEMS_HAS_MULTIPROCESSING%g s%@RTEMS_HAS_NETWORKING@%$RTEMS_HAS_NETWORKING%g s%@RTEMS_HAS_RDBG@%$RTEMS_HAS_RDBG%g s%@RTEMS_USE_MACROS@%$RTEMS_USE_MACROS%g diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index d8325d1fee..3c276795be 100644 --- a/tools/build/Makefile.in +++ b/tools/build/Makefile.in @@ -97,8 +97,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs CONFIG_HEADER = ./src/config.h CONFIG_CLEAN_FILES = -DIST_COMMON = Makefile.am Makefile.in aclocal.m4 configure configure.in \ -src/config.h.in src/stamp-h.in +DIST_COMMON = Makefile.am Makefile.in aclocal.m4 configure configure.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -122,34 +121,6 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) -src/config.h: src/stamp-h - @if test ! -f $@; then \ - rm -f src/stamp-h; \ - $(MAKE) src/stamp-h; \ - else :; fi -src/stamp-h: $(srcdir)/src/config.h.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES= CONFIG_HEADERS=src/config.h \ - $(SHELL) ./config.status - @echo timestamp > src/stamp-h 2> /dev/null -$(srcdir)/src/config.h.in: $(srcdir)/src/stamp-h.in - @if test ! -f $@; then \ - rm -f $(srcdir)/src/stamp-h.in; \ - $(MAKE) $(srcdir)/src/stamp-h.in; \ - else :; fi -$(srcdir)/src/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOHEADER) - @echo timestamp > $(srcdir)/src/stamp-h.in 2> /dev/null - -mostlyclean-hdr: - -clean-hdr: - -distclean-hdr: - -rm -f src/config.h - -maintainer-clean-hdr: - # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -338,32 +309,32 @@ distclean-generic: -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic +mostlyclean-am: mostlyclean-tags mostlyclean-generic mostlyclean: mostlyclean-recursive -clean-am: clean-hdr clean-tags clean-generic mostlyclean-am +clean-am: clean-tags clean-generic mostlyclean-am clean: clean-recursive -distclean-am: distclean-hdr distclean-tags distclean-generic clean-am +distclean-am: distclean-tags distclean-generic clean-am distclean: distclean-recursive -rm -f config.status -maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \ - maintainer-clean-generic distclean-am +maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-recursive -rm -f config.status -.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ -install-data-recursive uninstall-data-recursive install-exec-recursive \ -uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ -all-recursive check-recursive installcheck-recursive info-recursive \ -dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ +.PHONY: install-data-recursive uninstall-data-recursive \ +install-exec-recursive uninstall-exec-recursive installdirs-recursive \ +uninstalldirs-recursive all-recursive check-recursive \ +installcheck-recursive info-recursive dvi-recursive \ +mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -- cgit v1.2.3