Changeset fba12eb6 in rtems


Ignore:
Timestamp:
Nov 23, 1999, 1:29:04 PM (21 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
6e9ad6c
Parents:
b0ab1d74
Message:

Patch rtems-rc-19991117-11.diff from Ralf Corsepius <corsepiu@…>
to convert the libc directory to automake and "dozens of
small fixes for Makefile.ins/configure.ins below c/src/lib."

Files:
18 added
52 deleted
12 edited
1 moved

Legend:

Unmodified
Added
Removed
  • c/src/exec/posix/Makefile.am

    rb0ab1d74 rfba12eb6  
    66ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
    77
    8 SUBDIRS = include inline macros src
     8SUBDIRS = include inline macros src optman
    99
    1010include $(top_srcdir)/../../../../automake/subdirs.am
  • c/src/exec/posix/include/Makefile.am

    rb0ab1d74 rfba12eb6  
    66
    77## RTEMS unistd.h needs to be checked against newlib's and removed
    8 #noinst_HEADERS= devctl.h intr.h
     8UNUSED_H_FILES = devctl.h intr.h unistd.h
     9
    910H_FILES = pthread.h sched.h aio.h mqueue.h semaphore.h
    1011
     
    2627SUBDIRS = rtems sys
    2728
    28 EXTRA_DIST = intr.h devctl.h
     29EXTRA_DIST = $(UNUSED_H_FILES)
    2930
    3031include $(top_srcdir)/../../../../automake/subdirs.am
  • c/src/exec/posix/include/rtems/posix/Makefile.am

    rb0ab1d74 rfba12eb6  
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
     7MP_H_FILES = condmp.h mqueuemp.h mutexmp.h pthreadmp.h semaphoremp.h
     8
     9STD_H_FILES = cancel.h cond.h config.h key.h mqueue.h mutex.h posixapi.h \
     10    priority.h psignal.h pthread.h ptimer.h semaphore.h seterr.h threadsup.h \
     11    time.h timer.h $(MP_H_FILES)
     12
     13UNUSED_H_FILES= intr.h threadsup.h
     14
    715if HAS_MP
    8 ## We only build multiprocessing related files if HAS_MP was defined
    9 MP_H_FILES = condmp.h mqueuemp.h mutexmp.h pthreadmp.h semaphoremp.h
     16H_FILES = $(STD_H_FILES) $(MP_H_FILES)
     17else
     18H_FILES = $(STD_H_FILES)
    1019endif
    1120
    12 H_FILES = cancel.h cond.h config.h key.h mqueue.h mutex.h posixapi.h \
    13     priority.h psignal.h pthread.h ptimer.h semaphore.h seterr.h threadsup.h \
    14     time.h timer.h $(MP_H_FILES)
    15 #H_FILES= intr.h threadsup.h time.h
    16 
    17 noinst_HEADERS = $(H_FILES)
     21noinst_HEADERS = $(STD_H_FILES) $(MP_H_FILES)
    1822
    1923PREINSTALL_FILES = \
     
    3034profile-am: $(PREINSTALL_FILES)
    3135
     36EXTRA_DIST = $(UNUSED_H_FILES)
     37
    3238include $(top_srcdir)/../../../../automake/local.am
  • c/src/exec/posix/inline/rtems/posix/Makefile.am

    rb0ab1d74 rfba12eb6  
    44
    55AUTOMAKE_OPTIONS = foreign 1.4
    6 if INLINE
    76#I_FILES= intr.inl
    87I_FILES = cond.inl key.inl mqueue.inl mutex.inl pthread.inl priority.inl \
     
    1110noinst_HEADERS = $(I_FILES)
    1211
     12if INLINE
    1313PREINSTALL_FILES = \
    1414$(PROJECT_INCLUDE)/rtems/posix \
  • c/src/exec/rtems/include/rtems/rtems/Makefile.am

    rb0ab1d74 rfba12eb6  
    66
    77## We only build multiprocessing related files if HAS_MP was defined
    8 if HAS_MP
    98MP_H_FILES = eventmp.h mp.h msgmp.h partmp.h regionmp.h semmp.h \
    109    signalmp.h taskmp.h
     10
     11STD_H_FILES = asr.h attr.h clock.h config.h dpmem.h event.h eventset.h intr.h \
     12    message.h modes.h options.h part.h ratemon.h region.h rtemsapi.h sem.h \
     13    signal.h status.h support.h tasks.h timer.h types.h
     14
     15if HAS_MP
     16H_FILES = $(STD_HFILES) $(MP_H_FILES)
     17else
     18H_FILES = $(STD_H_FILES)
    1119endif
    1220
    13 H_FILES = asr.h attr.h clock.h config.h dpmem.h event.h eventset.h intr.h \
    14     message.h modes.h options.h part.h ratemon.h region.h rtemsapi.h sem.h \
    15     signal.h status.h support.h tasks.h timer.h types.h $(MP_H_FILES)
    16 
    17 noinst_HEADERS = $(H_FILES)
     21noinst_HEADERS = $(STD_H_FILES) $(MP_H_FILES)
    1822
    1923PREINSTALL_FILES = \
    2024$(PROJECT_INCLUDE)/rtems/rtems \
    21 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
     25$(H_FILES:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
    2226
    2327$(PROJECT_INCLUDE)/rtems/rtems:
  • c/src/exec/rtems/macros/rtems/rtems/Makefile.am

    rb0ab1d74 rfba12eb6  
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
    7 if MACROS
    87I_FILES = asr.inl attr.inl dpmem.inl event.inl eventset.inl message.inl \
    98    modes.inl options.inl part.inl ratemon.inl \
     
    1211noinst_HEADERS = $(I_FILES)
    1312
     13if MACROS
     14
    1415PREINSTALL_FILES = \
    1516$(PROJECT_INCLUDE)/rtems/rtems \
    16 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
     17$(I_FILES:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
    1718
    1819$(PROJECT_INCLUDE)/rtems/rtems:
  • c/src/exec/sapi/macros/rtems/Makefile.am

    rb0ab1d74 rfba12eb6  
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
    7 if MACROS
    87I_FILES = extension.inl
    98
    109noinst_HEADERS = $(I_FILES)
    1110
     11if MACROS
    1212PREINSTALL_FILES = \
    1313$(PROJECT_INCLUDE)/rtems \
  • c/src/exec/score/cpu/Makefile.in

    rb0ab1d74 rfba12eb6  
    77top_srcdir = @top_srcdir@
    88top_builddir = .
     9
     10ACLOCAL = aclocal
     11AUTOCONF = autoconf
     12ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     13ACLOCAL_AMFLAGS = -I @RTEMS_TOPdir@/aclocal
    914
    1015RTEMS_ROOT = @RTEMS_ROOT@
     
    2025SUBDIRS = $(RTEMS_CPU)
    2126
     27# HACK: Don't let them fail here
     28dist:
     29distdir:
     30
    2231Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    2332        cd $(top_builddir) \
    2433         && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
     34
     35$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in
     36        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
     37
     38config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
     39        $(SHELL) ./config.status --recheck
     40
     41$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4)
     42        cd $(srcdir) && $(AUTOCONF)
     43
  • c/src/exec/score/include/rtems/score/Makefile.am

    rb0ab1d74 rfba12eb6  
    1 #
    2 #  $Id$
    3 #
     1##
     2##  $Id$
     3##
    44
    5 @SET_MAKE@
    6 srcdir = @srcdir@
    7 top_srcdir = @top_srcdir@
    8 top_builddir = ../../../..
    9 subdir = score/include/rtems/score
    10 
    11 RTEMS_ROOT = @RTEMS_ROOT@
    12 PROJECT_ROOT = @PROJECT_ROOT@
    13 
    14 VPATH = @srcdir@
     5AUTOMAKE_OPTIONS = foreign 1.4
    156
    167include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    178include $(RTEMS_ROOT)/make/leaf.cfg
    189
    19 INSTALL_CHANGE = @INSTALL_CHANGE@
    20 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
    21 
    22 INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score
    23 
    24 $(INSTALLDIRS):
    25         @$(mkinstalldirs) $(INSTALLDIRS)
    26 
    2710# We only build multiprocessing related files if HAS_MP was defined
    28 MP_H_PIECES_yes_V = mpci mppkt objectmp threadmp
    29 MP_H_PIECES = $(MP_H_PIECES_$(HAS_MP)_V)
     11MP_H_FILES = mpci.h mppkt.h objectmp.h threadmp.h
    3012
    3113# H_FILES that get installed in the rtems/score subdirectoy
    32 H_PIECES = address apiext bitfield chain context copyrt coremsg coremutex \
    33     coresem heap interr isr object priority stack states sysstate thread \
    34     threadq tod tqdata userext watchdog wkspace $(MP_H_PIECES)
    35 H_FILES = $(H_PIECES:%=$(srcdir)/%.h)
     14STD_H_FILES = address.h apiext.h bitfield.h chain.h context.h copyrt.h coremsg.h \
     15    coremutex.h coresem.h heap.h interr.h isr.h object.h priority.h stack.h \
     16    states.h sysstate.h thread.h threadq.h tod.h tqdata.h userext.h \
     17    watchdog.h wkspace.h
    3618TARGOPTS = targopts.h
    3719
    38 SRCS = $(H_FILES) $(TARGOPTS)
     20if HAS_MP
     21H_FILES = $(STD_H_FILES) $(TARGOPTS) $(MP_H_FILES)
     22else
     23H_FILES = $(STD_H_FILES) $(TARGOPTS)
     24endif
    3925
    40 RTEMS_USE_NEWLIB = @RTEMS_USE_NEWLIB@
    41 HAS_ITRON_API = @HAS_ITRON_API@
     26PREINSTALL_FILES = \
     27$(PROJECT_INCLUDE)/rtems/score \
     28$(H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
     29
     30$(PROJECT_INCLUDE)/rtems/score:
     31        @$(mkinstalldirs) $@
     32
     33$(PROJECT_INCLUDE)/rtems/score/%.h: %.h
     34        $(INSTALL_DATA) $< $@
    4235
    4336#
     
    4841#
    4942
    50 CLEAN_ADDITIONS += $(TARGOPTS)
    51 CLOBBER_ADDITIONS +=
     43CLEANFILES += $(TARGOPTS)
    5244
    5345# Until RTEMS_CPU is removed from all the make configuration files,
     
    10597        @echo "#endif"                                         >>$@
    10698
    107 all: preinstall
     99all: $(PREINSTALL_FILES)
    108100
    109 preinstall: $(INSTALLDIRS) $(H_FILES) $(TARGOPTS)
    110         @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score
    111         @$(INSTALL_CHANGE) -m 644 $(TARGOPTS) $(PROJECT_INCLUDE)/rtems/score
     101EXTRA_DIST = $(STD_H_FILES) $(MP_H_FILES)
    112102
    113 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    114         cd $(top_builddir) \
    115          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
     103include $(top_srcdir)/../../../automake/local.am
  • c/src/exec/score/inline/rtems/score/Makefile.am

    rb0ab1d74 rfba12eb6  
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
    7 if INLINE
    87## We only build multiprocessing related files if HAS_MP was defined
     8MP_I_FILES = mppkt.inl objectmp.inl threadmp.inl
     9
     10STD_I_FILES = address.inl chain.inl coremsg.inl coremutex.inl coresem.inl \
     11    heap.inl isr.inl object.inl priority.inl stack.inl states.inl \
     12    sysstate.inl thread.inl tod.inl tqdata.inl userext.inl watchdog.inl \
     13    wkspace.inl
     14
    915if HAS_MP
    10 MP_I_FILES = mppkt.inl objectmp.inl threadmp.inl
     16I_FILES = $(STD_I_FILES) $(MP_I_FILES)
     17else
     18I_FILES = $(STD_I_FILES)
    1119endif
    1220
    13 I_FILES = address.inl chain.inl coremsg.inl coremutex.inl coresem.inl \
    14     heap.inl isr.inl object.inl priority.inl stack.inl states.inl \
    15     sysstate.inl thread.inl tod.inl tqdata.inl userext.inl watchdog.inl \
    16     wkspace.inl $(MP_I_FILES)
     21noinst_HEADERS = $(STD_I_FILES) $(MP_I_FILES)
    1722
    18 noinst_HEADERS = $(I_FILES)
    19 
     23if INLINE
    2024PREINSTALL_FILES = \
    2125$(PROJECT_INCLUDE)/rtems/score \
    22 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/score/%)
     26$(I_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
    2327
    2428$(PROJECT_INCLUDE)/rtems/score:
  • c/src/exec/score/macros/rtems/score/Makefile.am

    rb0ab1d74 rfba12eb6  
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
    7 EXTRA_DIST = README
     7## We only build multiprocessing related files if HAS_MP was defined
     8MP_I_FILES = mppkt.inl objectmp.inl threadmp.inl
     9
     10STD_I_FILES = address.inl chain.inl coremsg.inl coremutex.inl coresem.inl heap.inl \
     11    isr.inl object.inl priority.inl stack.inl states.inl sysstate.inl \
     12    thread.inl tod.inl tqdata.inl userext.inl watchdog.inl wkspace.inl
     13
     14noinst_HEADERS = $(STD_I_FILES) $(MP_I_FILES)
    815
    916if MACROS
    1017if HAS_MP
    11 ## We only build multiprocessing related files if HAS_MP was defined
    12 MP_I_FILES = mppkt.inl objectmp.inl threadmp.inl
     18I_FILES = $(STD_I_FILES) $(MP_I_FILES)
     19else
     20I_FILES = $(STD_I_FILES
    1321endif
    1422
    15 I_FILES = address.inl chain.inl coremsg.inl coremutex.inl coresem.inl heap.inl \
    16     isr.inl object.inl priority.inl stack.inl states.inl sysstate.inl \
    17     thread.inl tod.inl tqdata.inl userext.inl watchdog.inl wkspace.inl \
    18     $(MP_I_FILES)
    19 
    20 noinst_HEADERS = $(I_FILES)
    21 
    2223PREINSTALL_FILES = \
    23 $(PROJECT_INCLUDE) \
    24 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%)
     24$(PROJECT_INCLUDE)/rtems/score \
     25$(I_FILES:%=$(PROJECT_INCLUDE)/rtems/score%)
    2526
    2627$(PROJECT_INCLUDE)/rtems/score:
  • cpukit/posix/Makefile.am

    rb0ab1d74 rfba12eb6  
    66ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
    77
    8 SUBDIRS = include inline macros src
     8SUBDIRS = include inline macros src optman
    99
    1010include $(top_srcdir)/../../../../automake/subdirs.am
  • cpukit/posix/include/Makefile.am

    rb0ab1d74 rfba12eb6  
    66
    77## RTEMS unistd.h needs to be checked against newlib's and removed
    8 #noinst_HEADERS= devctl.h intr.h
     8UNUSED_H_FILES = devctl.h intr.h unistd.h
     9
    910H_FILES = pthread.h sched.h aio.h mqueue.h semaphore.h
    1011
     
    2627SUBDIRS = rtems sys
    2728
    28 EXTRA_DIST = intr.h devctl.h
     29EXTRA_DIST = $(UNUSED_H_FILES)
    2930
    3031include $(top_srcdir)/../../../../automake/subdirs.am
Note: See TracChangeset for help on using the changeset viewer.