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.

14 files changed, 168 insertions, 42 deletions

diff --git a/c/src/exec/posix/Makefile.in b/c/src/exec/posix/Makefile.in
index 8dbcd5a604..bd357698a3 100644
--- a/c/src/exec/posix/Makefile.in
+++ b/c/src/exec/posix/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/src/exec/posix
 
 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=include $(INLINE) optman src
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/posix/include/Makefile.in b/c/src/exec/posix/include/Makefile.in
index 8ec7121c04..d3dcca3b83 100644
--- a/c/src/exec/posix/include/Makefile.in
+++ b/c/src/exec/posix/include/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/src/exec/posix/include
 
 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=wrap rtems sys
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/posix/include/rtems/Makefile.in b/c/src/exec/posix/include/rtems/Makefile.in
index 7b24505fad..7f05656517 100644
--- a/c/src/exec/posix/include/rtems/Makefile.in
+++ b/c/src/exec/posix/include/rtems/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/src/exec/posix/include/rtems
 
 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=posix
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/posix/include/rtems/posix/Makefile.in b/c/src/exec/posix/include/rtems/posix/Makefile.in
index bbbbc04e9b..de1dc3d0ef 100644
--- a/c/src/exec/posix/include/rtems/posix/Makefile.in
+++ b/c/src/exec/posix/include/rtems/posix/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/src/exec/posix/include/rtems/posix
 
 INSTALL = @INSTALL@
 
+RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+VPATH = @srcdir@
+
 # We only build multiprocessing related files if HAS_MP was defined
 MP_PIECES_yes_V = condmp mutexmp pthreadmp 
 MP_PIECES = $(MP_PIECES_$(HAS_MP)_V)
@@ -38,3 +43,7 @@ CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
 	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/posix
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/posix/include/sys/Makefile.in b/c/src/exec/posix/include/sys/Makefile.in
index ab24bd9238..3a5dc8a0d3 100644
--- a/c/src/exec/posix/include/sys/Makefile.in
+++ b/c/src/exec/posix/include/sys/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/src/exec/posix/include/sys
 
 INSTALL = @INSTALL@
 
+RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+VPATH = @srcdir@
+
 #H_PIECES=utsname
 H_PIECES=utime 
 H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
@@ -31,3 +36,7 @@ CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
 	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/sys
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/posix/include/wrap/Makefile.in b/c/src/exec/posix/include/wrap/Makefile.in
index 707b0991b4..b64bf85b3d 100644
--- a/c/src/exec/posix/include/wrap/Makefile.in
+++ b/c/src/exec/posix/include/wrap/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/src/exec/posix/include/wrap
 
 INSTALL = @INSTALL@
 
+RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+VPATH = @srcdir@
+
 #H_PIECES= aio devctl intr limits mqueue pthread sched semaphore \
 #    signal time unistd
 H_PIECES= pthread sched
@@ -34,3 +39,7 @@ CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
 	$(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE)
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/posix/inline/Makefile.in b/c/src/exec/posix/inline/Makefile.in
index 5f7a328220..5392dd2d3e 100644
--- a/c/src/exec/posix/inline/Makefile.in
+++ b/c/src/exec/posix/inline/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/src/exec/posix/inline
 
 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=rtems
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/posix/inline/rtems/Makefile.in b/c/src/exec/posix/inline/rtems/Makefile.in
index 7b24505fad..9741818689 100644
--- a/c/src/exec/posix/inline/rtems/Makefile.in
+++ b/c/src/exec/posix/inline/rtems/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/src/exec/posix/inline/rtems
 
 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=posix
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/posix/inline/rtems/posix/Makefile.in b/c/src/exec/posix/inline/rtems/posix/Makefile.in
index 73a2c7fdf3..643d53402e 100644
--- a/c/src/exec/posix/inline/rtems/posix/Makefile.in
+++ b/c/src/exec/posix/inline/rtems/posix/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/src/exec/posix/inline/rtems/posix
 
 INSTALL = @INSTALL@
 
+RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+VPATH = @srcdir@
+
 #I_PIECES= cond intr key mqueue mutex pthread priority semaphore
 I_PIECES=cond key mutex pthread priority
 I_FILES=$(I_PIECES:%=$(srcdir)/%.inl)
@@ -31,3 +36,7 @@ CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
 	$(INSTALL_CHANGE) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/posix
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/posix/macros/Makefile.in b/c/src/exec/posix/macros/Makefile.in
index 5f7a328220..75700f7ee0 100644
--- a/c/src/exec/posix/macros/Makefile.in
+++ b/c/src/exec/posix/macros/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/src/exec/posix/macros
 
 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=rtems
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/posix/macros/rtems/Makefile.in b/c/src/exec/posix/macros/rtems/Makefile.in
index 7b24505fad..645120135c 100644
--- a/c/src/exec/posix/macros/rtems/Makefile.in
+++ b/c/src/exec/posix/macros/rtems/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/src/exec/posix/macros/rtems
 
 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=posix
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/posix/macros/rtems/posix/Makefile.in b/c/src/exec/posix/macros/rtems/posix/Makefile.in
index 39978d4c96..e2cc01c726 100644
--- a/c/src/exec/posix/macros/rtems/posix/Makefile.in
+++ b/c/src/exec/posix/macros/rtems/posix/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/src/exec/posix/macros/rtems/posix
 
 INSTALL = @INSTALL@
 
+RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+VPATH = @srcdir@
+
 # Right now there are not macro implementation of the posix inline routines
 # So it won't build
 I_PIECES= 
@@ -32,3 +37,7 @@ CLOBBER_ADDITIONS +=
 
 all:	$(SRCS)
 	#$(INSTALL_CHANGE) -m 444 ${I_FILES} $(PROJECT_INCLUDE)/rtems/posix
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/posix/optman/Makefile.in b/c/src/exec/posix/optman/Makefile.in
index 8b27002878..2e0146e179 100644
--- a/c/src/exec/posix/optman/Makefile.in
+++ b/c/src/exec/posix/optman/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/src/exec/posix/optman
 
 INSTALL = @INSTALL@
 
+RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+VPATH = @srcdir@
+
 C_FILES= 
 
 H_FILES=
@@ -47,3 +52,7 @@ CLOBBER_ADDITIONS +=
 
 all:	${ARCH} $(SRCS) $(OBJS) $(PGMS)
 	#$(INSTALL_VARIANT) -m 555 ${PGMS} ${PROJECT_RELEASE}/lib
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/posix/src/Makefile.in b/c/src/exec/posix/src/Makefile.in
index f6d019ffe6..1b4357463b 100644
--- a/c/src/exec/posix/src/Makefile.in
+++ b/c/src/exec/posix/src/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/src/exec/posix/src
 
 INSTALL = @INSTALL@
 
+RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+VPATH = @srcdir@
+
 # following are semi-implemented and untested
 # C_PIECES=aio cancel devctl intr mqueue semaphore time utsname
 
@@ -78,3 +83,7 @@ not:
 	@echo
 	@echo `grep -i NOT_IMPL $(C_FILES) | grep -v MP_NOT_IMPL | wc -l ` places marked not implemented
 	@echo `wc -l $(C_FILES) | grep total` lines of C code to test
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status