Changeset ff61414 in rtems


Ignore:
Timestamp:
Oct 16, 2001, 1:30:52 PM (18 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
a11e5d35
Parents:
5be35ee
Message:

2001-10-16 Ralf Corsepius <corsepiu@…>

  • include/rtems/Makefile.am: Remove.
  • include/rtems/Makefile.am: Remove.
  • include/Makefile.am: Handle subdirs, require automake-1.5.
  • macros/rtems/Makefile.am: Remove.
  • macros/rtems/score/Makefile.am: Remove.
  • macros/Makefile.am: Handle subdirs, require automake-1.5.
  • inline/rtems/Makefile.am: Remove.
  • inline/rtems/score/Makefile.am: Remove.
  • inline/Makefile.am: Handle subdirs, require automake-1.5.
  • Makefile.am: require automake-1.5
Files:
6 deleted
10 edited

Legend:

Unmodified
Added
Removed
  • c/src/exec/score/ChangeLog

    r5be35ee rff61414  
     1
     22001-10-16      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     3
     4        * include/rtems/Makefile.am: Remove.
     5        * include/rtems/Makefile.am: Remove.
     6        * include/Makefile.am: Handle subdirs, require automake-1.5.
     7        * macros/rtems/Makefile.am: Remove.
     8        * macros/rtems/score/Makefile.am: Remove.
     9        * macros/Makefile.am: Handle subdirs, require automake-1.5.
     10        * inline/rtems/Makefile.am: Remove.
     11        * inline/rtems/score/Makefile.am: Remove.
     12        * inline/Makefile.am: Handle subdirs, require automake-1.5.
     13        * Makefile.am: require automake-1.5
    114
    2152001-09-28      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
  • c/src/exec/score/Makefile.am

    r5be35ee rff61414  
    33##
    44
    5 AUTOMAKE_OPTIONS = foreign 1.4
     5AUTOMAKE_OPTIONS = foreign 1.5
    66
    77SUBDIRS = include inline macros cpu src
  • c/src/exec/score/include/Makefile.am

    r5be35ee rff61414  
    33##
    44
    5 AUTOMAKE_OPTIONS = foreign 1.4
     5AUTOMAKE_OPTIONS = foreign 1.5
    66
    7 SUBDIRS = rtems
     7$(PROJECT_INCLUDE)/%: %
     8        $(INSTALL_DATA) $< $@
    89
    9 include $(top_srcdir)/../../../automake/subdirs.am
     10include_rtemsdir = $(includedir)/rtems
     11
     12$(PROJECT_INCLUDE)/rtems:
     13        @$(mkinstalldirs) $@
     14
     15include_rtems_HEADERS = rtems/debug.h rtems/system.h rtems/seterr.h
     16
     17PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
     18    $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%)
     19
     20include_rtems_scoredir = $(includedir)/rtems/score
     21
     22$(PROJECT_INCLUDE)/rtems/score:
     23        @$(mkinstalldirs) $@
     24
     25# We only build multiprocessing related files if HAS_MP was defined
     26MP_H_FILES = rtems/score/mpci.h rtems/score/mppkt.h rtems/score/objectmp.h \
     27    rtems/score/threadmp.h
     28
     29# H_FILES that get installed in the rtems/score subdirectoy
     30STD_H_FILES = rtems/score/address.h rtems/score/apiext.h \
     31    rtems/score/bitfield.h rtems/score/chain.h rtems/score/context.h \
     32    rtems/score/copyrt.h rtems/score/coremsg.h rtems/score/coremutex.h \
     33    rtems/score/coresem.h rtems/score/heap.h rtems/score/interr.h \
     34    rtems/score/isr.h rtems/score/object.h rtems/score/priority.h \
     35    rtems/score/stack.h rtems/score/states.h rtems/score/sysstate.h \
     36    rtems/score/thread.h rtems/score/threadq.h rtems/score/tod.h \
     37    rtems/score/tqdata.h rtems/score/userext.h rtems/score/watchdog.h \
     38    rtems/score/wkspace.h
     39
     40if HAS_MP
     41include_rtems_score_HEADERS = $(STD_H_FILES) $(MP_H_FILES) rtems/score/cpuopts.h
     42else
     43include_rtems_score_HEADERS = $(STD_H_FILES) rtems/score/cpuopts.h
     44endif
     45
     46PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
     47    $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/%)
     48
     49# make the cpu dependent options file
     50# FIXME: We are exporting a config-header here, which is a bad idea in
     51# general
     52rtems/score/cpuopts.h: rtems/score/cpuopts-tmp.h
     53        @echo "/* target cpu dependent options file */"        >$@
     54        @echo "/* automatically generated -- DO NOT EDIT!! */" >>$@
     55        @echo                                                  >>$@
     56        @echo "#ifndef __CPU_OPTIONS_h"                        >>$@
     57        @echo "#define __CPU_OPTIONS_h"                        >>$@
     58        @echo                                                  >>$@
     59        @cat cpuopts-tmp.h                                     >>$@
     60        @echo                                                  >>$@
     61        @echo "#endif"                                         >>$@
     62
     63all-local: $(PREINSTALL_FILES)
     64
    1065include $(top_srcdir)/../../../automake/local.am
  • c/src/exec/score/inline/Makefile.am

    r5be35ee rff61414  
    33##
    44
    5 AUTOMAKE_OPTIONS = foreign 1.4
     5AUTOMAKE_OPTIONS = foreign 1.5
    66
    7 SUBDIRS = rtems
     7$(PROJECT_INCLUDE)/%: %
     8        $(INSTALL_DATA) $< $@
    89
    9 include $(top_srcdir)/../../../automake/subdirs.am
     10include_rtems_scoredir = $(includedir)/rtems/score
     11
     12$(PROJECT_INCLUDE)/rtems/score:
     13        @$(mkinstalldirs) $@
     14
     15## We only build multiprocessing related files if HAS_MP was defined
     16MP_I_FILES = rtems/score/mppkt.inl rtems/score/objectmp.inl rtems/score/threadmp.inl
     17
     18STD_I_FILES = rtems/score/address.inl rtems/score/chain.inl \
     19    rtems/score/coremsg.inl rtems/score/coremutex.inl rtems/score/coresem.inl \
     20    rtems/score/heap.inl rtems/score/isr.inl rtems/score/object.inl \
     21    rtems/score/priority.inl rtems/score/stack.inl rtems/score/states.inl \
     22    rtems/score/sysstate.inl rtems/score/thread.inl rtems/score/tod.inl \
     23    rtems/score/tqdata.inl rtems/score/userext.inl rtems/score/watchdog.inl \
     24    rtems/score/wkspace.inl
     25
     26if HAS_MP
     27I_FILES = $(STD_I_FILES) $(MP_I_FILES)
     28else
     29I_FILES = $(STD_I_FILES)
     30endif
     31
     32if INLINE
     33include_rtems_score_HEADERS = $(I_FILES)
     34
     35PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \
     36    $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/%)
     37
     38endif
     39
     40all-local: $(PREINSTALL_FILES)
     41
     42EXTRA_DIST = $(STD_I_FILES) $(MP_I_FILES)
     43
    1044include $(top_srcdir)/../../../automake/local.am
  • c/src/exec/score/macros/Makefile.am

    r5be35ee rff61414  
    33##
    44
    5 AUTOMAKE_OPTIONS = foreign 1.4
     5AUTOMAKE_OPTIONS = foreign 1.5
    66
    7 SUBDIRS = rtems
     7$(PROJECT_INCLUDE)/%: %
     8        $(INSTALL_DATA) $< $@
    89
    9 EXTRA_DIST = README
     10include_rtems_scoredir = $(includedir)/rtems/score
    1011
    11 include $(top_srcdir)/../../../automake/subdirs.am
     12$(PROJECT_INCLUDE)/rtems/score:
     13        @$(mkinstalldirs) $@
     14
     15## We only build multiprocessing related files if HAS_MP was defined
     16MP_I_FILES = rtems/score/mppkt.inl rtems/score/objectmp.inl rtems/score/threadmp.inl
     17
     18STD_I_FILES = rtems/score/address.inl rtems/score/chain.inl \
     19    rtems/score/coremsg.inl rtems/score/coremutex.inl rtems/score/coresem.inl \
     20    rtems/score/heap.inl rtems/score/isr.inl rtems/score/object.inl \
     21    rtems/score/priority.inl rtems/score/stack.inl rtems/score/states.inl \
     22    rtems/score/sysstate.inl rtems/score/thread.inl rtems/score/tod.inl \
     23    rtems/score/tqdata.inl rtems/score/userext.inl rtems/score/watchdog.inl \
     24    rtems/score/wkspace.inl
     25
     26if HAS_MP
     27I_FILES = $(STD_I_FILES) $(MP_I_FILES)
     28else
     29I_FILES = $(STD_I_FILES)
     30endif
     31
     32if MACROS
     33include_rtems_score_HEADERS = $(I_FILES)
     34
     35PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \
     36    $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/%)
     37
     38endif
     39
     40all-local: $(PREINSTALL_FILES)
     41
     42EXTRA_DIST = $(STD_I_FILES) $(MP_I_FILES) README
     43
    1244include $(top_srcdir)/../../../automake/local.am
  • cpukit/score/ChangeLog

    r5be35ee rff61414  
     1
     22001-10-16      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     3
     4        * include/rtems/Makefile.am: Remove.
     5        * include/rtems/Makefile.am: Remove.
     6        * include/Makefile.am: Handle subdirs, require automake-1.5.
     7        * macros/rtems/Makefile.am: Remove.
     8        * macros/rtems/score/Makefile.am: Remove.
     9        * macros/Makefile.am: Handle subdirs, require automake-1.5.
     10        * inline/rtems/Makefile.am: Remove.
     11        * inline/rtems/score/Makefile.am: Remove.
     12        * inline/Makefile.am: Handle subdirs, require automake-1.5.
     13        * Makefile.am: require automake-1.5
    114
    2152001-09-28      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
  • cpukit/score/Makefile.am

    r5be35ee rff61414  
    33##
    44
    5 AUTOMAKE_OPTIONS = foreign 1.4
     5AUTOMAKE_OPTIONS = foreign 1.5
    66
    77SUBDIRS = include inline macros cpu src
  • cpukit/score/include/Makefile.am

    r5be35ee rff61414  
    33##
    44
    5 AUTOMAKE_OPTIONS = foreign 1.4
     5AUTOMAKE_OPTIONS = foreign 1.5
    66
    7 SUBDIRS = rtems
     7$(PROJECT_INCLUDE)/%: %
     8        $(INSTALL_DATA) $< $@
    89
    9 include $(top_srcdir)/../../../automake/subdirs.am
     10include_rtemsdir = $(includedir)/rtems
     11
     12$(PROJECT_INCLUDE)/rtems:
     13        @$(mkinstalldirs) $@
     14
     15include_rtems_HEADERS = rtems/debug.h rtems/system.h rtems/seterr.h
     16
     17PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
     18    $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%)
     19
     20include_rtems_scoredir = $(includedir)/rtems/score
     21
     22$(PROJECT_INCLUDE)/rtems/score:
     23        @$(mkinstalldirs) $@
     24
     25# We only build multiprocessing related files if HAS_MP was defined
     26MP_H_FILES = rtems/score/mpci.h rtems/score/mppkt.h rtems/score/objectmp.h \
     27    rtems/score/threadmp.h
     28
     29# H_FILES that get installed in the rtems/score subdirectoy
     30STD_H_FILES = rtems/score/address.h rtems/score/apiext.h \
     31    rtems/score/bitfield.h rtems/score/chain.h rtems/score/context.h \
     32    rtems/score/copyrt.h rtems/score/coremsg.h rtems/score/coremutex.h \
     33    rtems/score/coresem.h rtems/score/heap.h rtems/score/interr.h \
     34    rtems/score/isr.h rtems/score/object.h rtems/score/priority.h \
     35    rtems/score/stack.h rtems/score/states.h rtems/score/sysstate.h \
     36    rtems/score/thread.h rtems/score/threadq.h rtems/score/tod.h \
     37    rtems/score/tqdata.h rtems/score/userext.h rtems/score/watchdog.h \
     38    rtems/score/wkspace.h
     39
     40if HAS_MP
     41include_rtems_score_HEADERS = $(STD_H_FILES) $(MP_H_FILES) rtems/score/cpuopts.h
     42else
     43include_rtems_score_HEADERS = $(STD_H_FILES) rtems/score/cpuopts.h
     44endif
     45
     46PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
     47    $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/%)
     48
     49# make the cpu dependent options file
     50# FIXME: We are exporting a config-header here, which is a bad idea in
     51# general
     52rtems/score/cpuopts.h: rtems/score/cpuopts-tmp.h
     53        @echo "/* target cpu dependent options file */"        >$@
     54        @echo "/* automatically generated -- DO NOT EDIT!! */" >>$@
     55        @echo                                                  >>$@
     56        @echo "#ifndef __CPU_OPTIONS_h"                        >>$@
     57        @echo "#define __CPU_OPTIONS_h"                        >>$@
     58        @echo                                                  >>$@
     59        @cat cpuopts-tmp.h                                     >>$@
     60        @echo                                                  >>$@
     61        @echo "#endif"                                         >>$@
     62
     63all-local: $(PREINSTALL_FILES)
     64
    1065include $(top_srcdir)/../../../automake/local.am
  • cpukit/score/inline/Makefile.am

    r5be35ee rff61414  
    33##
    44
    5 AUTOMAKE_OPTIONS = foreign 1.4
     5AUTOMAKE_OPTIONS = foreign 1.5
    66
    7 SUBDIRS = rtems
     7$(PROJECT_INCLUDE)/%: %
     8        $(INSTALL_DATA) $< $@
    89
    9 include $(top_srcdir)/../../../automake/subdirs.am
     10include_rtems_scoredir = $(includedir)/rtems/score
     11
     12$(PROJECT_INCLUDE)/rtems/score:
     13        @$(mkinstalldirs) $@
     14
     15## We only build multiprocessing related files if HAS_MP was defined
     16MP_I_FILES = rtems/score/mppkt.inl rtems/score/objectmp.inl rtems/score/threadmp.inl
     17
     18STD_I_FILES = rtems/score/address.inl rtems/score/chain.inl \
     19    rtems/score/coremsg.inl rtems/score/coremutex.inl rtems/score/coresem.inl \
     20    rtems/score/heap.inl rtems/score/isr.inl rtems/score/object.inl \
     21    rtems/score/priority.inl rtems/score/stack.inl rtems/score/states.inl \
     22    rtems/score/sysstate.inl rtems/score/thread.inl rtems/score/tod.inl \
     23    rtems/score/tqdata.inl rtems/score/userext.inl rtems/score/watchdog.inl \
     24    rtems/score/wkspace.inl
     25
     26if HAS_MP
     27I_FILES = $(STD_I_FILES) $(MP_I_FILES)
     28else
     29I_FILES = $(STD_I_FILES)
     30endif
     31
     32if INLINE
     33include_rtems_score_HEADERS = $(I_FILES)
     34
     35PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \
     36    $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/%)
     37
     38endif
     39
     40all-local: $(PREINSTALL_FILES)
     41
     42EXTRA_DIST = $(STD_I_FILES) $(MP_I_FILES)
     43
    1044include $(top_srcdir)/../../../automake/local.am
  • cpukit/score/macros/Makefile.am

    r5be35ee rff61414  
    33##
    44
    5 AUTOMAKE_OPTIONS = foreign 1.4
     5AUTOMAKE_OPTIONS = foreign 1.5
    66
    7 SUBDIRS = rtems
     7$(PROJECT_INCLUDE)/%: %
     8        $(INSTALL_DATA) $< $@
    89
    9 EXTRA_DIST = README
     10include_rtems_scoredir = $(includedir)/rtems/score
    1011
    11 include $(top_srcdir)/../../../automake/subdirs.am
     12$(PROJECT_INCLUDE)/rtems/score:
     13        @$(mkinstalldirs) $@
     14
     15## We only build multiprocessing related files if HAS_MP was defined
     16MP_I_FILES = rtems/score/mppkt.inl rtems/score/objectmp.inl rtems/score/threadmp.inl
     17
     18STD_I_FILES = rtems/score/address.inl rtems/score/chain.inl \
     19    rtems/score/coremsg.inl rtems/score/coremutex.inl rtems/score/coresem.inl \
     20    rtems/score/heap.inl rtems/score/isr.inl rtems/score/object.inl \
     21    rtems/score/priority.inl rtems/score/stack.inl rtems/score/states.inl \
     22    rtems/score/sysstate.inl rtems/score/thread.inl rtems/score/tod.inl \
     23    rtems/score/tqdata.inl rtems/score/userext.inl rtems/score/watchdog.inl \
     24    rtems/score/wkspace.inl
     25
     26if HAS_MP
     27I_FILES = $(STD_I_FILES) $(MP_I_FILES)
     28else
     29I_FILES = $(STD_I_FILES)
     30endif
     31
     32if MACROS
     33include_rtems_score_HEADERS = $(I_FILES)
     34
     35PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \
     36    $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/%)
     37
     38endif
     39
     40all-local: $(PREINSTALL_FILES)
     41
     42EXTRA_DIST = $(STD_I_FILES) $(MP_I_FILES) README
     43
    1244include $(top_srcdir)/../../../automake/local.am
Note: See TracChangeset for help on using the changeset viewer.