Changeset 9608320 in rtems for make/compilers


Ignore:
Timestamp:
Nov 22, 1999, 1:41:11 PM (21 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
27ea47c
Parents:
75f2b0b
Message:

Patch rtems-rc-19991117-4.diff from Ralf Corsepius <corsepiu@…>:

.. a major configuration cleanup
... major enhancement of automake support.

... and it contains a *major* breakthough:

Automake support for libchip and libmisc *LEAF* directories.

To implement this I have used several nasty tricks

  • The basical trick is to wrap an old Makefile.in's contents into a Makefile.am and still continue to use (i.e include) the old *.cfg files.
  • Replaced each INSTALL_IF_CHANGE and INSTALL_VARIANT with make dependencies
  • Add a gnu-make ifdef AUTOMAKE to main.cfg to avoid conflicts between automake and RTEMS make rules
  • Replaced each install:: and preinstall:: rule with make dependencies
  • Replaced SUB_DIRS with SUBDIRS in all Makefile.ins (Automake convention)
  • Removed each manually added autoconf substitution which automake performs automatically.

This is not yet full automake support, because using the temporary
installation directory, preinstallation in general and building variants
are in contradiction to automake's basic working principles ...

... the new Makefile.ams work still somewhat clumsy
... nevertheless they work (quite well).

WARNING:

At first glance this patch is small, but

  • it affects the whole configuration system.
  • it opens the road to introducing automake to all Makefile.ins currently not being under automake control.

JOEL> Does this remove or add any files?

Both, all Makefile.ins below libchip and libmisc get replaced with
Makefile.ams.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • make/compilers/gcc-target-default.cfg

    r75f2b0b r9608320  
    2323# NOTE: CPU_CFLAGS should probably be renamed to CPU_CPPFLAGS
    2424# NOTE: CPU_DEFINES should probably be merged with CPU_CFLAGS
    25 CPPFLAGS = $(CPU_DEFINES) $(CPU_CFLAGS) $(DEFINES) $(XCPPFLAGS)
     25CPPFLAGS += $(CPU_DEFINES) $(CPU_CFLAGS) $(DEFINES) $(XCPPFLAGS)
    2626CFLAGS   = $(CFLAGS_DEFAULT) $(XCFLAGS)
    2727CXXFLAGS = $(CFLAGS_DEFAULT) $(XCXXFLAGS)
     
    184184
    185185${ARCH}/%.o: %.c
    186         ${COMPILE.c} -o $@ $<
     186        ${COMPILE.c} $(AM_CPPFLAGS) $(AM_CFLAGS) -o $@ $<
    187187
    188188${ARCH}/%.o: %.cc
    189         ${COMPILE.cc} -o $@ $<
     189        ${COMPILE.cc} $(AM_CPPFLAGS) $(AM_CXXFLAGS) -o $@ $<
    190190
    191191${ARCH}/%.o: %.cpp
    192         ${COMPILE.cc} -o $@ $<
     192        ${COMPILE.cc} $(AM_CPPFLAGS) $(AM_CXXFLAGS) -o $@ $<
    193193
    194194${ARCH}/%.o: %.cxx
    195         ${COMPILE.cc} -o $@ $<
     195        ${COMPILE.cc} $(AM_CPPFLAGS) $(AM_CXXFLAGS) -o $@ $<
    196196
    197197${ARCH}/%.o: %.C
    198         ${COMPILE.cc} -o $@ $<
     198        ${COMPILE.cc} $(AM_CPPFLAGS) $(AM_CXXFLAGS) -o $@ $<
    199199
    200200${ARCH}/%.o: %.S
    201         ${COMPILE.S} -DASM -o $@ $<
     201        ${COMPILE.S} $(AM_CPPFLAGS) -DASM -o $@ $<
    202202
    203203# Make foo.rel from foo.o
Note: See TracChangeset for help on using the changeset viewer.