diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-02-18 18:36:05 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-02-18 18:36:05 +0000 |
commit | 8548fe0ae29eafea856090e742c1fd205ed4b0fb (patch) | |
tree | b0f3515dadfdea2a2e12a587ea5a2adaab2229db /c/src/tests/samples | |
parent | Part of the automake VI patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>: (diff) | |
download | rtems-8548fe0ae29eafea856090e742c1fd205ed4b0fb.tar.bz2 |
Part of the automake VI patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:
> 5) rtems-rc-19990202-1.diff/reorg-install.sh
>
> reorg-install.sh fixes a Makefile variable name clash of RTEMS
> configuration files and automake/autoconf standards.
> Until now, RTEMS used $(INSTALL) for install-if-change. Automake and
> autoconf use $(INSTALL) for a bsd-compatible install. As
> install-if-change and bsd-install are not compatible, I renamed all
> references to install-if-changed to $(INSTALL_CHANGED) and used
> $(INSTALL) for bsd-install (==automake/autoconf standard). When
> automake will be introduced install-if-change will probably be replaced
> by $(INSTALL) and therefore will slowly vanish. For the moment, this
> patch fixes a very nasty problem which prevents adding any automake file
> until now (There are still more).
Diffstat (limited to 'c/src/tests/samples')
-rw-r--r-- | c/src/tests/samples/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/tests/samples/base_mp/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/tests/samples/base_mp/node1/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/tests/samples/base_mp/node2/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/tests/samples/base_sp/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/tests/samples/cdtest/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/tests/samples/hello/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/tests/samples/paranoia/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/tests/samples/ticker/Makefile.in | 2 |
9 files changed, 18 insertions, 0 deletions
diff --git a/c/src/tests/samples/Makefile.in b/c/src/tests/samples/Makefile.in index a76b6478f7..8f8397fef4 100644 --- a/c/src/tests/samples/Makefile.in +++ b/c/src/tests/samples/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/directory.cfg diff --git a/c/src/tests/samples/base_mp/Makefile.in b/c/src/tests/samples/base_mp/Makefile.in index 9090167761..3cd108ecfb 100644 --- a/c/src/tests/samples/base_mp/Makefile.in +++ b/c/src/tests/samples/base_mp/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/directory.cfg diff --git a/c/src/tests/samples/base_mp/node1/Makefile.in b/c/src/tests/samples/base_mp/node1/Makefile.in index c0f6a761b5..55792471c8 100644 --- a/c/src/tests/samples/base_mp/node1/Makefile.in +++ b/c/src/tests/samples/base_mp/node1/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@:@srcdir@/.. RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + NODE=1 SAMPLE=base_mp PGM=${ARCH}/$(SAMPLE)-node$(NODE).exe diff --git a/c/src/tests/samples/base_mp/node2/Makefile.in b/c/src/tests/samples/base_mp/node2/Makefile.in index 67c98aeeef..3df7ea1014 100644 --- a/c/src/tests/samples/base_mp/node2/Makefile.in +++ b/c/src/tests/samples/base_mp/node2/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@:@srcdir@/.. RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + NODE=2 SAMPLE=base_mp PGM=${ARCH}/$(SAMPLE)-node$(NODE).exe diff --git a/c/src/tests/samples/base_sp/Makefile.in b/c/src/tests/samples/base_sp/Makefile.in index 50630816f4..fd16719911 100644 --- a/c/src/tests/samples/base_sp/Makefile.in +++ b/c/src/tests/samples/base_sp/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + SAMPLE=base_sp PGM=${ARCH}/$(SAMPLE).exe diff --git a/c/src/tests/samples/cdtest/Makefile.in b/c/src/tests/samples/cdtest/Makefile.in index f8619da48c..ae53a575f6 100644 --- a/c/src/tests/samples/cdtest/Makefile.in +++ b/c/src/tests/samples/cdtest/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + SAMPLE=cdtest PGM=${ARCH}/$(SAMPLE).exe diff --git a/c/src/tests/samples/hello/Makefile.in b/c/src/tests/samples/hello/Makefile.in index f556dd49e3..e839e9d3dd 100644 --- a/c/src/tests/samples/hello/Makefile.in +++ b/c/src/tests/samples/hello/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + SAMPLE=hello PGM=${ARCH}/$(SAMPLE).exe diff --git a/c/src/tests/samples/paranoia/Makefile.in b/c/src/tests/samples/paranoia/Makefile.in index 907d4aeefe..e65ad966dc 100644 --- a/c/src/tests/samples/paranoia/Makefile.in +++ b/c/src/tests/samples/paranoia/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + SAMPLE=paranoia PGM=${ARCH}/$(SAMPLE).exe diff --git a/c/src/tests/samples/ticker/Makefile.in b/c/src/tests/samples/ticker/Makefile.in index 2a37a918a9..3910ce175c 100644 --- a/c/src/tests/samples/ticker/Makefile.in +++ b/c/src/tests/samples/ticker/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + SAMPLE=ticker PGM=${ARCH}/$(SAMPLE).exe |