Changeset 13482e5d in rtems


Ignore:
Timestamp:
Jul 8, 2003, 1:46:51 PM (18 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
b422de6c
Parents:
c1a72962
Message:

2003-07-08 Ralf Corsepius <corsepiu@…>

  • configure.ac: Remove (Merged-in into ../configure.ac)
  • Makefile.am: Reflect having merged configure.ac into ../configure.ac.
  • src/config.h: New.
Location:
cpukit
Files:
2 added
2 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • cpukit/itron/ChangeLog

    rc1a72962 r13482e5d  
     12003-07-08      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * configure.ac: Remove (Merged-in into ../configure.ac)
     4        * Makefile.am:
     5        Reflect having merged configure.ac into ../configure.ac.
     6        * src/config.h: New.
     7
    182003-03-06      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    29

  • cpukit/itron/Makefile.am

    rc1a72962 r13482e5d  
    33##
    44
    5 ACLOCAL_AMFLAGS = -I ../aclocal
     5include $(top_srcdir)/automake/multilib.am
     6include $(top_srcdir)/automake/compile.am
     7include $(top_srcdir)/automake/lib.am
    68
    7 include $(top_srcdir)/../automake/multilib.am
    8 include $(top_srcdir)/../automake/compile.am
    9 include $(top_srcdir)/../automake/lib.am
     9EXTRA_DIST =
    1010
    1111$(PROJECT_INCLUDE):
    … …  
    2121        $(INSTALL_DATA) $< $@
    2222
     23if HAS_ITRON
    2324## include
     25
     26noinst_HEADERS =
     27noinst_HEADERS += src/config.h
    2428
    2529include_HEADERS = include/itron.h
    … …  
    4044    $(include_itronsys_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
    4145
    42 EXTRA_DIST = include/itronsys/README
     46EXTRA_DIST += include/itronsys/README
    4347
    4448## rtems/itron
    … …  
    6468    inline/rtems/itron/semaphore.inl inline/rtems/itron/sysmgmt.inl inline/rtems/itron/task.inl \
    6569    inline/rtems/itron/time.inl inline/rtems/itron/vmempool.inl
    66 noinst_HEADERS = $(inline_H_FILES)
     70noinst_HEADERS += $(inline_H_FILES)
    6771
    6872if INLINE
    … …  
    128132OBJS = $(C_FILES:src/%.c=${ARCH}/%.$(OBJEXT))
    129133
    130 AM_CPPFLAGS += -Isrc  -D__RTEMS_INSIDE__
     134AM_CPPFLAGS += -I$(srcdir)/src  -D__RTEMS_INSIDE__
     135
     136all-local: $(PREINSTALL_FILES) ${ARCH} ${LIB}
    131137
    132138$(LIB): ${OBJS}
    133139        $(make-library)
     140endif
    134141
    135142${ARCH}/%.$(OBJEXT): src/%.c
    … …  
    141148EXTRA_DIST += $(C_FILES) $(UNUSED_C_FILES) src/TODO
    142149
    143 ## General
    144 all-local: $(PREINSTALL_FILES) ${ARCH} ${LIB}
    145 
    146 include $(top_srcdir)/../automake/local.am
     150include $(top_srcdir)/automake/local.am

  • cpukit/posix/ChangeLog

    rc1a72962 r13482e5d  
     12003-07-08      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * configure.ac: Remove (Merged-in into ../configure.ac)
     4        * Makefile.am:
     5        Reflect having merged configure.ac into ../configure.ac.
     6        * src/config.h: New.
     7
    182003-02-11      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    29

  • cpukit/posix/Makefile.am

    rc1a72962 r13482e5d  
    33##
    44
    5 ACLOCAL_AMFLAGS = -I ../aclocal
    6 
    7 include $(top_srcdir)/../automake/multilib.am
    8 include $(top_srcdir)/../automake/compile.am
    9 include $(top_srcdir)/../automake/lib.am
     5include $(top_srcdir)/automake/multilib.am
     6include $(top_srcdir)/automake/compile.am
     7include $(top_srcdir)/automake/lib.am
    108
    119EXTRA_DIST =
    … …  
    2119        $(INSTALL_DATA) $< $@
    2220
     21if HAS_POSIX
     22
    2323PREINSTALL_FILES = $(PROJECT_INCLUDE)
    2424PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix
    … …  
    2727
    2828noinst_HEADERS = include/devctl.h include/intr.h
     29noinst_HEADERS += src/config.h
    2930
    3031include_HEADERS = include/sched.h include/aio.h include/mqueue.h include/semaphore.h
    … …  
    171172#
    172173
    173 AM_CPPFLAGS += -Isrc -D__RTEMS_INSIDE__
     174AM_CPPFLAGS += -I$(srcdir)/src -D__RTEMS_INSIDE__
    174175
    175176all-local: ${ARCH} $(PREINSTALL_FILES) $(LIB)
    … …  
    177178$(LIB): ${OBJS}
    178179        $(make-library)
     180endif
    179181
    180182${ARCH}/%.$(OBJEXT): src/%.c
    … …  
    192194EXTRA_DIST += $(C_FILES) $(UNUSED_C_FILES)
    193195
    194 include $(top_srcdir)/../automake/local.am
     196include $(top_srcdir)/automake/local.am
Note: See TracChangeset for help on using the changeset viewer.