summaryrefslogtreecommitdiffstats
path: root/tools/cpu
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-03-19 22:27:02 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-03-19 22:27:02 +0000
commitd8ff79366bb0f4646436e4c298e4f5505a51c007 (patch)
tree7b69d0627eca83ab40473a31ad3568ea0bbfb996 /tools/cpu
parent5906ac5e9fa9581a813fc9e802dd06b6e3736b4a (diff)
downloadrtems-d8ff79366bb0f4646436e4c298e4f5505a51c007.tar.bz2
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.
Diffstat (limited to 'tools/cpu')
-rw-r--r--tools/cpu/Makefile.in15
-rw-r--r--tools/cpu/generic/Makefile.in16
-rw-r--r--tools/cpu/sh/Makefile.in15
-rw-r--r--tools/cpu/unix/Makefile.in15
4 files changed, 48 insertions, 13 deletions
diff --git a/tools/cpu/Makefile.in b/tools/cpu/Makefile.in
index 72d96812df..c8d387af9f 100644
--- a/tools/cpu/Makefile.in
+++ b/tools/cpu/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/score/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=generic $(wildcard $(RTEMS_CPU))
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/tools/cpu/generic/Makefile.in b/tools/cpu/generic/Makefile.in
index d81dfe5ffa..9710c36d06 100644
--- a/tools/cpu/generic/Makefile.in
+++ b/tools/cpu/generic/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/src/exec/score/tools/generic
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)/bin
@@ -36,3 +40,7 @@ $(INSTALLED_PGMS): $(PGMS)
$(INSTALL) $(INSTBINFLAGS) $^ $@
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/cpu/sh/Makefile.in b/tools/cpu/sh/Makefile.in
index 75537ef4ca..93fe29cfcf 100644
--- a/tools/cpu/sh/Makefile.in
+++ b/tools/cpu/sh/Makefile.in
@@ -6,12 +6,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/score/tools/sh
INSTALL = @INSTALL@
+RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+VPATH = @srcdir@
+
# we use the host compiler here
USE_HOST_COMPILER=yes
@@ -62,3 +67,7 @@ $(DESTDIR):
# Install the program
install: $(DESTDIR) $(PGMS)
$(INSTALL) $(INSTBINFLAGS) ${PGMS} $(DESTDIR)
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/tools/cpu/unix/Makefile.in b/tools/cpu/unix/Makefile.in
index 75320594ea..e1098093b0 100644
--- a/tools/cpu/unix/Makefile.in
+++ b/tools/cpu/unix/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/score/tools/unix
INSTALL = @INSTALL@
+RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+VPATH = @srcdir@
+
# we use host compiler here for gensize. Hopefully it has same alignment!!
USE_HOST_COMPILER=yes
@@ -58,3 +63,7 @@ preinstall: ${ARCH} $(SRCS) $(PGMS)
# Install the program(s), appending _g or _p as appropriate.
# for include files, just use $(INSTALL_CHANGE)
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status