Changeset 9608320 in rtems for c/src/lib/include


Ignore:
Timestamp:
11/22/99 13:41:11 (24 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, 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.

Location:
c/src/lib/include
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/include/Makefile.am

    r75f2b0b r9608320  
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
    7 H_PIECES = chain.h console.h clockdrv.h iosupp.h ringbuf.h spurious.h \
     7H_FILES = chain.h console.h clockdrv.h iosupp.h ringbuf.h spurious.h \
    88    timerdrv.h vmeintr.h
    99
    10 noinst_HEADERS = $(H_PIECES)
     10noinst_HEADERS = $(H_FILES)
    1111
    12 TMPINSTALL_FILES = \
     12PREINSTALL_FILES = \
    1313$(PROJECT_INCLUDE) \
    1414$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%)
     
    1919        $(INSTALL_DATA) $< $@
    2020
    21 all-am: $(TMPINSTALL_FILES)
    22 debug-am: $(TMPINSTALL_FILES)
    23 profile-am: $(TMPINSTALL_FILES)
     21all-am: $(PREINSTALL_FILES)
     22debug-am: $(PREINSTALL_FILES)
     23profile-am: $(PREINSTALL_FILES)
    2424
    2525SUBDIRS = sys motorola zilog
  • c/src/lib/include/motorola/Makefile.am

    r75f2b0b r9608320  
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
    7 H_PIECES = mc68230.h mc68681.h
     7H_FILES = mc68230.h mc68681.h
    88
    9 noinst_HEADERS = $(H_PIECES)
     9noinst_HEADERS = $(H_FILES)
    1010
    11 TMPINSTALL_FILES = \
     11PREINSTALL_FILES = \
    1212$(PROJECT_INCLUDE)/motorola \
    1313$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/motorola/%)
     
    1818        $(INSTALL_DATA) $< $@
    1919
    20 all-am: $(TMPINSTALL_FILES)
    21 debug-am: $(TMPINSTALL_FILES)
    22 profile-am: $(TMPINSTALL_FILES)
     20all-am: $(PREINSTALL_FILES)
     21debug-am: $(PREINSTALL_FILES)
     22profile-am: $(PREINSTALL_FILES)
    2323
    2424include $(top_srcdir)/../../../automake/local.am
  • c/src/lib/include/sys/Makefile.am

    r75f2b0b r9608320  
    77if HAS_NETWORKING
    88else
    9 NETWORKING_H_PIECES += ioctl.h
     9NETWORKING_H_FILES += ioctl.h
    1010endif
    1111
    1212if UNIX
    1313else
    14 NEWLIB_H_PIECES += termios.h
     14NEWLIB_H_FILES += termios.h
    1515endif
    1616
    17 H_PIECES += utime.h $(NEWLIB_H_PIECES) $(NETWORKING_H_PIECES)
     17H_FILES += utime.h $(NEWLIB_H_FILES) $(NETWORKING_H_FILES)
    1818
    19 noinst_HEADERS = $(H_PIECES)
     19noinst_HEADERS = $(H_FILES)
    2020
    21 TMPINSTALL_FILES = \
     21PREINSTALL_FILES = \
    2222$(PROJECT_INCLUDE)/sys \
    2323$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/sys/%)
     
    2828        $(INSTALL_DATA) $< $@
    2929
    30 all-am: $(TMPINSTALL_FILES)
    31 debug-am: $(TMPINSTALL_FILES)
    32 profile-am: $(TMPINSTALL_FILES)
     30all-am: $(PREINSTALL_FILES)
     31debug-am: $(PREINSTALL_FILES)
     32profile-am: $(PREINSTALL_FILES)
    3333
    3434include $(top_srcdir)/../../../automake/local.am
  • c/src/lib/include/zilog/Makefile.am

    r75f2b0b r9608320  
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
    7 H_PIECES = z8036.h z8530.h z8536.h
     7H_FILES = z8036.h z8530.h z8536.h
    88
    9 noinst_HEADERS = $(H_PIECES)
     9noinst_HEADERS = $(H_FILES)
    1010
    11 TMPINSTALL_FILES = \
     11PREINSTALL_FILES = \
    1212$(PROJECT_INCLUDE)/zilog \
    1313$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/zilog/%)
     
    1818        $(INSTALL_DATA) $< $@
    1919
    20 all-am: $(TMPINSTALL_FILES)
    21 debug-am: $(TMPINSTALL_FILES)
    22 profile-am: $(TMPINSTALL_FILES)
     20all-am: $(PREINSTALL_FILES)
     21debug-am: $(PREINSTALL_FILES)
     22profile-am: $(PREINSTALL_FILES)
    2323
    2424include $(top_srcdir)/../../../automake/local.am
Note: See TracChangeset for help on using the changeset viewer.