diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-02-25 15:03:10 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-02-25 15:03:10 +0000 |
| commit | 99eb5852f53bb940a8004c5197159199b22d0d39 (patch) | |
| tree | f877349407b2e0e1b59fca786a0b37e1caf0b5c2 | |
| parent | Patches rtems-rc-4.5.0-1.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-99eb5852f53bb940a8004c5197159199b22d0d39.tar.bz2 | |
Patches rtems-rc-4.5.0-1.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>
that fixes numerous miscellaneous issues most related to the debug and
profile build stanzas:
Fix for the "make debug" (1) issue and an analogous issue with "make
profile" (untested).
* Fixes to mcp750.cfg (make debug, directories) (2)
* Updates/minor fixes for shgen (3)
* Updates some custom/*.cfgs to use $(LINK.c) instead of $(CC)
* Leftovers from rtems-rc-4.5.0-[0|1].diff which somehow did not make it
into cvs.
* Cleanups to the perlscripts below tools/update/
* Some unsorted minor fixes.
Footnotes/Remarks:
(1) Tested for all m68k, sh, sparc, unix and selected i386, ppc BSPs.
Known problems: I can't build the debug variant for the m68k/mvme162 and
m68k/mvme162lx (segmentation fault - signal 11 :)
(2) Tested by building the BSP, but I doubt the debug-variant is
functional. The flags used for the debug variant should be checked by
knowledgeable persons and probably at runtime #:o)
(3) I have updated shgen to use getopt_long (it should fall back to
getopt if not available), enhanced the options, cleaned up some minor
tweaks and added help2man support (rough automatic man-page generation).
Technical notes:
* make debug and make profile now work similar in target Makefile.ams as
they did in old autoconf-Makefile.ins using leaf.cfg. Unlike the rules
in leaf.cfg these Makefile.am also recurse once on themselves in
directory Makefiles before or after recursing into subdirectories, not
only in leaf-directories.
To implement this behavior, I renamed the former automake/local.am into
automake/host.am and extended local.am to provide this recursion.
I.e. host.am implements the non-self-recursive variant, while local.am
now implements the self-recursive behavior.
=> all Makefile.ams exploiting build-variants are supposed to include
local.am
=> all Makefile.ams not exploiting build-variants should include host.am
=> Rules of thumb:
- Only include one of both, either local.am or host.am into a
Makefile.am.
-Target-Makefile.ams should include local.am
-Host-Makefile.ams should include host.am (Probably, you now understand
the naming)
- There are exceptions from these rules :)
* Now, make debug|profile|all are independent of each other. However,
each of them however triggers preinstall.
* "make install" still decends into the subdirectories but does not
trigger "all|profile|debug|preinstall" in target Makefile.am anymore.
Besides triggering "install"-rules in some selected Makefile.ams, it
only packs $(PROJECT_ROOT) into a tarballs and unpacks it to $(prefix).
=> "make install" alone is not enough to install RTEMS, now use
make RTEMS_BSP=<bsps> [all] [debug] [profile]
make RTEMS_BSP=<bsp> install
I consider this to be a step back wrt. exploiting automake mechanisms,
and expect this to be reverted if we abandon building target variants in
favour of the standard convention of optionally overriding flags from
the command line (i.e. instead of "make debug", GNU standards favor
"make CFLAGS=<options> --prefix=<location>")
106 files changed, 240 insertions, 196 deletions
diff --git a/c/src/tests/psxtests/psxcancel/Makefile.am b/c/src/tests/psxtests/psxcancel/Makefile.am index cde45d8fff..83b3113e31 100644 --- a/c/src/tests/psxtests/psxcancel/Makefile.am +++ b/c/src/tests/psxtests/psxcancel/Makefile.am @@ -36,7 +36,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/psxtests/psxfile01/Makefile.am b/c/src/tests/psxtests/psxfile01/Makefile.am index 4cae479427..cc98f3d0bf 100644 --- a/c/src/tests/psxtests/psxfile01/Makefile.am +++ b/c/src/tests/psxtests/psxfile01/Makefile.am @@ -34,7 +34,7 @@ include $(top_srcdir)/psxtests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/psxtests/psxhdrs/Makefile.am b/c/src/tests/psxtests/psxhdrs/Makefile.am index 6233e205d2..2015c3561e 100644 --- a/c/src/tests/psxtests/psxhdrs/Makefile.am +++ b/c/src/tests/psxtests/psxhdrs/Makefile.am @@ -32,7 +32,7 @@ OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg -all-local: ${ARCH} ${OBJS} +all: ${ARCH} ${OBJS} EXTRA_DIST = $(C_FILES) diff --git a/c/src/tests/psxtests/psxmount/Makefile.am b/c/src/tests/psxtests/psxmount/Makefile.am index c50a43ae19..8bd8fa8601 100644 --- a/c/src/tests/psxtests/psxmount/Makefile.am +++ b/c/src/tests/psxtests/psxmount/Makefile.am @@ -31,7 +31,7 @@ include $(top_srcdir)/psxtests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/psxtests/psxmsgq01/Makefile.am b/c/src/tests/psxtests/psxmsgq01/Makefile.am index 0737b0b6e7..c4e16d425a 100644 --- a/c/src/tests/psxtests/psxmsgq01/Makefile.am +++ b/c/src/tests/psxtests/psxmsgq01/Makefile.am @@ -36,7 +36,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/psxtests/psxreaddir/Makefile.am b/c/src/tests/psxtests/psxreaddir/Makefile.am index 25c955b899..330a0b632b 100644 --- a/c/src/tests/psxtests/psxreaddir/Makefile.am +++ b/c/src/tests/psxtests/psxreaddir/Makefile.am @@ -31,7 +31,7 @@ include $(top_srcdir)/psxtests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/psxtests/psxsem01/Makefile.am b/c/src/tests/psxtests/psxsem01/Makefile.am index 59dba33b12..9b48d66b77 100644 --- a/c/src/tests/psxtests/psxsem01/Makefile.am +++ b/c/src/tests/psxtests/psxsem01/Makefile.am @@ -36,7 +36,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/psxtests/psxstat/Makefile.am b/c/src/tests/psxtests/psxstat/Makefile.am index 9c20ed100c..7eab4ba7df 100644 --- a/c/src/tests/psxtests/psxstat/Makefile.am +++ b/c/src/tests/psxtests/psxstat/Makefile.am @@ -31,7 +31,7 @@ include $(top_srcdir)/psxtests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/psxtests/psxtime/Makefile.am b/c/src/tests/psxtests/psxtime/Makefile.am index 66b8c88f11..8d8594a332 100644 --- a/c/src/tests/psxtests/psxtime/Makefile.am +++ b/c/src/tests/psxtests/psxtime/Makefile.am @@ -31,7 +31,7 @@ include $(top_srcdir)/psxtests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/psxtests/psxtimer/Makefile.am b/c/src/tests/psxtests/psxtimer/Makefile.am index 7498d8514d..1d03c664f7 100644 --- a/c/src/tests/psxtests/psxtimer/Makefile.am +++ b/c/src/tests/psxtests/psxtimer/Makefile.am @@ -36,7 +36,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/samples/base_mp/node1/Makefile.am b/c/src/tests/samples/base_mp/node1/Makefile.am index fdf0db6e15..c9716db7d0 100644 --- a/c/src/tests/samples/base_mp/node1/Makefile.am +++ b/c/src/tests/samples/base_mp/node1/Makefile.am @@ -40,9 +40,9 @@ AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I. ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) else -all-local: +all: endif EXTRA_DIST = $(DOCS) diff --git a/c/src/tests/samples/base_mp/node2/Makefile.am b/c/src/tests/samples/base_mp/node2/Makefile.am index acfe772653..e0404282ab 100644 --- a/c/src/tests/samples/base_mp/node2/Makefile.am +++ b/c/src/tests/samples/base_mp/node2/Makefile.am @@ -40,9 +40,9 @@ AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I. ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) else -all-local: +all: endif EXTRA_DIST = $(DOCS) diff --git a/c/src/tests/samples/base_sp/Makefile.am b/c/src/tests/samples/base_sp/Makefile.am index 2add0e0096..bd67234db7 100644 --- a/c/src/tests/samples/base_sp/Makefile.am +++ b/c/src/tests/samples/base_sp/Makefile.am @@ -31,7 +31,7 @@ include $(top_srcdir)/sample.am # (OPTIONAL) Add local stuff here using += # -all-local: ${ARCH} $(TMPINSTALL_FILES) +all: ${ARCH} $(TMPINSTALL_FILES) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/samples/cdtest/Makefile.am b/c/src/tests/samples/cdtest/Makefile.am index 0bdf792c92..0fd0c412b8 100644 --- a/c/src/tests/samples/cdtest/Makefile.am +++ b/c/src/tests/samples/cdtest/Makefile.am @@ -42,9 +42,9 @@ LD_LIBS += $(CPLUS_LD_LIBS) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: ${ARCH} $(TMPINSTALL_FILES) +all: ${ARCH} $(TMPINSTALL_FILES) else -all-local: +all: endif EXTRA_DIST = $(C_FILES) $(CC_FILES) $(DOCS) diff --git a/c/src/tests/samples/hello/Makefile.am b/c/src/tests/samples/hello/Makefile.am index 8f3ec339ab..3d0c031368 100644 --- a/c/src/tests/samples/hello/Makefile.am +++ b/c/src/tests/samples/hello/Makefile.am @@ -33,7 +33,7 @@ include $(top_srcdir)/sample.am # (OPTIONAL) Add local stuff here using += # -all-local: ${ARCH} $(TMPINSTALL_FILES) +all: ${ARCH} $(TMPINSTALL_FILES) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/samples/minimum/Makefile.am b/c/src/tests/samples/minimum/Makefile.am index 0ac5f1fe20..02b64d3be9 100644 --- a/c/src/tests/samples/minimum/Makefile.am +++ b/c/src/tests/samples/minimum/Makefile.am @@ -30,7 +30,7 @@ include $(top_srcdir)/sample.am # (OPTIONAL) Add local stuff here using += # -all-local: ${ARCH} $(TMPINSTALL_FILES) +all: ${ARCH} $(TMPINSTALL_FILES) # This test should not be executed ${PGM}: $(OBJS) $(LINK_FILES) diff --git a/c/src/tests/samples/paranoia/Makefile.am b/c/src/tests/samples/paranoia/Makefile.am index 6611f6efe5..660c367434 100644 --- a/c/src/tests/samples/paranoia/Makefile.am +++ b/c/src/tests/samples/paranoia/Makefile.am @@ -39,7 +39,7 @@ AM_CPPFLAGS += -DNOSIGNAL -DCYGNUS -DNOMAIN LD_LIBS += -lm -all-local: ${ARCH} $(TMPINSTALL_FILES) +all: ${ARCH} $(TMPINSTALL_FILES) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/samples/ticker/Makefile.am b/c/src/tests/samples/ticker/Makefile.am index 7c699ce03b..944bf9eace 100644 --- a/c/src/tests/samples/ticker/Makefile.am +++ b/c/src/tests/samples/ticker/Makefile.am @@ -33,7 +33,7 @@ include $(top_srcdir)/sample.am # (OPTIONAL) Add local stuff here using += # -all-local: ${ARCH} $(TMPINSTALL_FILES) +all: ${ARCH} $(TMPINSTALL_FILES) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/samples/unlimited/Makefile.am b/c/src/tests/samples/unlimited/Makefile.am index 32b865776d..33ecc50197 100644 --- a/c/src/tests/samples/unlimited/Makefile.am +++ b/c/src/tests/samples/unlimited/Makefile.am @@ -33,7 +33,7 @@ include $(top_srcdir)/sample.am # (OPTIONAL) Add local stuff here using += # -all-local: ${ARCH} $(TMPINSTALL_FILES) +all: ${ARCH} $(TMPINSTALL_FILES) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/sptests/sp01/Makefile.am b/c/src/tests/sptests/sp01/Makefile.am index 065e7bcc2b..b8ce8b44c0 100644 --- a/c/src/tests/sptests/sp01/Makefile.am +++ b/c/src/tests/sptests/sp01/Makefile.am @@ -31,7 +31,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/sp02/Makefile.am b/c/src/tests/sptests/sp02/Makefile.am index 174e249375..cd29fa48d9 100644 --- a/c/src/tests/sptests/sp02/Makefile.am +++ b/c/src/tests/sptests/sp02/Makefile.am @@ -31,7 +31,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/sp03/Makefile.am b/c/src/tests/sptests/sp03/Makefile.am index 8224948a64..f01e6a940a 100644 --- a/c/src/tests/sptests/sp03/Makefile.am +++ b/c/src/tests/sptests/sp03/Makefile.am @@ -31,7 +31,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/sp04/Makefile.am b/c/src/tests/sptests/sp04/Makefile.am index 925439b0e3..8431b31282 100644 --- a/c/src/tests/sptests/sp04/Makefile.am +++ b/c/src/tests/sptests/sp04/Makefile.am @@ -31,7 +31,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/sp05/Makefile.am b/c/src/tests/sptests/sp05/Makefile.am index 8e1d268e43..15e8b4fce8 100644 --- a/c/src/tests/sptests/sp05/Makefile.am +++ b/c/src/tests/sptests/sp05/Makefile.am @@ -31,7 +31,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/sp06/Makefile.am b/c/src/tests/sptests/sp06/Makefile.am index 92d63010ba..905f2046c1 100644 --- a/c/src/tests/sptests/sp06/Makefile.am +++ b/c/src/tests/sptests/sp06/Makefile.am @@ -31,7 +31,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/sp07/Makefile.am b/c/src/tests/sptests/sp07/Makefile.am index e61682c6b3..4dee952b4e 100644 --- a/c/src/tests/sptests/sp07/Makefile.am +++ b/c/src/tests/sptests/sp07/Makefile.am @@ -32,7 +32,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/sp08/Makefile.am b/c/src/tests/sptests/sp08/Makefile.am index f729b3ae59..5ac1ef81cf 100644 --- a/c/src/tests/sptests/sp08/Makefile.am +++ b/c/src/tests/sptests/sp08/Makefile.am @@ -31,7 +31,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/sp09/Makefile.am b/c/src/tests/sptests/sp09/Makefile.am index 095c8876f0..7433944ffe 100644 --- a/c/src/tests/sptests/sp09/Makefile.am +++ b/c/src/tests/sptests/sp09/Makefile.am @@ -35,7 +35,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/sp11/Makefile.am b/c/src/tests/sptests/sp11/Makefile.am index a2641d0e0d..d60a1ad6c5 100644 --- a/c/src/tests/sptests/sp11/Makefile.am +++ b/c/src/tests/sptests/sp11/Makefile.am @@ -31,7 +31,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/sp12/Makefile.am b/c/src/tests/sptests/sp12/Makefile.am index cd748472e5..a0d69c2fb5 100644 --- a/c/src/tests/sptests/sp12/Makefile.am +++ b/c/src/tests/sptests/sp12/Makefile.am @@ -31,7 +31,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/sp13/Makefile.am b/c/src/tests/sptests/sp13/Makefile.am index e5cd4b406b..04033b4ca0 100644 --- a/c/src/tests/sptests/sp13/Makefile.am +++ b/c/src/tests/sptests/sp13/Makefile.am @@ -31,7 +31,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/sp14/Makefile.am b/c/src/tests/sptests/sp14/Makefile.am index 223bb0e03e..a6cafc1528 100644 --- a/c/src/tests/sptests/sp14/Makefile.am +++ b/c/src/tests/sptests/sp14/Makefile.am @@ -31,7 +31,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/sp15/Makefile.am b/c/src/tests/sptests/sp15/Makefile.am index 453aad182f..76b03d6c17 100644 --- a/c/src/tests/sptests/sp15/Makefile.am +++ b/c/src/tests/sptests/sp15/Makefile.am @@ -31,7 +31,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/sp16/Makefile.am b/c/src/tests/sptests/sp16/Makefile.am index 87f9279f15..9ddee003f3 100644 --- a/c/src/tests/sptests/sp16/Makefile.am +++ b/c/src/tests/sptests/sp16/Makefile.am @@ -31,7 +31,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/sp17/Makefile.am b/c/src/tests/sptests/sp17/Makefile.am index d9697ea5a6..b5ef4f7bfc 100644 --- a/c/src/tests/sptests/sp17/Makefile.am +++ b/c/src/tests/sptests/sp17/Makefile.am @@ -31,7 +31,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/sp19/Makefile.am b/c/src/tests/sptests/sp19/Makefile.am index 45c43db672..cf955cb5c0 100644 --- a/c/src/tests/sptests/sp19/Makefile.am +++ b/c/src/tests/sptests/sp19/Makefile.am @@ -31,7 +31,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/sp20/Makefile.am b/c/src/tests/sptests/sp20/Makefile.am index 74db12b302..71275f3854 100644 --- a/c/src/tests/sptests/sp20/Makefile.am +++ b/c/src/tests/sptests/sp20/Makefile.am @@ -31,7 +31,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/sp21/Makefile.am b/c/src/tests/sptests/sp21/Makefile.am index 6d7cfa66c0..0c74850420 100644 --- a/c/src/tests/sptests/sp21/Makefile.am +++ b/c/src/tests/sptests/sp21/Makefile.am @@ -33,7 +33,7 @@ LD_LIBS += $(PROJECT_RELEASE)/lib/libtest$(LIBSUFFIX_VA) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/sp22/Makefile.am b/c/src/tests/sptests/sp22/Makefile.am index af0558eb24..a3c0c2a801 100644 --- a/c/src/tests/sptests/sp22/Makefile.am +++ b/c/src/tests/sptests/sp22/Makefile.am @@ -31,7 +31,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/sp23/Makefile.am b/c/src/tests/sptests/sp23/Makefile.am index 58d175b655..ada64e3e05 100644 --- a/c/src/tests/sptests/sp23/Makefile.am +++ b/c/src/tests/sptests/sp23/Makefile.am @@ -31,7 +31,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/sp24/Makefile.am b/c/src/tests/sptests/sp24/Makefile.am index a0b836b0f4..31cb3d122d 100644 --- a/c/src/tests/sptests/sp24/Makefile.am +++ b/c/src/tests/sptests/sp24/Makefile.am @@ -31,7 +31,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/sp25/Makefile.am b/c/src/tests/sptests/sp25/Makefile.am index a785691f09..36e252e973 100644 --- a/c/src/tests/sptests/sp25/Makefile.am +++ b/c/src/tests/sptests/sp25/Makefile.am @@ -31,7 +31,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/sp26/Makefile.am b/c/src/tests/sptests/sp26/Makefile.am index 754b94cef0..c38df2d90e 100644 --- a/c/src/tests/sptests/sp26/Makefile.am +++ b/c/src/tests/sptests/sp26/Makefile.am @@ -31,7 +31,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/sp27/Makefile.am b/c/src/tests/sptests/sp27/Makefile.am index 1cb20586dd..aa204fa7f9 100644 --- a/c/src/tests/sptests/sp27/Makefile.am +++ b/c/src/tests/sptests/sp27/Makefile.am @@ -28,7 +28,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/sp28/Makefile.am b/c/src/tests/sptests/sp28/Makefile.am index 5f966b4eb2..9f54eb8b5c 100644 --- a/c/src/tests/sptests/sp28/Makefile.am +++ b/c/src/tests/sptests/sp28/Makefile.am @@ -28,7 +28,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/sp29/Makefile.am b/c/src/tests/sptests/sp29/Makefile.am index e34dfda22c..fe5f868ad7 100644 --- a/c/src/tests/sptests/sp29/Makefile.am +++ b/c/src/tests/sptests/sp29/Makefile.am @@ -28,7 +28,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/spfatal/Makefile.am b/c/src/tests/sptests/spfatal/Makefile.am index 7e2daafc95..eeb236e3c5 100644 --- a/c/src/tests/sptests/spfatal/Makefile.am +++ b/c/src/tests/sptests/spfatal/Makefile.am @@ -31,7 +31,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/sptests/spsize/Makefile.am b/c/src/tests/sptests/spsize/Makefile.am index 4e7d4aca2d..e57071de87 100644 --- a/c/src/tests/sptests/spsize/Makefile.am +++ b/c/src/tests/sptests/spsize/Makefile.am @@ -29,7 +29,7 @@ include $(top_srcdir)/sptests.am ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/support/include/Makefile.am b/c/src/tests/support/include/Makefile.am index 72f0f3c837..5321debc5f 100644 --- a/c/src/tests/support/include/Makefile.am +++ b/c/src/tests/support/include/Makefile.am @@ -8,22 +8,16 @@ project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@ noinst_HEADERS = tmacros.h -TMPINSTALLDIRS=$(project_bspdir)/lib/include +TMPINSTALLFILES = $(project_bspdir)/lib/include \ + $(project_bspdir)/lib/include/tmacros.h -$(TMPINSTALLDIRS): +$(project_bspdir)/lib/include: $(mkinstalldirs) $@ - -TMPINSTALLFILES = $(project_bspdir)/lib/include/tmacros.h - $(project_bspdir)/lib/include/tmacros.h: tmacros.h $(INSTALL_DATA) $< $@ -CLEANFILES = $(TMPINSTALLFILES) - -install-tmp: $(TMPINSTALLFILES) +CLEANFILES = $(project_bspdir)/lib/include/tmacros.h -all: install-tmp -debug: install-tmp -profile: install-tmp +all: $(TMPINSTALLFILES) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/tests/support/stubdr/Makefile.am b/c/src/tests/support/stubdr/Makefile.am index 5607df0e2d..8829ea588b 100644 --- a/c/src/tests/support/stubdr/Makefile.am +++ b/c/src/tests/support/stubdr/Makefile.am @@ -34,7 +34,7 @@ $(PROJECT_INCLUDE)/%.h: %.h $(PGM): ${OBJS} $(make-rel) -all-local: ${ARCH} $(PGM) $(TMPINSTALL_FILES) +all: ${ARCH} $(PGM) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) diff --git a/c/src/tests/tmitrontests/tmitronsem01/Makefile.am b/c/src/tests/tmitrontests/tmitronsem01/Makefile.am index 2cb351e2a9..6f9d3a062a 100644 --- a/c/src/tests/tmitrontests/tmitronsem01/Makefile.am +++ b/c/src/tests/tmitrontests/tmitronsem01/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm01/Makefile.am b/c/src/tests/tmtests/tm01/Makefile.am index cec68ff0b8..7dcbb1284b 100644 --- a/c/src/tests/tmtests/tm01/Makefile.am +++ b/c/src/tests/tmtests/tm01/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm02/Makefile.am b/c/src/tests/tmtests/tm02/Makefile.am index 972dce7e71..f278aaa0d0 100644 --- a/c/src/tests/tmtests/tm02/Makefile.am +++ b/c/src/tests/tmtests/tm02/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm03/Makefile.am b/c/src/tests/tmtests/tm03/Makefile.am index 6f62d92019..ab35f9fb62 100644 --- a/c/src/tests/tmtests/tm03/Makefile.am +++ b/c/src/tests/tmtests/tm03/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm04/Makefile.am b/c/src/tests/tmtests/tm04/Makefile.am index ba0f3b8b8d..941eb662de 100644 --- a/c/src/tests/tmtests/tm04/Makefile.am +++ b/c/src/tests/tmtests/tm04/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm05/Makefile.am b/c/src/tests/tmtests/tm05/Makefile.am index 9650859f45..12289a4064 100644 --- a/c/src/tests/tmtests/tm05/Makefile.am +++ b/c/src/tests/tmtests/tm05/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm06/Makefile.am b/c/src/tests/tmtests/tm06/Makefile.am index 034bce6b49..00db9f0d93 100644 --- a/c/src/tests/tmtests/tm06/Makefile.am +++ b/c/src/tests/tmtests/tm06/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm07/Makefile.am b/c/src/tests/tmtests/tm07/Makefile.am index cdec5806be..0042de14e9 100644 --- a/c/src/tests/tmtests/tm07/Makefile.am +++ b/c/src/tests/tmtests/tm07/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm08/Makefile.am b/c/src/tests/tmtests/tm08/Makefile.am index 66eefd2380..a08a1edc33 100644 --- a/c/src/tests/tmtests/tm08/Makefile.am +++ b/c/src/tests/tmtests/tm08/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm09/Makefile.am b/c/src/tests/tmtests/tm09/Makefile.am index 205a989fec..cc6a6b1be7 100644 --- a/c/src/tests/tmtests/tm09/Makefile.am +++ b/c/src/tests/tmtests/tm09/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm10/Makefile.am b/c/src/tests/tmtests/tm10/Makefile.am index 72052067af..d9ad5adb90 100644 --- a/c/src/tests/tmtests/tm10/Makefile.am +++ b/c/src/tests/tmtests/tm10/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm11/Makefile.am b/c/src/tests/tmtests/tm11/Makefile.am index c12ecf0788..f5895e59c0 100644 --- a/c/src/tests/tmtests/tm11/Makefile.am +++ b/c/src/tests/tmtests/tm11/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm12/Makefile.am b/c/src/tests/tmtests/tm12/Makefile.am index 213f72271e..bf3b0c38d2 100644 --- a/c/src/tests/tmtests/tm12/Makefile.am +++ b/c/src/tests/tmtests/tm12/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm13/Makefile.am b/c/src/tests/tmtests/tm13/Makefile.am index caaf71f8b3..6a6e01e851 100644 --- a/c/src/tests/tmtests/tm13/Makefile.am +++ b/c/src/tests/tmtests/tm13/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm14/Makefile.am b/c/src/tests/tmtests/tm14/Makefile.am index 41fb6c1db6..155314d324 100644 --- a/c/src/tests/tmtests/tm14/Makefile.am +++ b/c/src/tests/tmtests/tm14/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm15/Makefile.am b/c/src/tests/tmtests/tm15/Makefile.am index d8e9c9b2b5..5cf90b81ab 100644 --- a/c/src/tests/tmtests/tm15/Makefile.am +++ b/c/src/tests/tmtests/tm15/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm16/Makefile.am b/c/src/tests/tmtests/tm16/Makefile.am index 30655fd158..315a87f1ed 100644 --- a/c/src/tests/tmtests/tm16/Makefile.am +++ b/c/src/tests/tmtests/tm16/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm17/Makefile.am b/c/src/tests/tmtests/tm17/Makefile.am index 9bc35a9830..2f98d224ad 100644 --- a/c/src/tests/tmtests/tm17/Makefile.am +++ b/c/src/tests/tmtests/tm17/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm18/Makefile.am b/c/src/tests/tmtests/tm18/Makefile.am index b9f96377ec..796e436dac 100644 --- a/c/src/tests/tmtests/tm18/Makefile.am +++ b/c/src/tests/tmtests/tm18/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm19/Makefile.am b/c/src/tests/tmtests/tm19/Makefile.am index cc74b7aea7..0508ddab17 100644 --- a/c/src/tests/tmtests/tm19/Makefile.am +++ b/c/src/tests/tmtests/tm19/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm20/Makefile.am b/c/src/tests/tmtests/tm20/Makefile.am index f8b4d51fea..5a8e2d755f 100644 --- a/c/src/tests/tmtests/tm20/Makefile.am +++ b/c/src/tests/tmtests/tm20/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm21/Makefile.am b/c/src/tests/tmtests/tm21/Makefile.am index a9fc96e91f..75dddaaa6b 100644 --- a/c/src/tests/tmtests/tm21/Makefile.am +++ b/c/src/tests/tmtests/tm21/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm22/Makefile.am b/c/src/tests/tmtests/tm22/Makefile.am index b7118f5aed..357a461f9a 100644 --- a/c/src/tests/tmtests/tm22/Makefile.am +++ b/c/src/tests/tmtests/tm22/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm23/Makefile.am b/c/src/tests/tmtests/tm23/Makefile.am index 87511a98d0..37e9220659 100644 --- a/c/src/tests/tmtests/tm23/Makefile.am +++ b/c/src/tests/tmtests/tm23/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm24/Makefile.am b/c/src/tests/tmtests/tm24/Makefile.am index 48e21ed881..176ab4486c 100644 --- a/c/src/tests/tmtests/tm24/Makefile.am +++ b/c/src/tests/tmtests/tm24/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm25/Makefile.am b/c/src/tests/tmtests/tm25/Makefile.am index dd41b13fa7..d853b24ee8 100644 --- a/c/src/tests/tmtests/tm25/Makefile.am +++ b/c/src/tests/tmtests/tm25/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm26/Makefile.am b/c/src/tests/tmtests/tm26/Makefile.am index c488de3620..ac9892f3b0 100644 --- a/c/src/tests/tmtests/tm26/Makefile.am +++ b/c/src/tests/tmtests/tm26/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm27/Makefile.am b/c/src/tests/tmtests/tm27/Makefile.am index 02caaaaeae..ef6f974a19 100644 --- a/c/src/tests/tmtests/tm27/Makefile.am +++ b/c/src/tests/tmtests/tm27/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm28/Makefile.am b/c/src/tests/tmtests/tm28/Makefile.am index fc23e73d17..ff7638b486 100644 --- a/c/src/tests/tmtests/tm28/Makefile.am +++ b/c/src/tests/tmtests/tm28/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tm29/Makefile.am b/c/src/tests/tmtests/tm29/Makefile.am index 83a1f29433..72b12bc672 100644 --- a/c/src/tests/tmtests/tm29/Makefile.am +++ b/c/src/tests/tmtests/tm29/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tmck/Makefile.am b/c/src/tests/tmtests/tmck/Makefile.am index c05e844246..e1400ee970 100644 --- a/c/src/tests/tmtests/tmck/Makefile.am +++ b/c/src/tests/tmtests/tmck/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tmtests/tmoverhd/Makefile.am b/c/src/tests/tmtests/tmoverhd/Makefile.am index 8455838e77..05e463fe56 100644 --- a/c/src/tests/tmtests/tmoverhd/Makefile.am +++ b/c/src/tests/tmtests/tmoverhd/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all: $(ARCH) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) $(DOCS) diff --git a/c/src/tests/tools/generic/Makefile.am b/c/src/tests/tools/generic/Makefile.am index 642274f63c..489e31f40e 100644 --- a/c/src/tests/tools/generic/Makefile.am +++ b/c/src/tests/tools/generic/Makefile.am @@ -23,6 +23,6 @@ $(project_bspdir)/tests/difftest: difftest $(project_bspdir)/tests/sorttimes: sorttimes $(INSTALL_SCRIPT) $< $@ -all-local: $(PREINSTALL_FILES) +all: $(PREINSTALL_FILES) include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am index 7e4282dee4..1159228816 100644 --- a/c/src/wrapup/Makefile.am +++ b/c/src/wrapup/Makefile.am @@ -41,8 +41,6 @@ $(PROJECT_RELEASE)/lib/$(LIBNAME)${LIB_VARIANT}.a all: $(ARCH) $(TMPINSTALL_FILES) -install: all - $(LIB): $(SRCS) rm -f $@ rm -rf $(ARCH)/* diff --git a/make/Makefile.am b/make/Makefile.am index b463e14b0e..6f57121002 100644 --- a/make/Makefile.am +++ b/make/Makefile.am @@ -23,4 +23,4 @@ compilers ## ------------------------------------------------------- include $(top_srcdir)/automake/subdirs.am -include $(top_srcdir)/automake/local.am +include $(top_srcdir)/automake/host.am diff --git a/make/Templates/Makefile.am b/make/Templates/Makefile.am index 28136f27b1..254060d151 100644 --- a/make/Templates/Makefile.am +++ b/make/Templates/Makefile.am @@ -12,4 +12,4 @@ Makefile.dir \ Makefile.leaf \ Makefile.lib -include $(top_srcdir)/automake/local.am +include $(top_srcdir)/automake/host.am diff --git a/make/compilers/Makefile.am b/make/compilers/Makefile.am index cfc9545c90..0c97a6b2ef 100644 --- a/make/compilers/Makefile.am +++ b/make/compilers/Makefile.am @@ -10,4 +10,4 @@ gcc-portsw.cfg \ gcc-target-default.cfg ## ------------------------------------------------------- -include $(top_srcdir)/automake/local.am +include $(top_srcdir)/automake/host.am diff --git a/make/custom/Makefile.am b/make/custom/Makefile.am index 049a3d0d8d..3987a4c680 100644 --- a/make/custom/Makefile.am +++ b/make/custom/Makefile.am @@ -55,4 +55,4 @@ simhppa.cfg \ ts_386ex.cfg ## ------------------------------------------------------- -include $(top_srcdir)/automake/local.am +include $(top_srcdir)/automake/host.am diff --git a/make/custom/efi68k.cfg b/make/custom/efi68k.cfg index af1c1b3f3f..da24446a9a 100644 --- a/make/custom/efi68k.cfg +++ b/make/custom/efi68k.cfg @@ -55,11 +55,11 @@ define make-exe endef else define make-exe - $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -o $(basename $@).nxe \ + $(LINK.c) $(LDLIBS) -o $(basename $@).nxe \ $(LINK_OBJS) $(LINK_LIBS) $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \ - $(PACKHEX) > $(basename $@).exe + $(PACKHEX) > $@ $(NM) -g -n $(basename $@).nxe > $(basename $@).num $(SIZE) $(basename $@).nxe endef diff --git a/make/custom/mcp750.cfg b/make/custom/mcp750.cfg index e2446cd902..7d5501fa51 100644 --- a/make/custom/mcp750.cfg +++ b/make/custom/mcp750.cfg @@ -68,7 +68,7 @@ endef # NOTE : cheking egcc 1.1.1 source code shows that the last know processor # is the 604 model and that this is the default generation option. # -# CPU_CFLAGS = -mcpu=750 +CPU_CFLAGS = -mcpu=750 # optimize flag: typically -0, could use -O4 or -fast # -O4 is ok for RTEMS @@ -78,9 +78,14 @@ endef # As far as I know, small data are pointer impose a very specific compliation # model => not used. # Currently the sdata2 and sbss2 sections are empty => r2 is not used... -CFLAGS_OPTIMIZE_V=-O4 -mmultiple -mstring -mstrict-align -mcpu=750 +CFLAGS_OPTIMIZE_V=-O4 -mmultiple -mstring -mstrict-align #CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions -fvolatile-global -fvolatile -mstrict-align -mcpu=750 +# debug flags: typically none, but at least -O1 is required due to this +# BSP using inlined code +CFLAGS_DEBUG_V = -O1 -mmultiple -mstring -mstrict-align + + # The following is a ld command file which works without using the # -specs system in gcc 2.8. IT HAS NEVER BEEN TESTED WITH THIS BSP!!! # $(LD) $(XLDFLAGS) -T $(LINKCMDS) \ @@ -94,18 +99,18 @@ CFLAGS_OPTIMIZE_V=-O4 -mmultiple -mstring -mstrict-align -mcpu=750 # $(LD_LIBS) \ # -Wl,-\( -Wl,-lc -Wl,-lrtemsall -Wl,-lgcc -Wl,-\) define make-exe - $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(LINK_OBJS) $(LINK_LIBS) + $(LINK.c) $(LDLIBS) -o $@ $(LINK_OBJS) $(LINK_LIBS) $(NM) -g -n $@ > $(basename $@).num $(SIZE) $@ + test -d ${PROJECT_RELEASE}/bin || mkdir ${PROJECT_RELEASE}/bin $(CP) $@ $(PROJECT_ROOT)/powerpc-rtems/c/mcp750/lib/libbsp/powerpc/$(RTEMS_BSP_FAMILY)/bootloader/$(ARCH); \ - cd $(PROJECT_ROOT)/powerpc-rtems/c/mcp750/lib/libbsp/powerpc/$(RTEMS_BSP_FAMILY)/bootloader; \ - $(MAKE) bootloader BINARY_LOADED=$(basename $@).exe; \ - COMPLETE_FILE_NAME=$(basename $@).exe ;\ - echo $${COMPLETE_FILE_NAME} ;\ - FILE_NAME=`basename $${COMPLETE_FILE_NAME}` ;\ - echo $${FILE_NAME} ;\ - mkdir -p $(PROJECT_ROOT)/mcp750/bin ;\ - $(CP) bootloader $(PROJECT_ROOT)/mcp750/bin/$${FILE_NAME} + ( cd $(PROJECT_ROOT)/powerpc-rtems/c/mcp750/lib/libbsp/powerpc/$(RTEMS_BSP_FAMILY)/bootloader; \ + $(MAKE) bootloader BINARY_LOADED=$@; ) + f=`basename $@ .exe`; \ + cp $(PROJECT_ROOT)/powerpc-rtems/c/mcp750/lib/libbsp/powerpc/$(RTEMS_BSP_FAMILY)/bootloader/bootloader \ + ${PROJECT_RELEASE}/bin/$${f}$(LIB_VARIANT).exe \ + && chmod 755 \ + ${PROJECT_RELEASE}/bin/$${f}$(LIB_VARIANT).exe endef # Miscellaneous additions go here diff --git a/make/custom/ods68302.cfg b/make/custom/ods68302.cfg index d8e46eb6a1..229f9b0d4b 100644 --- a/make/custom/ods68302.cfg +++ b/make/custom/ods68302.cfg @@ -71,12 +71,12 @@ define make-exe endef else define make-exe - $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) \ + $(LINK.c) $(LDLIBS) \ -Wl,-defsym -Wl,MC68302_BASE=$(MC68302_BASE) \ - -o $(basename $@).exe \ + -o $@ \ $(LINK_OBJS) $(LINK_LIBS) - $(NM) -g -n $(basename $@).exe > $(basename $@).num - $(SIZE) $(basename $@).exe + $(NM) -g -n $@ > $(basename $@).num + $(SIZE) $@ endef endif # Miscellaneous additions go here diff --git a/make/host.cfg.in b/make/host.cfg.in index cae07de613..15f5a11256 100644 --- a/make/host.cfg.in +++ b/make/host.cfg.in @@ -26,8 +26,6 @@ LN=@LN@ MKDIR=mkdir CHMOD=chmod SED=sed -# Anybody using this? -# M4=@M4@ # Global tools ifndef PACKHEX @@ -74,7 +72,3 @@ INSTDATAFLAGS = -m 0644 INSTLIBFLAGS = -m 0644 INSTDIRFLAGS = -m 0755 -d INSTINCFLAGS = -m 0644 - -ifndef INSTALL_DATA -INSTALL_DATA = $(INSTALL) $(INSTDATAFLAGS) -endif diff --git a/make/leaf.cfg b/make/leaf.cfg index 88f708cac8..a8b90ee1f1 100644 --- a/make/leaf.cfg +++ b/make/leaf.cfg @@ -42,6 +42,7 @@ ifeq (${DEPEND},$(wildcard ${DEPEND})) include ${DEPEND} # pull in dependencies if they exist endif +ifndef AUTOMAKE # # Builtin targets for compilation variants # @@ -56,6 +57,7 @@ profile: MAKEFILE=$(MAKEFILE) "ARCH=o-profile" \ "CFLAGS_PROFILE=$(CFLAGS_PROFILE_V)" \ "LDFLAGS_PROFILE=$(LDFLAGS_PROFILE_V)" $(TARGET_VA) +endif # # VARIANT_VA will convert our ${ARCH} back into "" or "debug" or "profile". @@ -106,15 +108,15 @@ clean-am: clean-generic distclean-am: distclean-generic clean-am -$(RM) -r $(CLOBBER_OS) $(CLOBBER_CC) $(CLOBBER_DEPEND) +ifndef AUTOMAKE preinstall-am: preinstall: preinstall-am -ifndef AUTOMAKE distclean: distclean-am -$(RM) ./config.status clean: clean-am -endif .PHONY: distclean distclean-am .PHONY: clean clean-am +endif diff --git a/tools/Makefile.am b/tools/Makefile.am index baddc06279..7d5befb104 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -5,4 +5,4 @@ AUTOMAKE_OPTIONS = foreign 1.4 SUBDIRS = build cpu update include $(top_srcdir)/automake/subdirs.am -include $(top_srcdir)/automake/local.am +include $(top_srcdir)/automake/host.am diff --git a/tools/build/Makefile.am b/tools/build/Makefile.am index 55012a65ce..5135cc31b2 100644 --- a/tools/build/Makefile.am +++ b/tools/build/Makefile.am @@ -22,4 +22,4 @@ unlock-directory noinst_SCRIPTS = search-id.sh -include $(top_srcdir)/../../automake/local.am +include $(top_srcdir)/../../automake/host.am diff --git a/tools/cpu/Makefile.am b/tools/cpu/Makefile.am index cf41512cdb..e1dc9607a4 100644 --- a/tools/cpu/Makefile.am +++ b/tools/cpu/Makefile.am @@ -10,4 +10,4 @@ SUBDIRS = @subdirs@ DIST_SUBDIRS = generic hppa1.1 sh unix include $(top_srcdir)/../../automake/subdirs.am -include $(top_srcdir)/../../automake/local.am +include $(top_srcdir)/../../automake/host.am diff --git a/tools/cpu/generic/Makefile.am b/tools/cpu/generic/Makefile.am index 0cd7a9ebd7..0df1031191 100644 --- a/tools/cpu/generic/Makefile.am +++ b/tools/cpu/generic/Makefile.am @@ -6,4 +6,4 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal noinst_SCRIPTS=size_rtems -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../../automake/host.am diff --git a/tools/cpu/hppa1.1/Makefile.am b/tools/cpu/hppa1.1/Makefile.am index 2b64579122..293d882c6d 100644 --- a/tools/cpu/hppa1.1/Makefile.am +++ b/tools/cpu/hppa1.1/Makefile.am @@ -14,8 +14,8 @@ genoffsets.c CPU_DIR=../../cpu/$(RTEMS_CPU) -INCLUDES = \ +AM_CPPFLAGS = \ -I$(PROJECT_INCLUDE) \ -I$(CPU_DIR) -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../../automake/host.am diff --git a/tools/cpu/sh/Makefile.am b/tools/cpu/sh/Makefile.am index 2eb28edb70..456eb6dee6 100644 --- a/tools/cpu/sh/Makefile.am +++ b/tools/cpu/sh/Makefile.am @@ -2,7 +2,7 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.4 no-installman ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal noinst_PROGRAMS=shgen @@ -12,4 +12,11 @@ sci.h \ sci.c \ shgen.c -include $(top_srcdir)/../../../automake/local.am +if HELP2MAN +man_MANS = shgen.1 + +shgen.1: $(srcdir)/shgen.c + $(HELP2MAN) -N shgen >$@ +endif + +include $(top_srcdir)/../../../automake/host.am diff --git a/tools/cpu/sh/configure.in b/tools/cpu/sh/configure.in index 0b718ef87e..368e95b79b 100644 --- a/tools/cpu/sh/configure.in +++ b/tools/cpu/sh/configure.in @@ -8,12 +8,15 @@ AC_CONFIG_AUX_DIR(../../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE(rtems-tools-cpu-sh,$RTEMS_VERSION,no) +AM_INIT_AUTOMAKE(rtems-tools-cpu-sh,0.4) AM_MAINTAINER_MODE AC_EXEEXT AC_PROG_CC AC_CHECK_LIB(m,fabs) +AC_CHECK_FUNCS(getopt_long) +AC_CHECK_PROGS(HELP2MAN,help2man) +AM_CONDITIONAL(HELP2MAN,test -n "$HELP2MAN" ) RTEMS_TOOLPATHS diff --git a/tools/cpu/sh/shgen.c b/tools/cpu/sh/shgen.c index c101388ad8..6fc262d694 100644 --- a/tools/cpu/sh/shgen.c +++ b/tools/cpu/sh/shgen.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-1999 Ralf Corsepius (corsepiu@faw.uni-ulm.de) + * Copyright (c) 1998,1999,2000 Ralf Corsepius (corsepiu@faw.uni-ulm.de) * * See the file COPYING for copyright notice. */ @@ -11,25 +11,44 @@ #include "sci.h" -static void usage( char *prog ) +static void usage( FILE* ofile, char *prog ) { - fprintf( stderr, "usage: %s [options] driver\n", prog ); - fprintf( stderr, "options:\n" ); - fprintf( stderr, "\t-M Phi .. processor frequency [MHz]\n" ); - fprintf( stderr, "\t-K Phi .. processor frequency [KHz]\n" ); - fprintf( stderr, "\t-H Phi .. processor frequency [Hz]\n" ); - fprintf( stderr, "\t\t..default 20MHz" ); - fprintf( stderr, "driver:\n" ); - fprintf( stderr, "\tsci .. bitrate table for sci\n" ); - exit ( 1 ); + fprintf( ofile, "Usage: %s [options] driver\n", prog ); + fprintf( ofile, "\nOptions:\n" ); + fprintf( ofile, "Processor frequency (default 20MHz):\n") ; + fprintf( ofile, "\t-M Phi .. processor frequency [MHz]\n" ); + fprintf( ofile, "\t-K Phi .. processor frequency [KHz]\n" ); + fprintf( ofile, "\t-H Phi .. processor frequency [Hz]\n" ); + fprintf( ofile, "Driver:\n" ); + fprintf( ofile, "\tsci .. bitrate table for sci\n" ); + + fprintf( ofile, "\nWritten by Ralf Corsepius <corsepiu@faw.uni-ulm.de>\n" ); + fprintf( ofile, "\nCopyright (c) 1998,1999,2000\tRalf Corsepius\n" ); } +#if HAVE_GETOPT_LONG +#define NOARG 0 +#define HASARG 1 +#define OPTARG 2 + +static struct option long_options[] = +{ + { "version", NOARG, NULL, 'v' }, + { "help", NOARG, NULL, 'h' }, + { "mega-hertz", HASARG, NULL, 'M' }, + { "kilo-hertz", HASARG, NULL, 'K' }, + { "hertz", HASARG, NULL, 'H' }, + { 0, 0, 0, 0 } +}; +#endif + static void shgen_header( FILE *file ) { fprintf( file, - "/*\n * DO NOT EDIT - this file is automatically generated by shgen 0.3\n" ); + "/*\n * DO NOT EDIT - this file is automatically generated by shgen %s\n", + VERSION ); fprintf( file, - " * Copyright (c) 1998-1999, Ralf Corsepius (corsepiu@faw.uni-ulm.de)\n */\n" ); + " * Copyright (c) 1998,1999,2000 Ralf Corsepius (corsepiu@faw.uni-ulm.de)\n */\n" ); fprintf( file, "\n/* This file is not copyrighted */\n\n" ); } @@ -37,8 +56,14 @@ static void shgen_header( FILE *file ) int main( int argc, char *argv[] ) { double Phi = 20.0 ; - - while ( ( optopt = getopt( argc, argv, "M:K:H:" ) ) > 0 ) + +#if HAVE_GETOPT_LONG + int option_index = 0 ; + while( ( optopt = getopt_long( argc, argv, "M:K:H:hv", + long_options, &option_index ) ) > 0 ) +#else + while ( ( optopt = getopt( argc, argv, "M:K:H:hv" ) ) > 0 ) +#endif { switch ( optopt ) { @@ -51,17 +76,27 @@ int main( int argc, char *argv[] ) Phi = Phi * 1000.0; break ; case 'H' : - sscanf( optarg, "%lf", &Phi ); + sscanf( optarg, "%lf", &Phi ); break ; + case 'h' : + usage( stdout, argv[0] ); + exit(0); + case 'v' : + fprintf( stdout, "%s version %s\n", argv[0], VERSION ); + exit(0); default : - usage( argv[0] ); + usage( stderr, argv[0] ); + exit(1); break ; } } if ( argc - optind != 1 ) - usage( argv[0] ); - + { + fprintf( stderr, "%s: Missing argument: driver\n", argv[0] ); + exit(1); + } + shgen_header( stdout ); if ( strcmp( argv[optind], "sci" ) == 0 ) @@ -69,7 +104,10 @@ int main( int argc, char *argv[] ) shgen_gensci( stdout, Phi ); } else - usage( argv[0] ); + { + fprintf( stderr, "%s: Invalid argument: driver\n", argv[0] ); + exit(1); + } return 0 ; } diff --git a/tools/cpu/unix/Makefile.am b/tools/cpu/unix/Makefile.am index 8104ed7c87..780884618b 100644 --- a/tools/cpu/unix/Makefile.am +++ b/tools/cpu/unix/Makefile.am @@ -9,4 +9,4 @@ noinst_PROGRAMS=gensize gensize_SOURCES=gensize.c -include $(top_srcdir)/../../../automake/local.am +include $(top_srcdir)/../../../automake/host.am diff --git a/tools/update/Makefile.am b/tools/update/Makefile.am index 05a1bf959e..47f3abfbf9 100644 --- a/tools/update/Makefile.am +++ b/tools/update/Makefile.am @@ -44,4 +44,4 @@ ampolish \ cipolish \ rtems-polish.sh -include $(top_srcdir)/../../automake/local.am +include $(top_srcdir)/../../automake/host.am diff --git a/tools/update/acpolish b/tools/update/acpolish index 5de711f60c..8418acdd05 100755 --- a/tools/update/acpolish +++ b/tools/update/acpolish @@ -1,10 +1,8 @@ #!/usr/bin/perl -# use strict 'subs' ; -# use strict 'vars' ; -# use strict 'refs' ; +use strict ; -# use strict ; +sub print_macro($$); # # Perl script to beautify and enhance RTEMS autoconf Makefile.ins @@ -40,27 +38,6 @@ my @files = () ; my @variants = () ; my @vars = () ; -sub print_macro($$) -{ - my $line = $_[0] ; - my $input = $_[1] ; - $input =~ s/\\\\/ /g; - my @l = split(' ',$input); - - foreach (@l) { - if ( ( length($line) + length($_) ) < 76 ) - { - $line .= " $_"; - } - else - { - print "$line \\\n"; - $line = " $_" ; - } - } - print "$line\n" ; -} - # Strip off duplicate entries from a list sub purge($) { @@ -180,8 +157,8 @@ sub subst_line { my $files =`ls *.h 2>/dev/null`; print STDERR "WARNING: Replacing \"\(wildcard... in $_\n" ; - $line = "H_FILES ="; - @l = split(' ',$files) ; + my $line = "H_FILES ="; + my @l = split(' ',$files) ; foreach(@l) { $line .= " \$\(srcdir\)/$_"; } $line .= "\n" ; $_ = "$line" ; @@ -618,7 +595,7 @@ if ( $experimental > 1 ) { print "mkinstalldirs = \$(SHELL) \$(top_srcdir)/\@RTEMS_TOPdir\@/mkinstalldirs\n\n" ; my $line = join( ' ',@installdirs ); - print_macro "INSTALLDIRS =", $line ; + &print_macro( "INSTALLDIRS =", $line ); print "\n\$(INSTALLDIRS):\n\t\@\$(mkinstalldirs) \$(INSTALLDIRS)\n\n" ; $nl_seen = 1 ; } @@ -633,12 +610,12 @@ if ( $experimental > 1 ) } elsif ( /^\§4(.*)$/o ) { # pretty print a make variable - print_macro "$1 =", ${"var_$1"} ; + &print_macro( "$1 =", ${"var_$1"} ); $nl_seen = 0 ; } elsif ( /^\§5(.*)$/o ) { # pretty print an addition to a make variable - print_macro "$1 +=", ${"var_$1+"} ; + &print_macro( "$1 +=", ${"var_$1+"}) ; $nl_seen = 0 ; } else @@ -678,4 +655,25 @@ print " \$(ACLOCAL_M4)\n" ; print "\tcd \$(srcdir) && \$(AUTOCONF)\n" } -;1 +exit 0 ; + +sub print_macro($$) +{ + my ($line,$input) = @_ ; + $input =~ s/\\\\/ /g; + my @l = split(' ',$input); + + foreach (@l) { + if ( ( length($line) + length($_) ) < 76 ) + { + $line .= " $_"; + } + else + { + print "$line \\\n"; + $line = " $_" ; + } + } + print "$line\n" ; +} + diff --git a/tools/update/ampolish b/tools/update/ampolish index 265a3bc76c..0d79581f26 100755 --- a/tools/update/ampolish +++ b/tools/update/ampolish @@ -1,5 +1,7 @@ #!/usr/bin/perl +use strict ; + # # Perl script to beautify and enhance RTEMS automake Makefile.ams # @@ -22,7 +24,7 @@ sub find_file my $top = "." ; if (not "$pre") { $pre = "." ; } - for ( $str = "$pre" . "/" . "$top" ; + for ( my $str = "$pre" . "/" . "$top" ; ( -d "$str" ) ; $str = "$pre" . "/" . "$top" ) { diff --git a/tools/update/cipolish b/tools/update/cipolish index c04e0c52c6..dd3bb8084f 100755 --- a/tools/update/cipolish +++ b/tools/update/cipolish @@ -12,15 +12,18 @@ # $Id$ -# find relative up-path to configure.in +use strict ; + +my @vars = () ; +my @buffer = () ; + +# find relative up-path to VERSION my $rtems_cfg = &find_file(".","VERSION"); my $rtems_root = &find_root() ; $rtems_root =~ tr/\//\-/ ; my $rtems_name = "rtems" ; $rtems_name .= "-" . "$rtems_root" if (length($rtems_root) > 0 ) ; -my @buffer = () ; - while ( <> ) { push @buffer, "$_" ; @@ -126,8 +129,8 @@ while ( <> ) { if ( /^[\s]*(RTEMS_ENABLE_LIBCDIR).*$/o ) { - if ( ( not defined $var_RTEMS_PROG_CC_FOR_TARGET ) - and ( not defined $var_RTEMS_PROG_CXX_FOR_TARGET ) + if ( ( not defined $main::var_RTEMS_PROG_CC_FOR_TARGET ) + and ( not defined $main::var_RTEMS_PROG_CXX_FOR_TARGET ) ) { push @tbuf, "$_" ; @@ -165,7 +168,7 @@ sub find_file($$) my $top = "." ; if (not "$pre") { $pre = "." ; } - for ( $str = "$pre" . "/" . "$top" ; + for ( my $str = "$pre" . "/" . "$top" ; ( -d "$str" ) ; $str = "$pre" . "/" . "$top" ) { |