From d8ff79366bb0f4646436e4c298e4f5505a51c007 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 19 Mar 1999 22:27:02 +0000 Subject: Towards automake XI patch from Ralf Corsepius : 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 patch -p1 -E < /rtems-rc-19990318-1.diff tar xzvf /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. --- c/src/tests/samples/Makefile.in | 16 +++++++++++----- c/src/tests/samples/base_mp/Makefile.in | 15 ++++++++++++--- c/src/tests/samples/base_mp/node1/Makefile.in | 15 ++++++++++++--- c/src/tests/samples/base_mp/node2/Makefile.in | 15 ++++++++++++--- c/src/tests/samples/base_sp/Makefile.in | 14 +++++++++++--- c/src/tests/samples/cdtest/Makefile.in | 15 ++++++++++++--- c/src/tests/samples/hello/Makefile.in | 15 ++++++++++++--- c/src/tests/samples/paranoia/Makefile.in | 15 ++++++++++++--- c/src/tests/samples/ticker/Makefile.in | 15 ++++++++++++--- c/src/tests/samples/unlimited/Makefile.in | 15 +++++++++++++-- 10 files changed, 119 insertions(+), 31 deletions(-) (limited to 'c/src/tests/samples') diff --git a/c/src/tests/samples/Makefile.in b/c/src/tests/samples/Makefile.in index 463ff7e710..afbd53cc2b 100644 --- a/c/src/tests/samples/Makefile.in +++ b/c/src/tests/samples/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/tests/samples 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 @@ -30,5 +35,6 @@ FP_TESTS = paranoia SUB_DIRS=hello ticker base_sp unlimited \ $(MP_TESTS) $(CPLUSPLUS_TESTS) $(FP_TESTS) - - +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/tests/samples/base_mp/Makefile.in b/c/src/tests/samples/base_mp/Makefile.in index 3cd108ecfb..46748a57c7 100644 --- a/c/src/tests/samples/base_mp/Makefile.in +++ b/c/src/tests/samples/base_mp/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/tests/samples/base_mp 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=node1 node2 + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/tests/samples/base_mp/node1/Makefile.in b/c/src/tests/samples/base_mp/node1/Makefile.in index 55792471c8..9ed5818f61 100644 --- a/c/src/tests/samples/base_mp/node1/Makefile.in +++ b/c/src/tests/samples/base_mp/node1/Makefile.in @@ -4,12 +4,17 @@ @SET_MAKE@ srcdir = @srcdir@ -VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @top_srcdir@ -PROJECT_ROOT = @PROJECT_ROOT@ +top_srcdir = @top_srcdir@ +top_builddir = ../../../../../.. +subdir = c/src/tests/samples/base_mp/node1 INSTALL = @INSTALL@ +RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +PROJECT_ROOT = @PROJECT_ROOT@ + +VPATH = @srcdir@:@srcdir@/.. + NODE=1 SAMPLE=base_mp PGM=${ARCH}/$(SAMPLE)-node$(NODE).exe @@ -62,3 +67,7 @@ all: ${ARCH} $(SRCS) $(PGM) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/tests/samples/base_mp/node2/Makefile.in b/c/src/tests/samples/base_mp/node2/Makefile.in index 3df7ea1014..785983b9c6 100644 --- a/c/src/tests/samples/base_mp/node2/Makefile.in +++ b/c/src/tests/samples/base_mp/node2/Makefile.in @@ -4,12 +4,17 @@ @SET_MAKE@ srcdir = @srcdir@ -VPATH = @srcdir@:@srcdir@/.. -RTEMS_ROOT = @top_srcdir@ -PROJECT_ROOT = @PROJECT_ROOT@ +top_srcdir = @top_srcdir@ +top_builddir = ../../../../../.. +subdir = c/src/tests/samples/base_mp/node2 INSTALL = @INSTALL@ +RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +PROJECT_ROOT = @PROJECT_ROOT@ + +VPATH = @srcdir@:@srcdir@/.. + NODE=2 SAMPLE=base_mp PGM=${ARCH}/$(SAMPLE)-node$(NODE).exe @@ -62,3 +67,7 @@ all: ${ARCH} $(SRCS) $(PGM) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/tests/samples/base_sp/Makefile.in b/c/src/tests/samples/base_sp/Makefile.in index fd16719911..6652fa0d23 100644 --- a/c/src/tests/samples/base_sp/Makefile.in +++ b/c/src/tests/samples/base_sp/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/tests/samples/base_sp INSTALL = @INSTALL@ +RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +PROJECT_ROOT = @PROJECT_ROOT@ + +VPATH = @srcdir@ + SAMPLE=base_sp PGM=${ARCH}/$(SAMPLE).exe @@ -62,3 +67,6 @@ all: ${ARCH} $(SRCS) $(PGM) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/tests/samples/cdtest/Makefile.in b/c/src/tests/samples/cdtest/Makefile.in index ae53a575f6..b5d7645182 100644 --- a/c/src/tests/samples/cdtest/Makefile.in +++ b/c/src/tests/samples/cdtest/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/tests/samples/cdtest INSTALL = @INSTALL@ +RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +PROJECT_ROOT = @PROJECT_ROOT@ + +VPATH = @srcdir@ + SAMPLE=cdtest PGM=${ARCH}/$(SAMPLE).exe @@ -67,3 +72,7 @@ all: ${ARCH} $(SRCS) $(PGM) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/tests/samples/hello/Makefile.in b/c/src/tests/samples/hello/Makefile.in index e839e9d3dd..0c36bd4e76 100644 --- a/c/src/tests/samples/hello/Makefile.in +++ b/c/src/tests/samples/hello/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/tests/samples/hello INSTALL = @INSTALL@ +RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +PROJECT_ROOT = @PROJECT_ROOT@ + +VPATH = @srcdir@ + SAMPLE=hello PGM=${ARCH}/$(SAMPLE).exe @@ -63,3 +68,7 @@ all: ${ARCH} $(SRCS) $(PGM) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/tests/samples/paranoia/Makefile.in b/c/src/tests/samples/paranoia/Makefile.in index e65ad966dc..d8aab5af92 100644 --- a/c/src/tests/samples/paranoia/Makefile.in +++ b/c/src/tests/samples/paranoia/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/tests/samples/paranoia INSTALL = @INSTALL@ +RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +PROJECT_ROOT = @PROJECT_ROOT@ + +VPATH = @srcdir@ + SAMPLE=paranoia PGM=${ARCH}/$(SAMPLE).exe @@ -65,3 +70,7 @@ all: ${ARCH} $(SRCS) $(PGM) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/tests/samples/ticker/Makefile.in b/c/src/tests/samples/ticker/Makefile.in index 3910ce175c..d0f396273b 100644 --- a/c/src/tests/samples/ticker/Makefile.in +++ b/c/src/tests/samples/ticker/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/tests/samples/ticker INSTALL = @INSTALL@ +RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ +PROJECT_ROOT = @PROJECT_ROOT@ + +VPATH = @srcdir@ + SAMPLE=ticker PGM=${ARCH}/$(SAMPLE).exe @@ -63,3 +68,7 @@ all: ${ARCH} $(SRCS) $(PGM) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/tests/samples/unlimited/Makefile.in b/c/src/tests/samples/unlimited/Makefile.in index a02f61f64f..d7f2251520 100644 --- a/c/src/tests/samples/unlimited/Makefile.in +++ b/c/src/tests/samples/unlimited/Makefile.in @@ -4,10 +4,17 @@ @SET_MAKE@ srcdir = @srcdir@ -VPATH = @srcdir@ -RTEMS_ROOT = @top_srcdir@ +top_srcdir = @top_srcdir@ +top_builddir = ../../../../.. +subdir = c/src/tests/samples/unlimited + +INSTALL = @INSTALL@ + +RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@ PROJECT_ROOT = @PROJECT_ROOT@ +VPATH = @srcdir@ + SAMPLE=unlimited PGM=${ARCH}/$(SAMPLE).exe @@ -61,3 +68,7 @@ all: ${ARCH} $(SRCS) $(PGM) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -- cgit v1.2.3