Towards automake XI patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:

    This patch is the most scary of all proposals I've been mailing to you
    this week until now.

    It consists of 3 parts:
        1. a patch
        2. a perl script (acpolish)
        3. a shell script wrapper to invoke the perl-script.

    The perl-script reads in each Makefile.in and modifies them
    ("polishes/beautifies" them :-).

    These modifications are not easy to describe:

    Basically, it hard-codes some automake Makefile-variables and rules into
    RTEMS autoconf-Makefile.ins (Note: autoconf vs. automake!!) and converts
    some settings/variables to configure scripts' requirements (Yes,
    plural).

    E.g. it adds the automake standard variables $top_builddir and $subdir,
    adds dependency rules for automatic re-generation of Makefiles from
    Makefile.in, adds support variables for relative paths to multiple
    configure scripts etc.


    The patch is a one-line patch to enable the support of the new features
    added by acpolish.

    The shell script is a wrapper which pokes around inside of the source
    tree for Makefile.ins and invokes acpolish on all autoconf-Makefile.ins.

    acpolish is designed to be able to run several times on the same
    Makefile.in and may once become a more general tool to convert RTEMS
    Makefile.in to automake. Therefore, I'd like to keep it inside of source
    tree. (e.g. as contrib/acpolish or c/update-tools/acpolish). However, it
    doesn't make sense to export it outside of RTEMS.


To apply this:

    cd <source-tree>
    patch -p1 -E < <path-to-patch>/rtems-rc-19990318-1.diff
    tar xzvf <path-to>/rtems-rc-polish.tar.gz
    ./rtems-polish.sh
    ./autogen

    Note: The path contrib/acpolish is hard-coded into rtems-polish.sh, if
    you decide to put it in an alternative place, please modify
    rtems-polish.sh to reflect this change.

    Later:
    cvs rm make/rtems.cfg (It isn't used anymore)
    cvs add contrib
    cvs add contrib/acpolish
    cvs commit

    I've tested this intensively, but naturally I can't exclude bugs.

    Ralf.

    PS.: Most probably, this is the last "Towards automake" patch. The next
    one probably will be a real automake patch.

5 files changed, 60 insertions, 17 deletions

diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in
index e58758025b..e72c35c79e 100644
--- a/tools/build/Makefile.in
+++ b/tools/build/Makefile.in
@@ -4,13 +4,22 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+subdir = c/build-tools
 
 INSTALL = @INSTALL@
 
+RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+VPATH = @srcdir@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 SUB_DIRS=os scripts src 
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/tools/build/os/Makefile.in b/tools/build/os/Makefile.in
index 884a8c9b9e..86e2497722 100644
--- a/tools/build/os/Makefile.in
+++ b/tools/build/os/Makefile.in
@@ -4,13 +4,22 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
+top_srcdir = @top_srcdir@
+top_builddir = ../../..
+subdir = c/build-tools/os
 
 INSTALL = @INSTALL@
 
+RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+VPATH = @srcdir@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 SUB_DIRS=$(wildcard $(RTEMS_HOST))
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/tools/build/os/msdos/Makefile.in b/tools/build/os/msdos/Makefile.in
index bcd523fb64..022d2e5df2 100644
--- a/tools/build/os/msdos/Makefile.in
+++ b/tools/build/os/msdos/Makefile.in
@@ -4,12 +4,17 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
+top_srcdir = @top_srcdir@
+top_builddir = ../../../..
+subdir = c/build-tools/os/msdos
 
 INSTALL = @INSTALL@
 
+RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+VPATH = @srcdir@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
@@ -39,3 +44,6 @@ $(DESTDIR)/fixtimer.exe: fixtimer.uue
 	uudecode <fixtimer.uue
 	mv fixtimer.exe $(DESTDIR)/fixtimer.exe
 
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/tools/build/scripts/Makefile.in b/tools/build/scripts/Makefile.in
index eaf1dd397f..0cf29845f4 100644
--- a/tools/build/scripts/Makefile.in
+++ b/tools/build/scripts/Makefile.in
@@ -8,15 +8,19 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
+top_srcdir = @top_srcdir@
+top_builddir = ../../..
+subdir = c/build-tools/scripts
 
 INSTALL = @INSTALL@
 
+RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+VPATH = @srcdir@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
-include $(RTEMS_ROOT)/make/rtems.cfg
 
 DESTDIR=$(PROJECT_RELEASE)/build-tools
 
@@ -36,3 +40,7 @@ $(INSTALLED_PGMS): $(PGMS)
 	$(INSTALL) $(INSTBINFLAGS) $^ $(DESTDIR)
 
 install:  $(DESTDIR) $(INSTALLED_PGMS)
+
+%: $(srcdir)/%.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/tools/build/src/Makefile.in b/tools/build/src/Makefile.in
index 415017a9aa..40558baec3 100644
--- a/tools/build/src/Makefile.in
+++ b/tools/build/src/Makefile.in
@@ -4,6 +4,15 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+top_builddir = ../../..
+subdir = c/build-tools/src
+
+INSTALL = @INSTALL@
+
+RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
 exec_prefix = @exec_prefix@
 bindir = @bindir@
 libdir = @libdir@
@@ -16,10 +25,6 @@ mandir = @mandir@/man$(manext)
 EXEEXT=@EXEEXT@
 
 VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-INSTALL = @INSTALL@
 
 # we use host compiler in this directory
 USE_HOST_COMPILER=yes
@@ -70,3 +75,7 @@ $(DESTDIR):
 
 all:	$(ARCH) $(DESTDIR) $(SRCS) $(PGMS)
 	$(INSTALL) $(INSTBINFLAGS) $(PGMS) $(DESTDIR)
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status