Changeset 6693a68 in rtems for c/src/lib/libcpu/powerpc/mpc821


Ignore:
Timestamp:
07/26/99 20:00:37 (24 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
83f62bf
Parents:
b0ac03f4
Message:

This is part of a major patch from Ralf Corsepius <corsepiu@…>
to move RTEMS more to automake/autoconf and GNU compliance.

Finally, here they are: the "big-patch" patches - merged into one big
patch (~1.5MB).

Sorry for the delay, but testing took much more time than I had expected

  • esp. reworking the acpolish script triggered many more tiny issues than I had expected (cf. below).

At least, now you've got something to spend your weekend with :-.

WARNINGS:

  • I've gone a little (??) further than I had announced before.
  • Several directories have been moved.
  • Several files have been added and removed
  • I have tested it with many BSPs/CPUs and a variety of permutiations of configuration flags, but not with all.
  • Most parts of the patch are automatically generated, however there are many tiny manual modifications.

APPLYING THE PATCH:

./autogen -c
mkdir tools
mv c/src/exec/score/tools tools/cpu
mv c/build-tools tools/build
mv c/update-tools tools/update
patch -p1 -E < rtems-rc-19990709-0.diff
./autogen

If the patch doesn't apply to rtems-cvs, I would suggest that you should
try to apply it brute-force and then to run tools/update/rtems-polish.sh
-ac -am afterwards. A recursive diff between rtems-19990709 + patch and
rtems-cvs + patch then should report only a few dozen significant
changes to configuration files which need to be merged manually (IIRC, I
did not change any source files).

* Attention: There are files to be removed, moved, copied and added
in/to CVS!

NEWS/CHANGES:

  1. Configuration takes place in 3 stages: 1. per host (toplevel configure script), 2. per target (c/configure), 3. per bsp c/src/configure automatically triggered from ./configure and c/Makefile.am.
  2. Building of subdirectory c/ takes place in c/$(target_alias) for cross-targets in c/ for native targets
  3. Building of subdirectory c/src takes place in c/${target_alias}/<bsp> for cross-targets, c/<bsp> for native targets
  4. c/build-tools moved to tools/build
  5. c/src/exec/score/cpu/tools moved to tools/cpu (=cpu-tools split out)
  6. c/update-tools moved to tools/update
  7. New subdirectory c/src/make, handles files from make/ on a per BSP basis
  8. Maintainer mode support: Ie. if configuring with --enable-maintainer-mode disabled (the default), then tracking of many dependencies will be disabled in Makefiles. Esp. many dependencies for auto* generated files will be switched off in Makefiles. Ie. if not using "--enable-maintainer-mode" many auto* generated files will not be updated automatically, i.e. normal users should not be required to have auto* tools anymore (untested).
  9. Independent configuration scripts for / (toplevel), tools/build, tools/cpu, tools/update, c/, c/src/, c/src/exec, c/src/lib, c/src/tests, c/src/make
  10. Automake support for all directories above and besides c/src
  11. "preinstall" now is implemented as depth-first recursive make target
  1. host compiled tools (exception bsp-tools) are accessed in location in the build tree instead of inside the build-tree when building RTEMS.
  2. RTEMS_ROOT and PROJECT_ROOT now point to directories inside the build-tree - many tiny changes as consequence from this.
  3. --with-cross-host support removed (offically announced obsolete by cygnus)
  4. Changing the order of building libraries below c/src/lib/
  5. Former toplevel configure script broken into aclocal/*.m4 macros
  6. Newlib now detected by configure macros, RTEMS_HAS_NEWLIB removed from *cfg.
  7. sptables.h now generated by autoconf
  8. Rules for "mkinstalldirs temporary installation tree" moved from c/Makefile to subdirectories.
  9. Cpu-tools do not get installed.
  10. FIX: Use ACLOCAL_AMFLAGS instead of ACLOCAL = -I ... in Makefile.ams which are in directories with own configure scripts.
  11. Hardcoding BSP names into libbsp/.../tools to avoid RTEMS_BSP get overridden from the environment.
  12. FIX: Handling of MP_PIECES in various Makefiles
  13. FIX: Removing "::" rules from some Makefile.ins
  14. FIX: File permission chaos: (-m 444 and -m 555 vs. -m 644 and -m 755) - Now all include files use -m 644.
  15. Removed many gnumake-conditionals in Makefile.ins - Partially replaced with automake-conditional, partially replaced with conditionalized Makefile variables (... _yes_V)
  16. Massively reworked acpolish: acpolish now parses Makefile.ins and interprets parts of the Makefile.ins.
  17. FIX: Some $(wildcard $(srcdir)/*.h) macros removed / replaced with explicit lists of files in Makefile.ins.
  18. FIX: Replacing MKLIB with RANLIB in Makefile.ins
  19. HACK: Add preinstallation for pc386 specific $(PROJECT_RELEASE)/BootImgs? directory

... many more details, I can't recall

KNOWN BUGS:

  1. make [debug|profile]_install do not do what they are promissing. "make [debug|profile] install" does what "make [debug|profile]_install" has been doing. Proposal: remove [debug|profile]_install
  2. Dependencies between temporary installation tree and source tree are not yet handled correctly.
  3. Dependencies between temporary installation tree and source tree are handled ineffencently (Using INSTALL_CHANGE instead of make dependencies)
  4. RTEMS_ROOT, PROJECT_ROOT, top_builddir, RTEMS_TOPdir now are redundant.
  5. The new configure scripts still are in their infancy. They contain redundant checks and might still contain bugs, too.
  6. RTEMS autoconf Makefile.ins use a mixture of configuration information gathered in c/$(target_alias)/<bsp>/make and of information collected from their configure scripts.
  7. make dist is not fully functional
  8. Subdirectory host-/build-/target- configure options (--target, --host, --build) do not conform to Cygnus/GNU conventions.
  9. Some RTEMS autoconf Makefile.in's makefile targets are not supported in automake Makefile.ams/ins (e.g. get, clobber).
  10. Some automake standard targets are not propagated from toplevel and c/Makefile.am to autoconf subdirectories (eg. make dist).
  11. rpcgen generated files are not part of the source-tree (Automake conventions favor supplying generated files inside the source-tree, however there is no support for rpcgen generated files in automake, cf. yacc/lex support in automake).
  12. RTEMS_HAS_RDBG handling is flaky. make/*.cfg use RTEMS_HAS_RDBG per CPU, while librdb's sources can only be built per BSP. Raises the more general question whether librdbg located correctly in the source-tree.
  13. All make/*cfg files are configured per cpu, currently there is no location to store per-bsp configuration information --> bsp.cfg, per aconfig.h?
  14. "make install" without having run "make all" beforehand does not work.
  15. handling of --enable-multiprocessing seems to be broken in make/custom/*
  16. Makefile.ins still exploit many gmake features.
  17. File permisson chaos on libraries (no explict -m for libraries/rels/etc).
  18. mcp750 Makefiles are broken (Note: I *do* mean buggy - I am not talking about "not-conforming to conventions", here :-).
  19. Dependencies between configure scripts are not handled, eg. aborting "make RTEMS_BSP=<bsp>" can leave the build-tree in an unusable state.
  20. "make clean" does not delete <build-tree>/<bsp>. This is intentional for now, because rerunning "make" after "make clean" requires an explicit "make preinstall" afterwards now. This should be done automatically, but doesn't work in this case for now. To work around this problem <build-tree>/<bsp> is kept during "make clean" for now (HACK).

TODO:

  1. split out host-compiled bsp-tools
  2. Use Cygnus/GNU standards for cross-compiling target-subdir (CC=CC_FOR_TARGET .. configure --host=${target_alias} --build=`config.guess'}), to be added to toplevel configure script after splitting out bsp-tools.
  3. Exploit per cpu support directory (c/src/<cpu>)- Splitting out per-cpu libraries - Are there any?
  4. Further automake support
  5. Converting subdirectories into standalone / self-contained subdirectories (Esp. moving their headers to the same common root as their sources, eg. mv lib/include/rtems++ lib/librtems++/include/rtems++) - This is the main obstacle which prevents moving further towards automake.
  6. Propagating values from *.cfg into Makefiles instead of propagating them at make time via Makefile-fragments (i.e. try to avoid using *.cfg).
  7. Testing on cygwin host (I *do* expect cygwin specific problems).
  8. The ARCH in o-$(ARCH)-$(VARIANT) build-subdirectories is not needed anymore.

GENERAL ISSUES:

  1. Temporary installation tree -- Ian and I seem to disagree basically. Though I think that I understand his argumentation, I do not share it. IMO, his way of using the buildtree is mis-using the build-tree, relying on an inofficial feature of RTEMS's current implementation, which doesn't even work correctly in the current build-tree, though it attempts hard to do so. From my very POV, it unnecessarily complicates the structures of the source- and build-trees. It is not supported by automake (No automatic generation for the necessary rules) and complicates the transition to automake significantly (Generating the rules with an enhanced version of acpolish could be possible). As Ian correctly pointed out, here a management decision is needed - though I don't see the need to draw this decision in short terms.
  1. preinstallation generally is a sure means to spoil the structure of the source tree, IMHO (No ranting intended, I am completly serious about this one). eg. through tree dependencies. The worst problem related to this I have found in the meantime is bsp_specs. bsp_specs is part of libbsp, ie. there is *no* way to build *any* part of the source tree *without* having a BSP *preinstalled*. Note: This issue is related to issue 1., but is not identical - The difference is the change of the order make rules have to be triggered. While preinstallation triggers rules spread all over the source tree before a "make all" can be run, a temporary installation tree could also be installed by post "make all" hooks (all-local:, to be run after make all in a directory is completed) if the directories' dependencies would be a tree,
  1. Stuctural dependencies between subdirectories.
  2. Depth of the source tree (Prevents multilibbing and introduces many unnecessary configure scripts).
  3. per cpu vs. per bsp configuration (There are no real per-cpu parts yets :-).
  4. automake does not support $makefiles in AC_OUTPUT. Unlike before, we now should try to avoid RTEMS_CHECK_MAKEFILE and to hard-code as much paths to Makefiles as possible.
  5. General redesign of the source tree
  6. Main installation point - Changing it to ${prefix}/${target_alias}. ?

Besides item 8. (which is a must, IMHO), as far as I see most of them
can not be solved soon and will remain issues in the mid- to long-term
:-.

REMARKS:

  • You (as the maintainer) should always use --enable-maintainer-mode when building RTEMS to ensure that maintainer mode generated files (esp. those in c/src/make) will be updated when make/* files have changed.
  • Use @RTEMS_BSP@ in Makefile.ins and Makefile.ams below c/src/, $(RTEMS_BSP) or ${RTEMS_BSP} will be overridden from environment variables when using make RTEMS_BSP="....".
  • c/src/make is a temporary cludge until configuration issues are solved. At the moment it is configured per bsp, but contains per-target/cpu info only. Its main purpose now is to circumvent modifying make/*.cfg files, because I consider make/* to be frozen for backward compatibilty.
  • This patch should only affect configuration files. At least I do not remember having touched any source files.
  • To build the bare bsp you now need to mention it in --enable-rtemsbsp.

Example: building gensh1 and sh1/bare simultaneously:
../rtems-rc-19990709-1/configure --target=sh-rtems \
--enable-rtemsbsp="bare gensh1" \
--prefix=/tmp/rtems \
--enable-bare-cpu-cflags='-DMHZ=20 -m1
-DCPU_CONSOLE_DEVNAME=\"/dev/null\"' \
--enable-bare-cpu-model=sh7032 \
--enable-maintainer-mode \
--enable-cxx
make
make install

  • The next steps in development would be to split out bsp-tools and then to change to Cygnus/GNU canonicalization conventions for building the c/ subdirectory afterwards (i.e. many standard AC_*.m4 macros could be used instead of customized versions)

FINAL REMARK:
The issues mentioned in the lists above sound much worser than the
situation actually is. Most of them are not specific to this patch, but
are also valid for the snapshot. I just wrote down what I came across
when working on the patch over the last few weeks.

I wouldn't be too surprised if you don't like the patch at the current
point in development. I am willing to discuss details and problems, I
also have no problem if you would post-pone applying this patch to times
after 4.1, but rejecting it as a whole for all times would be a false
management decision, IMHO.

Therefore I would suggest that you, if your time constaints allow it,
should at least play a little while with this patch to understand what
is going on and before drawing a decision on how to handle this
proposal. I know this patch is neither perfect nor complete, but I
consider it to be a major breakthrough. Don't be anxious because of the
size of the patch, the core of the patch is rather small, the size is
mainly the side effect of some systematic cleanups inside the Makefiles
(result of acpolish).

Feel free to ask if you encounter problems, if you don't understand
something or if you meet bugs - I am far from being perfect and am
prepared to answer them.

Ralf.

--
Ralf Corsepius
Forschungsinstitut fuer Anwendungsorientierte Wissensverarbeitung (FAW)
Helmholtzstr. 16, 89081 Ulm, Germany Tel: +49/731/501-8690
mailto:corsepiu@… FAX: +49/731/501-999
​http://www.faw.uni-ulm.de

Location:
c/src/lib/libcpu/powerpc/mpc821
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • c/src/lib/libcpu/powerpc/mpc821/Makefile.in

    rb0ac03f4 r6693a68  
    66srcdir = @srcdir@
    77top_srcdir = @top_srcdir@
    8 top_builddir = ../../../../../..
    9 subdir = c/src/lib/libcpu/powerpc/mpc821
     8top_builddir = ../../..
     9subdir = libcpu/powerpc/mpc821
    1010
    11 INSTALL = @INSTALL@
    12 
    13 RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
     11RTEMS_ROOT = @RTEMS_ROOT@
    1412PROJECT_ROOT = @PROJECT_ROOT@
    1513
    1614VPATH = @srcdir@
    1715
    18 include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
     16include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    1917include $(RTEMS_ROOT)/make/directory.cfg
    2018
    21 SUB_DIRS=include console-generic clock timer vectors
     19INSTALL_CHANGE = @INSTALL_CHANGE@
    2220
    23 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
     21SUB_DIRS = include console-generic clock timer vectors
     22
     23Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
    2424        cd $(top_builddir) \
    2525         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

  • c/src/lib/libcpu/powerpc/mpc821/clock/Makefile.in

    rb0ac03f4 r6693a68  
    66srcdir = @srcdir@
    77top_srcdir = @top_srcdir@
    8 top_builddir = ../../../../../../..
    9 subdir = c/src/lib/libcpu/powerpc/mpc821/clock
     8top_builddir = ../../../..
     9subdir = libcpu/powerpc/mpc821/clock
    1010
    11 INSTALL = @INSTALL@
    12 
    13 RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
     11RTEMS_ROOT = @RTEMS_ROOT@
    1412PROJECT_ROOT = @PROJECT_ROOT@
    1513
    1614VPATH = @srcdir@
    1715
    18 PGM=${ARCH}/clock.rel
     16PGM = ${ARCH}/clock.rel
    1917
    2018# C source names, if any, go here -- minus the .c
    21 C_PIECES=clock
    22 C_FILES=$(C_PIECES:%=%.c)
    23 C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
     19C_PIECES = clock
     20C_FILES = $(C_PIECES:%=%.c)
     21C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
    2422
    25 H_FILES=
     23H_FILES =
    2624
    2725# Assembly source names, if any, go here -- minus the .s
    28 S_PIECES=
    29 S_FILES=$(S_PIECES:%=%.s)
    30 S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
     26S_PIECES =
     27S_FILES = $(S_PIECES:%=%.s)
     28S_O_FILES = $(S_FILES:%.s=${ARCH}/%.o)
    3129
    32 SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
    33 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
     30SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
     31OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
    3432
    35 include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
     33include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    3634include $(RTEMS_ROOT)/make/leaf.cfg
     35
     36INSTALL_CHANGE = @INSTALL_CHANGE@
    3737
    3838#
    … …  
    4040#
    4141
    42 DEFINES  +=
    43 CPPFLAGS += 
    44 CFLAGS   += $(CFLAGS_OS_V)
     42DEFINES +=
     43CPPFLAGS +=
     44CFLAGS += $(CFLAGS_OS_V)
    4545
    46 LD_PATHS  +=
    47 LD_LIBS   +=
    48 LDFLAGS   +=
     46LD_PATHS +=
     47LD_LIBS +=
     48LDFLAGS +=
    4949
    5050#
    … …  
    6161        $(make-rel)
    6262
    63 all:    ${ARCH} $(SRCS) $(PGM)
     63all: ${ARCH} $(SRCS) $(PGM)
    6464
    6565# the .rel file built here will be put into libbsp.a by
    6666#    libbsp/hppa/BSP/wrapup/Makefile
    67 install:  all
     67install: all
    6868
    69 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
     69Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
    7070        cd $(top_builddir) \
    7171         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

  • c/src/lib/libcpu/powerpc/mpc821/console-generic/Makefile.in

    rb0ac03f4 r6693a68  
    66srcdir = @srcdir@
    77top_srcdir = @top_srcdir@
    8 top_builddir = ../../../../../../..
    9 subdir = c/src/lib/libcpu/powerpc/mpc821/console-generic
     8top_builddir = ../../../..
     9subdir = libcpu/powerpc/mpc821/console-generic
    1010
    11 INSTALL = @INSTALL@
    12 
    13 RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
     11RTEMS_ROOT = @RTEMS_ROOT@
    1412PROJECT_ROOT = @PROJECT_ROOT@
    1513
    1614VPATH = @srcdir@
    1715
    18 PGM=${ARCH}/console-generic.rel
     16PGM = ${ARCH}/console-generic.rel
    1917
    2018# C source names, if any, go here -- minus the .c
    21 C_PIECES=console-generic
    22 C_FILES=$(C_PIECES:%=%.c)
    23 C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
     19C_PIECES = console-generic
     20C_FILES = $(C_PIECES:%=%.c)
     21C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
    2422
    25 H_FILES=
     23H_FILES =
    2624
    2725# Assembly source names, if any, go here -- minus the .s
    28 S_PIECES=
    29 S_FILES=$(S_PIECES:%=%.s)
    30 S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
     26S_PIECES =
     27S_FILES = $(S_PIECES:%=%.s)
     28S_O_FILES = $(S_FILES:%.s=${ARCH}/%.o)
    3129
    32 SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
    33 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
     30SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
     31OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
    3432
    35 include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
     33include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    3634include $(RTEMS_ROOT)/make/leaf.cfg
     35
     36INSTALL_CHANGE = @INSTALL_CHANGE@
    3737
    3838#
    … …  
    4040#
    4141
    42 DEFINES  +=
     42DEFINES +=
    4343CPPFLAGS +=
    44 CFLAGS   +=
     44CFLAGS +=
    4545
    46 LD_PATHS  +=
    47 LD_LIBS   +=
    48 LDFLAGS   +=
     46LD_PATHS +=
     47LD_LIBS +=
     48LDFLAGS +=
    4949
    5050#
    … …  
    6161        $(make-rel)
    6262
    63 all:    ${ARCH} $(SRCS) $(PGM)
     63all: ${ARCH} $(SRCS) $(PGM)
    6464
    6565# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
    66 install:  all
     66install: all
    6767
    68 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
     68Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
    6969        cd $(top_builddir) \
    7070         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

  • c/src/lib/libcpu/powerpc/mpc821/include/Makefile.in

    rb0ac03f4 r6693a68  
    1010srcdir = @srcdir@
    1111top_srcdir = @top_srcdir@
    12 top_builddir = ../../../../../../..
    13 subdir = c/src/lib/libcpu/powerpc/mpc821/include
     12top_builddir = ../../../..
     13subdir = libcpu/powerpc/mpc821/include
    1414
    15 INSTALL = @INSTALL@
    16 
    17 RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
     15RTEMS_ROOT = @RTEMS_ROOT@
    1816PROJECT_ROOT = @PROJECT_ROOT@
    1917
    2018VPATH = @srcdir@
    2119
    22 H_FILES = $(wildcard $(srcdir)/*.h)
    23 SRCS=$(H_FILES)
     20H_PIECES = console mpc821
     21H_FILES = $(H_PIECES:%=$(srcdir)/%.h)
     22SRCS = $(H_FILES)
    2423
    25 include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
     24include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    2625include $(RTEMS_ROOT)/make/leaf.cfg
    2726
    28 all:    install
     27INSTALL_CHANGE = @INSTALL_CHANGE@
     28mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
    2929
    30 install:
    31         $(RTEMS_ROOT)/mkinstalldirs $(PROJECT_INCLUDE)/mpc821
    32         $(INSTALL_CHANGE) -m 444 $(H_FILES) $(PROJECT_INCLUDE)/mpc821
     30INSTALLDIRS = $(PROJECT_INCLUDE)/mpc821
     31
     32$(INSTALLDIRS):
     33        @$(mkinstalldirs) $(INSTALLDIRS)
     34
     35all: install
     36
     37install:
     38        $(mkinstalldirs) $(PROJECT_INCLUDE)/mpc821
     39        @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/mpc821
    3340
    3441all: FORCEIT
    35         cd ../../../../libbsp/$(RTEMS_CPU)/${RTEMS_BSP}/include; $(MAKE) all
     42        cd ../../../../libbsp/$(RTEMS_CPU)/@RTEMS_BSP@/include; $(MAKE) all
    3643
    37 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
     44Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
    3845        cd $(top_builddir) \
    3946         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

  • c/src/lib/libcpu/powerpc/mpc821/timer/Makefile.in

    rb0ac03f4 r6693a68  
    66srcdir = @srcdir@
    77top_srcdir = @top_srcdir@
    8 top_builddir = ../../../../../../..
    9 subdir = c/src/lib/libcpu/powerpc/mpc821/timer
     8top_builddir = ../../../..
     9subdir = libcpu/powerpc/mpc821/timer
    1010
    11 INSTALL = @INSTALL@
    12 
    13 RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
     11RTEMS_ROOT = @RTEMS_ROOT@
    1412PROJECT_ROOT = @PROJECT_ROOT@
    1513
    1614VPATH = @srcdir@
    1715
    18 PGM=${ARCH}/timer.rel
     16PGM = ${ARCH}/timer.rel
    1917
    2018# C source names, if any, go here -- minus the .c
    21 C_PIECES=timer
    22 C_FILES=$(C_PIECES:%=%.c)
    23 C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
     19C_PIECES = timer
     20C_FILES = $(C_PIECES:%=%.c)
     21C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
    2422
    25 H_FILES=
     23H_FILES =
    2624
    2725# Assembly source names, if any, go here -- minus the .s
    28 S_PIECES=
    29 S_FILES=$(S_PIECES:%=%.s)
    30 S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
     26S_PIECES =
     27S_FILES = $(S_PIECES:%=%.s)
     28S_O_FILES = $(S_FILES:%.s=${ARCH}/%.o)
    3129
    32 SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
    33 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
     30SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
     31OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
    3432
    35 include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
     33include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    3634include $(RTEMS_ROOT)/make/leaf.cfg
     35
     36INSTALL_CHANGE = @INSTALL_CHANGE@
    3737
    3838#
    … …  
    4040#
    4141
    42 DEFINES  +=
     42DEFINES +=
    4343CPPFLAGS +=
    44 CFLAGS   += $(CFLAGS_OS_V)
     44CFLAGS += $(CFLAGS_OS_V)
    4545
    46 LD_PATHS  +=
    47 LD_LIBS   +=
    48 LDFLAGS   +=
     46LD_PATHS +=
     47LD_LIBS +=
     48LDFLAGS +=
    4949
    5050#
    … …  
    6161        $(make-rel)
    6262
    63 all:    ${ARCH} $(SRCS) $(PGM)
     63all: ${ARCH} $(SRCS) $(PGM)
    6464
    6565# the .rel file built here will be put into libbsp.a by
    6666#    libbsp/hppa/BSP/wrapup/Makefile
    67 install:  all
     67install: all
    6868
    69 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
     69Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
    7070        cd $(top_builddir) \
    7171         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

  • c/src/lib/libcpu/powerpc/mpc821/vectors/Makefile.in

    rb0ac03f4 r6693a68  
    66srcdir = @srcdir@
    77top_srcdir = @top_srcdir@
    8 top_builddir = ../../../../../../..
    9 subdir = c/src/lib/libcpu/powerpc/mpc821/vectors
     8top_builddir = ../../../..
     9subdir = libcpu/powerpc/mpc821/vectors
    1010
    11 INSTALL = @INSTALL@
    12 
    13 RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
     11RTEMS_ROOT = @RTEMS_ROOT@
    1412PROJECT_ROOT = @PROJECT_ROOT@
    1513
    1614VPATH = @srcdir@
    1715
    18 PGM=${ARCH}/vectors.rel
     16PGM = ${ARCH}/vectors.rel
    1917
    2018# C source names, if any, go here -- minus the .c
    21 C_PIECES=
    22 C_FILES=$(C_PIECES:%=%.c)
    23 C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
     19C_PIECES =
     20C_FILES = $(C_PIECES:%=%.c)
     21C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
    2422
    25 H_FILES=
     23H_FILES =
    2624
    2725# Assembly source names, if any, go here -- minus the .s
    28 S_PIECES=vectors align_h
    29 S_FILES=$(S_PIECES:%=%.S)
    30 S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
     26S_PIECES = vectors align_h
     27S_FILES = $(S_PIECES:%=%.S)
     28S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
    3129
    32 SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
    33 OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
     30SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
     31OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
    3432
    35 include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
     33include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    3634include $(RTEMS_ROOT)/make/leaf.cfg
     35
     36INSTALL_CHANGE = @INSTALL_CHANGE@
    3737
    3838#
    … …  
    4040#
    4141
    42 DEFINES  +=
     42DEFINES +=
    4343CPPFLAGS +=
    44 CFLAGS   +=
     44CFLAGS +=
    4545
    46 LD_PATHS  +=
    47 LD_LIBS   +=
    48 LDFLAGS   +=
     46LD_PATHS +=
     47LD_LIBS +=
     48LDFLAGS +=
    4949
    5050#
    … …  
    6161        $(make-rel)
    6262
    63 all:    ${ARCH} $(SRCS) $(PGM)
     63all: ${ARCH} $(SRCS) $(PGM)
    6464
    6565# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
    66 install:  all
     66install: all
    6767
    68 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
     68Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
    6969        cd $(top_builddir) \
    7070         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
Note: See TracChangeset for help on using the changeset viewer.