Automake II patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>. Email

description follows:

Description:

    * automake for *all* tool subdirectories (Makefile.am, configure.in etc.)
    * autogen now also considers CONFIG_HEADER (generates stamp-h.ins and
      config.h.ins)
    * c/src/tests/tools/generic/difftest and
      c/src/tests/tools/generic/sorttimes generated by configure scripts
    * c/update-tools/ampolish, beautifier for Makefile.ams, similar to
      acpolish
    * rtems-polish.sh added to c/update-tools/ + ampolish support
    * New subdirectory ./automake, contains automake -Makefile fragments to
      support RTEMS make "debug, debug_install, profile, profile_install" for
      native Makefile.ams (== ignore these make targets).
    * aclocal/rtems-top.m4's RTEMS_TOP now reads the automake makefile
      variable VERSION from RTEMS ./VERSION file.
    * ./configure.in uses the macros from aclocal + support for the tools'
      configure scripts

  Remarks:
    * To run rtems-polish.sh, "cd <rtems-source-tree>;
      ./c/update-tools/rtems-polish.sh"
    * AFAIS, now all native subdirectories are converted to automake (Please
      drop me a note, if I forgot something).
    * Unless you notice something fatal, IMO the time has come for a public
      try (== snapshot). I do not intend to send more automake related patches
      within, say 2 weeks, to give these patches time to settle and to give me
      some time to think on how to continue.
    * The patch assumes installation to the new main installation directory
      [$(prefix)].

2 files changed, 29 insertions, 2 deletions

diff --git a/tools/build/src/Makefile.am b/tools/build/src/Makefile.am
index 2a00eb73b5..dcb7062295 100644
--- a/tools/build/src/Makefile.am
+++ b/tools/build/src/Makefile.am
@@ -20,3 +20,5 @@ install-exec-local: $(bin_PROGRAMS)
 	  $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools
 
 preinstall: install-exec-local
+
+include $(top_srcdir)/../../automake/local.am
diff --git a/tools/build/src/Makefile.in b/tools/build/src/Makefile.in
index 24f71df961..a63d34c8ba 100644
--- a/tools/build/src/Makefile.in
+++ b/tools/build/src/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@
@@ -69,7 +77,6 @@ KSH = @KSH@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_ROOT = @RTEMS_ROOT@
 RTEMS_TOPdir = @RTEMS_TOPdir@
 VERSION = @VERSION@
 
@@ -128,7 +135,7 @@ OBJECTS = $(cklength_OBJECTS) $(eolstrip_OBJECTS) $(packhex_OBJECTS) $(unhex_OBJ
 all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .o .s
-$(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 src/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
@@ -392,6 +399,24 @@ install-exec-local: $(bin_PROGRAMS)
 
 preinstall: install-exec-local
 
+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: