Changeset 99eb585 in rtems


Ignore:
Timestamp:
02/25/00 15:03:10 (24 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Children:
02c31b9c
Parents:
77b2b0e
Message:

Patches rtems-rc-4.5.0-1.diff from Ralf Corsepius <corsepiu@…>
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>")

Files:
106 edited

Legend:

Unmodified
Added
Removed

  • c/src/tests/psxtests/psxcancel/Makefile.am

    r77b2b0e r99eb585  
    3737        $(make-exe)
    3838
    39 all-local: $(ARCH) $(TMPINSTALL_FILES)
     39all: $(ARCH) $(TMPINSTALL_FILES)
    4040
    4141EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/psxtests/psxfile01/Makefile.am

    r77b2b0e r99eb585  
    3535        $(make-exe)
    3636
    37 all-local: $(ARCH) $(TMPINSTALL_FILES)
     37all: $(ARCH) $(TMPINSTALL_FILES)
    3838
    3939EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/psxtests/psxhdrs/Makefile.am

    r77b2b0e r99eb585  
    3333include $(RTEMS_ROOT)/make/leaf.cfg
    3434
    35 all-local: ${ARCH} ${OBJS}
     35all: ${ARCH} ${OBJS}
    3636
    3737EXTRA_DIST = $(C_FILES)

  • c/src/tests/psxtests/psxmount/Makefile.am

    r77b2b0e r99eb585  
    3232        $(make-exe)
    3333
    34 all-local: $(ARCH) $(TMPINSTALL_FILES)
     34all: $(ARCH) $(TMPINSTALL_FILES)
    3535
    3636EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/psxtests/psxmsgq01/Makefile.am

    r77b2b0e r99eb585  
    3737        $(make-exe)
    3838
    39 all-local: $(ARCH) $(TMPINSTALL_FILES)
     39all: $(ARCH) $(TMPINSTALL_FILES)
    4040
    4141EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/psxtests/psxreaddir/Makefile.am

    r77b2b0e r99eb585  
    3232        $(make-exe)
    3333
    34 all-local: $(ARCH) $(TMPINSTALL_FILES)
     34all: $(ARCH) $(TMPINSTALL_FILES)
    3535
    3636EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/psxtests/psxsem01/Makefile.am

    r77b2b0e r99eb585  
    3737        $(make-exe)
    3838
    39 all-local: $(ARCH) $(TMPINSTALL_FILES)
     39all: $(ARCH) $(TMPINSTALL_FILES)
    4040
    4141EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/psxtests/psxstat/Makefile.am

    r77b2b0e r99eb585  
    3232        $(make-exe)
    3333
    34 all-local: $(ARCH) $(TMPINSTALL_FILES)
     34all: $(ARCH) $(TMPINSTALL_FILES)
    3535
    3636EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/psxtests/psxtime/Makefile.am

    r77b2b0e r99eb585  
    3232        $(make-exe)
    3333
    34 all-local: $(ARCH) $(TMPINSTALL_FILES)
     34all: $(ARCH) $(TMPINSTALL_FILES)
    3535
    3636EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/psxtests/psxtimer/Makefile.am

    r77b2b0e r99eb585  
    3737        $(make-exe)
    3838
    39 all-local: $(ARCH) $(TMPINSTALL_FILES)
     39all: $(ARCH) $(TMPINSTALL_FILES)
    4040
    4141EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/samples/base_mp/node1/Makefile.am

    r77b2b0e r99eb585  
    4141        $(make-exe)
    4242
    43 all-local: $(ARCH) $(TMPINSTALL_FILES)
     43all: $(ARCH) $(TMPINSTALL_FILES)
    4444else
    45 all-local:
     45all:
    4646endif
    4747

  • c/src/tests/samples/base_mp/node2/Makefile.am

    r77b2b0e r99eb585  
    4141        $(make-exe)
    4242
    43 all-local: $(ARCH) $(TMPINSTALL_FILES)
     43all: $(ARCH) $(TMPINSTALL_FILES)
    4444else
    45 all-local:
     45all:
    4646endif
    4747

  • c/src/tests/samples/base_sp/Makefile.am

    r77b2b0e r99eb585  
    3232#
    3333
    34 all-local: ${ARCH} $(TMPINSTALL_FILES)
     34all: ${ARCH} $(TMPINSTALL_FILES)
    3535
    3636${PGM}: $(OBJS) $(LINK_FILES)

  • c/src/tests/samples/cdtest/Makefile.am

    r77b2b0e r99eb585  
    4343        $(make-exe)
    4444
    45 all-local: ${ARCH} $(TMPINSTALL_FILES)
     45all: ${ARCH} $(TMPINSTALL_FILES)
    4646else
    47 all-local:
     47all:
    4848endif
    4949

  • c/src/tests/samples/hello/Makefile.am

    r77b2b0e r99eb585  
    3434#
    3535
    36 all-local: ${ARCH} $(TMPINSTALL_FILES)
     36all: ${ARCH} $(TMPINSTALL_FILES)
    3737
    3838${PGM}: $(OBJS) $(LINK_FILES)

  • c/src/tests/samples/minimum/Makefile.am

    r77b2b0e r99eb585  
    3131#
    3232
    33 all-local: ${ARCH} $(TMPINSTALL_FILES)
     33all: ${ARCH} $(TMPINSTALL_FILES)
    3434        # This test should not be executed
    3535

  • c/src/tests/samples/paranoia/Makefile.am

    r77b2b0e r99eb585  
    4040LD_LIBS += -lm
    4141
    42 all-local: ${ARCH} $(TMPINSTALL_FILES)
     42all: ${ARCH} $(TMPINSTALL_FILES)
    4343
    4444${PGM}: $(OBJS) $(LINK_FILES)

  • c/src/tests/samples/ticker/Makefile.am

    r77b2b0e r99eb585  
    3434#
    3535
    36 all-local: ${ARCH} $(TMPINSTALL_FILES)
     36all: ${ARCH} $(TMPINSTALL_FILES)
    3737
    3838${PGM}: $(OBJS) $(LINK_FILES)

  • c/src/tests/samples/unlimited/Makefile.am

    r77b2b0e r99eb585  
    3434#
    3535
    36 all-local: ${ARCH} $(TMPINSTALL_FILES)
     36all: ${ARCH} $(TMPINSTALL_FILES)
    3737
    3838${PGM}: $(OBJS) $(LINK_FILES)

  • c/src/tests/sptests/sp01/Makefile.am

    r77b2b0e r99eb585  
    3232        $(make-exe)
    3333
    34 all-local: $(ARCH) $(TMPINSTALL_FILES)
     34all: $(ARCH) $(TMPINSTALL_FILES)
    3535
    3636EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/sp02/Makefile.am

    r77b2b0e r99eb585  
    3232        $(make-exe)
    3333
    34 all-local: $(ARCH) $(TMPINSTALL_FILES)
     34all: $(ARCH) $(TMPINSTALL_FILES)
    3535
    3636EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/sp03/Makefile.am

    r77b2b0e r99eb585  
    3232        $(make-exe)
    3333
    34 all-local: $(ARCH) $(TMPINSTALL_FILES)
     34all: $(ARCH) $(TMPINSTALL_FILES)
    3535
    3636EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/sp04/Makefile.am

    r77b2b0e r99eb585  
    3232        $(make-exe)
    3333
    34 all-local: $(ARCH) $(TMPINSTALL_FILES)
     34all: $(ARCH) $(TMPINSTALL_FILES)
    3535
    3636EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/sp05/Makefile.am

    r77b2b0e r99eb585  
    3232        $(make-exe)
    3333
    34 all-local: $(ARCH) $(TMPINSTALL_FILES)
     34all: $(ARCH) $(TMPINSTALL_FILES)
    3535
    3636EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/sp06/Makefile.am

    r77b2b0e r99eb585  
    3232        $(make-exe)
    3333
    34 all-local: $(ARCH) $(TMPINSTALL_FILES)
     34all: $(ARCH) $(TMPINSTALL_FILES)
    3535
    3636EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/sp07/Makefile.am

    r77b2b0e r99eb585  
    3333        $(make-exe)
    3434
    35 all-local: $(ARCH) $(TMPINSTALL_FILES)
     35all: $(ARCH) $(TMPINSTALL_FILES)
    3636
    3737EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/sp08/Makefile.am

    r77b2b0e r99eb585  
    3232        $(make-exe)
    3333
    34 all-local: $(ARCH) $(TMPINSTALL_FILES)
     34all: $(ARCH) $(TMPINSTALL_FILES)
    3535
    3636EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/sp09/Makefile.am

    r77b2b0e r99eb585  
    3636        $(make-exe)
    3737
    38 all-local: $(ARCH) $(TMPINSTALL_FILES)
     38all: $(ARCH) $(TMPINSTALL_FILES)
    3939
    4040EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/sp11/Makefile.am

    r77b2b0e r99eb585  
    3232        $(make-exe)
    3333
    34 all-local: $(ARCH) $(TMPINSTALL_FILES)
     34all: $(ARCH) $(TMPINSTALL_FILES)
    3535
    3636EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/sp12/Makefile.am

    r77b2b0e r99eb585  
    3232        $(make-exe)
    3333
    34 all-local: $(ARCH) $(TMPINSTALL_FILES)
     34all: $(ARCH) $(TMPINSTALL_FILES)
    3535
    3636EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/sp13/Makefile.am

    r77b2b0e r99eb585  
    3232        $(make-exe)
    3333
    34 all-local: $(ARCH) $(TMPINSTALL_FILES)
     34all: $(ARCH) $(TMPINSTALL_FILES)
    3535
    3636EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/sp14/Makefile.am

    r77b2b0e r99eb585  
    3232        $(make-exe)
    3333
    34 all-local: $(ARCH) $(TMPINSTALL_FILES)
     34all: $(ARCH) $(TMPINSTALL_FILES)
    3535
    3636EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/sp15/Makefile.am

    r77b2b0e r99eb585  
    3232        $(make-exe)
    3333
    34 all-local: $(ARCH) $(TMPINSTALL_FILES)
     34all: $(ARCH) $(TMPINSTALL_FILES)
    3535
    3636EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/sp16/Makefile.am

    r77b2b0e r99eb585  
    3232        $(make-exe)
    3333
    34 all-local: $(ARCH) $(TMPINSTALL_FILES)
     34all: $(ARCH) $(TMPINSTALL_FILES)
    3535
    3636EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/sp17/Makefile.am

    r77b2b0e r99eb585  
    3232        $(make-exe)
    3333
    34 all-local: $(ARCH) $(TMPINSTALL_FILES)
     34all: $(ARCH) $(TMPINSTALL_FILES)
    3535
    3636EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/sp19/Makefile.am

    r77b2b0e r99eb585  
    3232        $(make-exe)
    3333
    34 all-local: $(ARCH) $(TMPINSTALL_FILES)
     34all: $(ARCH) $(TMPINSTALL_FILES)
    3535
    3636EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/sp20/Makefile.am

    r77b2b0e r99eb585  
    3232        $(make-exe)
    3333
    34 all-local: $(ARCH) $(TMPINSTALL_FILES)
     34all: $(ARCH) $(TMPINSTALL_FILES)
    3535
    3636EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/sp21/Makefile.am

    r77b2b0e r99eb585  
    3434        $(make-exe)
    3535
    36 all-local: $(ARCH) $(TMPINSTALL_FILES)
     36all: $(ARCH) $(TMPINSTALL_FILES)
    3737
    3838EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/sp22/Makefile.am

    r77b2b0e r99eb585  
    3232        $(make-exe)
    3333
    34 all-local: $(ARCH) $(TMPINSTALL_FILES)
     34all: $(ARCH) $(TMPINSTALL_FILES)
    3535
    3636EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/sp23/Makefile.am

    r77b2b0e r99eb585  
    3232        $(make-exe)
    3333
    34 all-local: $(ARCH) $(TMPINSTALL_FILES)
     34all: $(ARCH) $(TMPINSTALL_FILES)
    3535
    3636EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/sp24/Makefile.am

    r77b2b0e r99eb585  
    3232        $(make-exe)
    3333
    34 all-local: $(ARCH) $(TMPINSTALL_FILES)
     34all: $(ARCH) $(TMPINSTALL_FILES)
    3535
    3636EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/sp25/Makefile.am

    r77b2b0e r99eb585  
    3232        $(make-exe)
    3333
    34 all-local: $(ARCH) $(TMPINSTALL_FILES)
     34all: $(ARCH) $(TMPINSTALL_FILES)
    3535
    3636EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/sp26/Makefile.am

    r77b2b0e r99eb585  
    3232        $(make-exe)
    3333
    34 all-local: $(ARCH) $(TMPINSTALL_FILES)
     34all: $(ARCH) $(TMPINSTALL_FILES)
    3535
    3636EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/sp27/Makefile.am

    r77b2b0e r99eb585  
    2929        $(make-exe)
    3030
    31 all-local: $(ARCH) $(TMPINSTALL_FILES)
     31all: $(ARCH) $(TMPINSTALL_FILES)
    3232
    3333EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/sp28/Makefile.am

    r77b2b0e r99eb585  
    2929        $(make-exe)
    3030
    31 all-local: $(ARCH) $(TMPINSTALL_FILES)
     31all: $(ARCH) $(TMPINSTALL_FILES)
    3232
    3333EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/sp29/Makefile.am

    r77b2b0e r99eb585  
    2929        $(make-exe)
    3030
    31 all-local: $(ARCH) $(TMPINSTALL_FILES)
     31all: $(ARCH) $(TMPINSTALL_FILES)
    3232
    3333EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/spfatal/Makefile.am

    r77b2b0e r99eb585  
    3232        $(make-exe)
    3333
    34 all-local: $(ARCH) $(TMPINSTALL_FILES)
     34all: $(ARCH) $(TMPINSTALL_FILES)
    3535
    3636EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/sptests/spsize/Makefile.am

    r77b2b0e r99eb585  
    3030        $(make-exe)
    3131
    32 all-local: $(ARCH) $(TMPINSTALL_FILES)
     32all: $(ARCH) $(TMPINSTALL_FILES)
    3333
    3434EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/support/include/Makefile.am

    r77b2b0e r99eb585  
    99noinst_HEADERS = tmacros.h
    1010
    11 TMPINSTALLDIRS=$(project_bspdir)/lib/include
     11TMPINSTALLFILES = $(project_bspdir)/lib/include \
     12   $(project_bspdir)/lib/include/tmacros.h
    1213
    13 $(TMPINSTALLDIRS):
     14$(project_bspdir)/lib/include:
    1415        $(mkinstalldirs) $@
    15 
    16 TMPINSTALLFILES = $(project_bspdir)/lib/include/tmacros.h
    17        
    1816$(project_bspdir)/lib/include/tmacros.h: tmacros.h
    1917        $(INSTALL_DATA) $< $@
    2018
    21 CLEANFILES = $(TMPINSTALLFILES)
     19CLEANFILES = $(project_bspdir)/lib/include/tmacros.h
    2220
    23 install-tmp: $(TMPINSTALLFILES)
    24 
    25 all: install-tmp
    26 debug: install-tmp
    27 profile: install-tmp
     21all: $(TMPINSTALLFILES)
    2822
    2923include $(top_srcdir)/../../../../automake/local.am

  • c/src/tests/support/stubdr/Makefile.am

    r77b2b0e r99eb585  
    3535        $(make-rel)
    3636
    37 all-local: ${ARCH} $(PGM) $(TMPINSTALL_FILES)
     37all: ${ARCH} $(PGM) $(TMPINSTALL_FILES)
    3838
    3939EXTRA_DIST = $(C_FILES)

  • c/src/tests/tmitrontests/tmitronsem01/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm01/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm02/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm03/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm04/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm05/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm06/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm07/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm08/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm09/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm10/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm11/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm12/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm13/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm14/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm15/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm16/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm17/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm18/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm19/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm20/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm21/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm22/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm23/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm24/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm25/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm26/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm27/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm28/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tm29/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tmck/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tmtests/tmoverhd/Makefile.am

    r77b2b0e r99eb585  
    3838        $(make-exe)
    3939
    40 all-local: $(ARCH) $(TMPINSTALL_FILES)
     40all: $(ARCH) $(TMPINSTALL_FILES)
    4141
    4242EXTRA_DIST = $(C_FILES) $(DOCS)

  • c/src/tests/tools/generic/Makefile.am

    r77b2b0e r99eb585  
    2424        $(INSTALL_SCRIPT) $< $@
    2525
    26 all-local: $(PREINSTALL_FILES)
     26all: $(PREINSTALL_FILES)
    2727
    2828include $(top_srcdir)/../../../../../automake/local.am

  • c/src/wrapup/Makefile.am

    r77b2b0e r99eb585  
    4242all: $(ARCH) $(TMPINSTALL_FILES)
    4343
    44 install: all
    45 
    4644$(LIB): $(SRCS)
    4745        rm -f $@

  • make/Makefile.am

    r77b2b0e r99eb585  
    2424## -------------------------------------------------------
    2525include $(top_srcdir)/automake/subdirs.am
    26 include $(top_srcdir)/automake/local.am
     26include $(top_srcdir)/automake/host.am

  • make/Templates/Makefile.am

    r77b2b0e r99eb585  
    1313Makefile.lib
    1414
    15 include $(top_srcdir)/automake/local.am
     15include $(top_srcdir)/automake/host.am

  • make/compilers/Makefile.am

    r77b2b0e r99eb585  
    1111
    1212## -------------------------------------------------------
    13 include $(top_srcdir)/automake/local.am
     13include $(top_srcdir)/automake/host.am

  • make/custom/Makefile.am

    r77b2b0e r99eb585  
    5656
    5757## -------------------------------------------------------
    58 include $(top_srcdir)/automake/local.am
     58include $(top_srcdir)/automake/host.am

  • make/custom/efi68k.cfg

    r77b2b0e r99eb585  
    5656else
    5757define make-exe
    58         $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -o $(basename $@).nxe \
     58        $(LINK.c) $(LDLIBS) -o $(basename $@).nxe \
    5959            $(LINK_OBJS) $(LINK_LIBS)
    6060        $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i
    6161        $(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \
    62             $(PACKHEX) > $(basename $@).exe
     62            $(PACKHEX) > $@
    6363        $(NM) -g -n $(basename $@).nxe > $(basename $@).num
    6464        $(SIZE) $(basename $@).nxe

  • make/custom/mcp750.cfg

    r77b2b0e r99eb585  
    6969# is the 604 model and that this is the default generation option.
    7070#
    71 # CPU_CFLAGS = -mcpu=750
     71CPU_CFLAGS = -mcpu=750
    7272
    7373# optimize flag: typically -0, could use -O4 or -fast
    … …  
    7979# model => not used.
    8080# Currently the sdata2 and sbss2 sections are empty => r2 is not used...
    81 CFLAGS_OPTIMIZE_V=-O4 -mmultiple -mstring -mstrict-align  -mcpu=750
     81CFLAGS_OPTIMIZE_V=-O4 -mmultiple -mstring -mstrict-align
    8282#CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions -fvolatile-global -fvolatile -mstrict-align -mcpu=750
     83
     84# debug flags: typically none, but at least -O1 is required due to this
     85# BSP using inlined code
     86CFLAGS_DEBUG_V = -O1 -mmultiple -mstring -mstrict-align
     87
    8388
    8489# The following is a ld command file which works without using the
    … …  
    95100#           -Wl,-\( -Wl,-lc -Wl,-lrtemsall -Wl,-lgcc -Wl,-\)
    96101define make-exe
    97         $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(LINK_OBJS) $(LINK_LIBS)
     102        $(LINK.c) $(LDLIBS) -o $@ $(LINK_OBJS) $(LINK_LIBS)
    98103        $(NM) -g -n $@ > $(basename $@).num
    99104        $(SIZE) $@
     105        test -d ${PROJECT_RELEASE}/bin || mkdir ${PROJECT_RELEASE}/bin
    100106        $(CP) $@ $(PROJECT_ROOT)/powerpc-rtems/c/mcp750/lib/libbsp/powerpc/$(RTEMS_BSP_FAMILY)/bootloader/$(ARCH); \
    101         cd $(PROJECT_ROOT)/powerpc-rtems/c/mcp750/lib/libbsp/powerpc/$(RTEMS_BSP_FAMILY)/bootloader; \
    102         $(MAKE) bootloader BINARY_LOADED=$(basename $@).exe; \
    103         COMPLETE_FILE_NAME=$(basename $@).exe ;\
    104         echo $${COMPLETE_FILE_NAME} ;\
    105         FILE_NAME=`basename $${COMPLETE_FILE_NAME}` ;\
    106         echo $${FILE_NAME} ;\
    107         mkdir -p $(PROJECT_ROOT)/mcp750/bin ;\
    108         $(CP) bootloader $(PROJECT_ROOT)/mcp750/bin/$${FILE_NAME}
     107        ( cd $(PROJECT_ROOT)/powerpc-rtems/c/mcp750/lib/libbsp/powerpc/$(RTEMS_BSP_FAMILY)/bootloader; \
     108        $(MAKE) bootloader BINARY_LOADED=$@; )
     109        f=`basename $@ .exe`; \
     110        cp $(PROJECT_ROOT)/powerpc-rtems/c/mcp750/lib/libbsp/powerpc/$(RTEMS_BSP_FAMILY)/bootloader/bootloader \
     111            ${PROJECT_RELEASE}/bin/$${f}$(LIB_VARIANT).exe \
     112        && chmod 755 \
     113          ${PROJECT_RELEASE}/bin/$${f}$(LIB_VARIANT).exe
    109114endef
    110115

  • make/custom/ods68302.cfg

    r77b2b0e r99eb585  
    7272else
    7373define make-exe
    74         $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) \
     74        $(LINK.c) $(LDLIBS) \
    7575            -Wl,-defsym -Wl,MC68302_BASE=$(MC68302_BASE) \
    76             -o $(basename $@).exe \
     76            -o $@ \
    7777            $(LINK_OBJS) $(LINK_LIBS)
    78         $(NM) -g -n $(basename $@).exe > $(basename $@).num
    79         $(SIZE) $(basename $@).exe
     78        $(NM) -g -n $@ > $(basename $@).num
     79        $(SIZE) $@
    8080endef
    8181endif

  • make/host.cfg.in

    r77b2b0e r99eb585  
    2727CHMOD=chmod
    2828SED=sed
    29 # Anybody using this?
    30 # M4=@M4@
    3129
    3230# Global tools
    … …  
    7573INSTDIRFLAGS  = -m 0755 -d
    7674INSTINCFLAGS  = -m 0644
    77 
    78 ifndef INSTALL_DATA
    79 INSTALL_DATA = $(INSTALL) $(INSTDATAFLAGS)
    80 endif

  • make/leaf.cfg

    r77b2b0e r99eb585  
    4343endif
    4444
     45ifndef AUTOMAKE
    4546#
    4647# Builtin targets for compilation variants
    … …  
    5758      "CFLAGS_PROFILE=$(CFLAGS_PROFILE_V)" \
    5859      "LDFLAGS_PROFILE=$(LDFLAGS_PROFILE_V)" $(TARGET_VA)
     60endif
    5961
    6062#
    … …  
    107109        -$(RM) -r $(CLOBBER_OS) $(CLOBBER_CC) $(CLOBBER_DEPEND)
    108110
     111ifndef AUTOMAKE
    109112preinstall-am:
    110113preinstall: preinstall-am
    111114
    112 ifndef AUTOMAKE
    113115distclean: distclean-am
    114116        -$(RM) ./config.status
    115117
    116118clean: clean-am
    117 endif
    118119
    119120.PHONY: distclean distclean-am
    120121.PHONY: clean clean-am
     122endif

  • tools/Makefile.am

    r77b2b0e r99eb585  
    66
    77include $(top_srcdir)/automake/subdirs.am
    8 include $(top_srcdir)/automake/local.am
     8include $(top_srcdir)/automake/host.am

  • tools/build/Makefile.am

    r77b2b0e r99eb585  
    2323noinst_SCRIPTS = search-id.sh
    2424
    25 include $(top_srcdir)/../../automake/local.am
     25include $(top_srcdir)/../../automake/host.am

  • tools/cpu/Makefile.am

    r77b2b0e r99eb585  
    1111
    1212include $(top_srcdir)/../../automake/subdirs.am
    13 include $(top_srcdir)/../../automake/local.am
     13include $(top_srcdir)/../../automake/host.am

  • tools/cpu/generic/Makefile.am

    r77b2b0e r99eb585  
    77
    88noinst_SCRIPTS=size_rtems
    9 include $(top_srcdir)/../../../automake/local.am
     9include $(top_srcdir)/../../../automake/host.am

  • tools/cpu/hppa1.1/Makefile.am

    r77b2b0e r99eb585  
    1515CPU_DIR=../../cpu/$(RTEMS_CPU)
    1616
    17 INCLUDES = \
     17AM_CPPFLAGS = \
    1818-I$(PROJECT_INCLUDE) \
    1919-I$(CPU_DIR)
    2020
    21 include $(top_srcdir)/../../../automake/local.am
     21include $(top_srcdir)/../../../automake/host.am

  • tools/cpu/sh/Makefile.am

    r77b2b0e r99eb585  
    33##
    44
    5 AUTOMAKE_OPTIONS = foreign 1.4
     5AUTOMAKE_OPTIONS = foreign 1.4 no-installman
    66ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
    77
    … …  
    1313shgen.c
    1414
    15 include $(top_srcdir)/../../../automake/local.am
     15if HELP2MAN
     16man_MANS = shgen.1
     17
     18shgen.1: $(srcdir)/shgen.c
     19        $(HELP2MAN) -N shgen >$@
     20endif
     21
     22include $(top_srcdir)/../../../automake/host.am

  • tools/cpu/sh/configure.in

    r77b2b0e r99eb585  
    99RTEMS_CANONICAL_TARGET_CPU
    1010
    11 AM_INIT_AUTOMAKE(rtems-tools-cpu-sh,$RTEMS_VERSION,no)
     11AM_INIT_AUTOMAKE(rtems-tools-cpu-sh,0.4)
    1212AM_MAINTAINER_MODE
    1313AC_EXEEXT
    … …  
    1515AC_PROG_CC
    1616AC_CHECK_LIB(m,fabs)
     17AC_CHECK_FUNCS(getopt_long)
     18AC_CHECK_PROGS(HELP2MAN,help2man)
     19AM_CONDITIONAL(HELP2MAN,test -n "$HELP2MAN" )
    1720
    1821RTEMS_TOOLPATHS

  • tools/cpu/sh/shgen.c

    r77b2b0e r99eb585  
    11/*
    2  * Copyright (c) 1998-1999 Ralf Corsepius (corsepiu@faw.uni-ulm.de)
     2 * Copyright (c) 1998,1999,2000 Ralf Corsepius (corsepiu@faw.uni-ulm.de)
    33 *
    44 * See the file COPYING for copyright notice.
    … …  
    1212#include "sci.h"
    1313
    14 static void usage( char *prog )
     14static void usage( FILE* ofile, char *prog )
    1515{
    16   fprintf( stderr, "usage: %s [options] driver\n", prog );
    17   fprintf( stderr, "options:\n" );
    18   fprintf( stderr, "\t-M Phi      .. processor frequency [MHz]\n" );
    19   fprintf( stderr, "\t-K Phi      .. processor frequency [KHz]\n" );
    20   fprintf( stderr, "\t-H Phi      .. processor frequency [Hz]\n" );
    21   fprintf( stderr, "\t\t..default 20MHz" );
    22   fprintf( stderr, "driver:\n" );
    23   fprintf( stderr, "\tsci .. bitrate table for sci\n" );
    24   exit ( 1 );
     16  fprintf( ofile, "Usage: %s [options] driver\n", prog );
     17  fprintf( ofile, "\nOptions:\n" );
     18  fprintf( ofile, "Processor frequency (default 20MHz):\n") ;
     19  fprintf( ofile, "\t-M Phi      .. processor frequency [MHz]\n" );
     20  fprintf( ofile, "\t-K Phi      .. processor frequency [KHz]\n" );
     21  fprintf( ofile, "\t-H Phi      .. processor frequency [Hz]\n" );
     22  fprintf( ofile, "Driver:\n" );
     23  fprintf( ofile, "\tsci         .. bitrate table for sci\n" );
     24
     25  fprintf( ofile, "\nWritten by Ralf Corsepius <corsepiu@faw.uni-ulm.de>\n" );
     26  fprintf( ofile, "\nCopyright (c) 1998,1999,2000\tRalf Corsepius\n" );
    2527}
     28
     29#if HAVE_GETOPT_LONG
     30#define NOARG   0
     31#define HASARG  1
     32#define OPTARG  2
     33
     34static struct option long_options[] =
     35{
     36  { "version",          NOARG,  NULL, 'v' },
     37  { "help",             NOARG,  NULL, 'h' },
     38  { "mega-hertz",       HASARG, NULL, 'M' },
     39  { "kilo-hertz",       HASARG, NULL, 'K' },
     40  { "hertz",            HASARG, NULL, 'H' },
     41  { 0, 0, 0, 0 }
     42};
     43#endif
    2644
    2745static void shgen_header( FILE *file )
    2846{
    2947  fprintf( file,
    30     "/*\n * DO NOT EDIT - this file is automatically generated by shgen 0.3\n" );
     48    "/*\n * DO NOT EDIT - this file is automatically generated by shgen %s\n",
     49    VERSION );
    3150  fprintf( file,
    32     " * Copyright (c) 1998-1999, Ralf Corsepius (corsepiu@faw.uni-ulm.de)\n */\n" );
     51    " * Copyright (c) 1998,1999,2000 Ralf Corsepius (corsepiu@faw.uni-ulm.de)\n */\n" );
    3352  fprintf( file,
    3453    "\n/* This file is not copyrighted */\n\n" );
    … …  
    3857{
    3958  double        Phi = 20.0 ;
    40  
    41   while ( ( optopt = getopt( argc, argv, "M:K:H:" ) ) > 0 )
     59
     60#if HAVE_GETOPT_LONG 
     61  int option_index = 0 ;
     62  while( ( optopt = getopt_long( argc, argv, "M:K:H:hv",
     63      long_options, &option_index ) ) > 0 )
     64#else
     65  while ( ( optopt = getopt( argc, argv, "M:K:H:hv" ) ) > 0 )
     66#endif
    4267  {
    4368    switch ( optopt )
    … …  
    5277      break ;
    5378    case 'H' :
    54       sscanf( optarg, "%lf", &Phi ); 
     79      sscanf( optarg, "%lf", &Phi );
    5580      break ;
     81    case 'h' :
     82      usage( stdout, argv[0] );
     83      exit(0);
     84    case 'v' :
     85      fprintf( stdout, "%s version %s\n", argv[0], VERSION );
     86      exit(0);
    5687    default  :
    57       usage( argv[0] );
     88      usage( stderr, argv[0] );
     89      exit(1);
    5890      break ;
    5991    }
    … …  
    6193
    6294  if ( argc - optind != 1 )
    63     usage( argv[0] );
    64 
     95  {
     96    fprintf( stderr, "%s: Missing argument: driver\n", argv[0] );
     97    exit(1);
     98  }
     99 
    65100  shgen_header( stdout );
    66101     
    … …  
    70105  }
    71106  else
    72     usage( argv[0] );
     107  {
     108    fprintf( stderr, "%s: Invalid argument: driver\n", argv[0] );
     109    exit(1);
     110  }
    73111     
    74112  return 0 ;

  • tools/cpu/unix/Makefile.am

    r77b2b0e r99eb585  
    1010gensize_SOURCES=gensize.c
    1111
    12 include $(top_srcdir)/../../../automake/local.am
     12include $(top_srcdir)/../../../automake/host.am

  • tools/update/Makefile.am

    r77b2b0e r99eb585  
    4545rtems-polish.sh
    4646
    47 include $(top_srcdir)/../../automake/local.am
     47include $(top_srcdir)/../../automake/host.am

  • tools/update/acpolish

    r77b2b0e r99eb585  
    11#!/usr/bin/perl
    22
    3 # use strict 'subs' ;
    4 # use strict 'vars' ;
    5 # use strict 'refs' ;
    6 
    7 # use strict ;
     3use strict ;
     4
     5sub print_macro($$);
    86
    97#
    … …  
    4139my @vars = () ;
    4240
    43 sub print_macro($$)
    44 {
    45   my $line = $_[0] ;
    46   my $input  = $_[1] ;
    47   $input =~ s/\\\\/ /g;
    48   my @l = split(' ',$input);
    49 
    50   foreach (@l) {
    51     if ( ( length($line) + length($_) ) < 76 )
    52     {
    53           $line .= " $_";
    54     }
    55     else
    56     {
    57            print "$line \\\n";
    58            $line = "    $_" ;
    59     }
    60   }
    61   print "$line\n" ;
    62 }
    63 
    6441# Strip off duplicate entries from a list
    6542sub purge($)
    … …  
    181158     my $files =`ls *.h 2>/dev/null`;
    182159     print STDERR "WARNING: Replacing \"\(wildcard... in $_\n" ;
    183      $line = "H_FILES =";
    184      @l = split(' ',$files) ;
     160     my $line = "H_FILES =";
     161     my @l = split(' ',$files) ;
    185162     foreach(@l) { $line .= " \$\(srcdir\)/$_"; }
    186163     $line .= "\n" ;
    … …  
    619596        print "mkinstalldirs = \$(SHELL) \$(top_srcdir)/\@RTEMS_TOPdir\@/mkinstalldirs\n\n" ;
    620597        my $line = join( ' ',@installdirs );
    621         print_macro "INSTALLDIRS =", $line ;
     598        &print_macro( "INSTALLDIRS =", $line );
    622599        print "\n\$(INSTALLDIRS):\n\t\@\$(mkinstalldirs) \$(INSTALLDIRS)\n\n" ;
    623600        $nl_seen = 1 ;
    … …  
    634611    elsif ( /^\§4(.*)$/o  )
    635612    { # pretty print a make variable
    636       print_macro "$1 =", ${"var_$1"} ;
     613      &print_macro( "$1 =", ${"var_$1"} );
    637614      $nl_seen = 0 ;
    638615    }
    639616    elsif ( /^\§5(.*)$/o  )
    640617    { # pretty print an addition to a make variable
    641       print_macro "$1 +=", ${"var_$1+"} ;
     618      &print_macro( "$1 +=", ${"var_$1+"}) ;
    642619      $nl_seen = 0 ;
    643620    }
    … …  
    679656}
    680657
    681 ;1
     658exit 0 ;
     659
     660sub print_macro($$)
     661{
     662  my ($line,$input) = @_ ;
     663  $input =~ s/\\\\/ /g;
     664  my @l = split(' ',$input);
     665
     666  foreach (@l) {
     667    if ( ( length($line) + length($_) ) < 76 )
     668    {
     669          $line .= " $_";
     670    }
     671    else
     672    {
     673           print "$line \\\n";
     674           $line = "    $_" ;
     675    }
     676  }
     677  print "$line\n" ;
     678}
     679

  • tools/update/ampolish

    r77b2b0e r99eb585  
    11#!/usr/bin/perl
     2
     3use strict ;
    24
    35#
    … …  
    2325  if (not "$pre") { $pre = "." ; }
    2426
    25   for ( $str = "$pre" . "/" . "$top" ;
     27  for ( my $str = "$pre" . "/" . "$top" ;
    2628    ( -d "$str" ) ;
    2729    $str = "$pre" . "/" . "$top" )

  • tools/update/cipolish

    r77b2b0e r99eb585  
    1313# $Id$
    1414
    15 # find relative up-path to configure.in
     15use strict ;
     16
     17my @vars = () ;
     18my @buffer = () ;
     19
     20# find relative up-path to VERSION
    1621my $rtems_cfg = &find_file(".","VERSION");
    1722my $rtems_root = &find_root() ;
    … …  
    2025$rtems_name .=  "-" . "$rtems_root" if (length($rtems_root) > 0 ) ;
    2126
    22 my @buffer = () ;
    23 
    2427while ( <> )
    2528{
    … …  
    127130    if ( /^[\s]*(RTEMS_ENABLE_LIBCDIR).*$/o )
    128131    {
    129       if (  ( not defined $var_RTEMS_PROG_CC_FOR_TARGET )
    130         and ( not defined $var_RTEMS_PROG_CXX_FOR_TARGET )
     132      if (  ( not defined $main::var_RTEMS_PROG_CC_FOR_TARGET )
     133        and ( not defined $main::var_RTEMS_PROG_CXX_FOR_TARGET )
    131134      )
    132135      {
    … …  
    166169  if (not "$pre") { $pre = "." ; }
    167170
    168   for ( $str = "$pre" . "/" . "$top" ;
     171  for ( my $str = "$pre" . "/" . "$top" ;
    169172    ( -d "$str" ) ;
    170173    $str = "$pre" . "/" . "$top" )
Note: See TracChangeset for help on using the changeset viewer.