From 7e03d107d780ca0e1690a7cdecfb35834832c3d5 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 29 Mar 1999 21:08:04 +0000 Subject: Patch from Ralf Corsepius : Yet some more modifications, I would recommend to be considered before releasing a snapshot: 1. Cleanup to aclocal/ cvs rm -f aclocal/cygwin.m4 cvs rm -f aclocal/exeext.m4 They are neither used nor needed anymore, however they also don't disturb (we use autoconf-2.13's AC_EXEEXT instead, now) ---------- 2. rtems-rc-19990328-0.diff Some (minor) bug-fixes: * make/Templates/Makefile.inc.in: use the new installation directory ($(prefix)/ instead of $(prefix)/rtems/) * c/src/exec/score/tools/generic/Makefile.am: added line to include local.am * c/src/exec/score/tools/*/configure.in: added CVS Id header ---------- 3. rtems-rc-19990328-1.diff Enhancements and cleanups to autogen, rtems-polish.sh, configure.in etc. * autogen: Use the file "VERSION" to detect RTEMS toplevel directory, extended usage-message, use "find -print" * c/update-tools/cipolish: New script to beautify configure.in scripts * c/update-tools/rtems-polish.sh: Use the file "VERSION" to detect RTEMS toplevel directory, extended usage-message, added variable for perl scripts' subdirectory, use "find -print", cipolish support, new options -ac -am -ci. * aclocal/*.m4, configure.in: moved some AC_SUBST lines to aclocal/*.m4 (reduces size of configure.in scripts, eases splitting configure.in scripts). ---------- --- c/src/exec/score/tools/generic/Makefile.am | 1 + c/src/exec/score/tools/generic/Makefile.in | 28 +++++++++++++++++++++++++++- c/src/exec/score/tools/generic/configure.in | 4 ++++ c/src/exec/score/tools/hppa1.1/configure.in | 4 ++++ c/src/exec/score/tools/sh/configure.in | 4 ++++ c/src/exec/score/tools/unix/configure.in | 4 ++++ 6 files changed, 44 insertions(+), 1 deletion(-) (limited to 'c/src') diff --git a/c/src/exec/score/tools/generic/Makefile.am b/c/src/exec/score/tools/generic/Makefile.am index 476d6bab83..92f0ea787e 100644 --- a/c/src/exec/score/tools/generic/Makefile.am +++ b/c/src/exec/score/tools/generic/Makefile.am @@ -6,3 +6,4 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL = @ACLOCAL@ -I $(RTEMS_TOPdir)/aclocal noinst_SCRIPTS=size_rtems +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/tools/generic/Makefile.in b/c/src/exec/score/tools/generic/Makefile.in index 41e91bee93..d7a05c1cf3 100644 --- a/c/src/exec/score/tools/generic/Makefile.in +++ b/c/src/exec/score/tools/generic/Makefile.in @@ -15,6 +15,14 @@ # +# $Id$ + +# NOTE: This is a temporary work-around to keep +# "make debug" and "make debug_install" working. +# Once automake is fully integrated these make targets +# and this file will probably be removed + + SHELL = @SHELL@ srcdir = @srcdir@ @@ -96,7 +104,7 @@ TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/../../../../../../automake/local.am cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) @@ -232,6 +240,24 @@ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean +debug-am: + +debug: debug-am + +debug_install-am: + +debug_install: debug_install-am + +profile-am: + +profile: profile-am + +profile_install-am: + +profile_install: profile_install-am + +.PHONY: debug debug_install profile profile_install + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/c/src/exec/score/tools/generic/configure.in b/c/src/exec/score/tools/generic/configure.in index 9877ceabc3..7e144ad375 100644 --- a/c/src/exec/score/tools/generic/configure.in +++ b/c/src/exec/score/tools/generic/configure.in @@ -1,3 +1,7 @@ +dnl Process this file with autoconf to produce a configure script. +dnl +dnl $Id$ + AC_INIT(size_rtems.in) AC_CONFIG_AUX_DIR(../../../../../..) diff --git a/c/src/exec/score/tools/hppa1.1/configure.in b/c/src/exec/score/tools/hppa1.1/configure.in index c846bc5a11..c361bf10bc 100644 --- a/c/src/exec/score/tools/hppa1.1/configure.in +++ b/c/src/exec/score/tools/hppa1.1/configure.in @@ -1,3 +1,7 @@ +dnl Process this file with autoconf to produce a configure script. +dnl +dnl $Id$ + AC_INIT(genoffsets.c) AC_CONFIG_AUX_DIR(../../../../../..) diff --git a/c/src/exec/score/tools/sh/configure.in b/c/src/exec/score/tools/sh/configure.in index 6ff5bb3e22..a93a660603 100644 --- a/c/src/exec/score/tools/sh/configure.in +++ b/c/src/exec/score/tools/sh/configure.in @@ -1,3 +1,7 @@ +dnl Process this file with autoconf to produce a configure script. +dnl +dnl $Id$ + AC_INIT(shgen.c) AC_CONFIG_AUX_DIR(../../../../../..) diff --git a/c/src/exec/score/tools/unix/configure.in b/c/src/exec/score/tools/unix/configure.in index 19b8b548f0..302364be14 100644 --- a/c/src/exec/score/tools/unix/configure.in +++ b/c/src/exec/score/tools/unix/configure.in @@ -1,3 +1,7 @@ +dnl Process this file with autoconf to produce a configure script. +dnl +dnl $Id$ + AC_INIT(gensize.c) AC_CONFIG_AUX_DIR(../../../../../..) -- cgit v1.2.3