Changeset 49ed8e7 in rtems


Ignore:
Timestamp:
10/16/01 18:50:03 (22 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
8917506d
Parents:
14a67aa9
Message:

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

  • include/zilog/Makefile.am: Remove.
  • include/motorola/Makefile.am: Remove.
  • include/sys/Makefile.am: Remove.
  • include/rtems/Makefile.am: Remove.
  • include/Makefile.am: Handle subdirs, require automake-1.5
  • Makefile.am: Require automake-1.5.
Files:
4 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • c/src/exec/libcsupport/Makefile.am

    r14a67aa9 r49ed8e7  
    33##
    44
    5 AUTOMAKE_OPTIONS = foreign 1.4
     5AUTOMAKE_OPTIONS = foreign 1.5
    66ACLOCAL_AMFLAGS = -I ../../../aclocal
    77

  • c/src/exec/libcsupport/configure.ac

    r14a67aa9 r49ed8e7  
    4040AC_CONFIG_FILES([Makefile
    4141include/Makefile
    42 include/rtems/Makefile
    43 include/sys/Makefile
    44 include/motorola/Makefile
    45 include/zilog/Makefile
    4642libc/Makefile])
    4743AC_OUTPUT

  • c/src/lib/ChangeLog

    r14a67aa9 r49ed8e7  
     12001-10-16      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * include/zilog/Makefile.am: Remove.
     4        * include/motorola/Makefile.am: Remove.
     5        * include/sys/Makefile.am: Remove.
     6        * include/rtems/Makefile.am: Remove.
     7        * include/Makefile.am: Handle subdirs, require automake-1.5
     8        * Makefile.am: Require automake-1.5.
     9
    1102001-10-12      Joel Sherrill <joel@OARcorp.com>
    211

  • c/src/lib/Makefile.am

    r14a67aa9 r49ed8e7  
    33##
    44
    5 AUTOMAKE_OPTIONS = foreign 1.4
     5AUTOMAKE_OPTIONS = foreign 1.5
    66ACLOCAL_AMFLAGS = -I ../../../aclocal
    77

  • c/src/lib/configure.ac

    r14a67aa9 r49ed8e7  
    4040AC_CONFIG_FILES([Makefile
    4141include/Makefile
    42 include/rtems/Makefile
    43 include/sys/Makefile
    44 include/motorola/Makefile
    45 include/zilog/Makefile
    4642libc/Makefile])
    4743AC_OUTPUT

  • c/src/lib/include/Makefile.am

    r14a67aa9 r49ed8e7  
    33##
    44
    5 AUTOMAKE_OPTIONS = foreign 1.4
     5AUTOMAKE_OPTIONS = foreign 1.5
    66
    77include_HEADERS = bspIo.h chain.h console.h clockdrv.h iosupp.h ringbuf.h rtc.h \
    … …  
    1313$(PROJECT_INCLUDE):
    1414        @$(mkinstalldirs) $@
     15$(PROJECT_INCLUDE)/motorola:
     16        @$(mkinstalldirs) $@
     17$(PROJECT_INCLUDE)/rtems:
     18        @$(mkinstalldirs) $@
     19$(PROJECT_INCLUDE)/sys:
     20        @$(mkinstalldirs) $@
     21$(PROJECT_INCLUDE)/zilog:
     22        @$(mkinstalldirs) $@
     23
    1524$(PROJECT_INCLUDE)/%.h: %.h
    1625        $(INSTALL_DATA) $< $@
    1726
     27## motorola
     28
     29include_motoroladir = $(includedir)/motorola
     30
     31include_motorola_HEADERS = motorola/mc68230.h motorola/mc68681.h
     32
     33PREINSTALL_FILES += $(PROJECT_INCLUDE)/motorola \
     34    $(include_motorola_HEADERS:%=$(PROJECT_INCLUDE)/%)
     35
     36## rtems
     37include_rtemsdir = $(includedir)/rtems
     38
     39include_rtems_HEADERS = \
     40    rtems/assoc.h rtems/error.h rtems/libcsupport.h rtems/libio.h rtems/libio_.h \
     41    rtems/termiostypes.h
     42
     43PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
     44    $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%)
     45
     46## sys
     47
     48include_sysdir = $(includedir)/sys
     49
     50if !HAS_NETWORKING
     51NETWORKING_H_FILES = sys/ioctl.h
     52endif
     53
     54if NEWLIB
     55NEWLIB_H_FILES = sys/termios.h sys/cdefs.h
     56endif
     57
     58include_sys_HEADERS = \
     59sys/ioccom.h \
     60sys/ttycom.h \
     61sys/utime.h \
     62$(NEWLIB_H_FILES) $(NETWORKING_H_FILES)
     63
     64PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys \
     65    $(include_sys_HEADERS:%=$(PROJECT_INCLUDE)/%)
     66
     67## zilog
     68
     69include_zilogdir = $(includedir)/zilog
     70
     71include_zilog_HEADERS = zilog/z8036.h zilog/z8530.h zilog/z8536.h
     72
     73PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog \
     74    $(include_zilog_HEADERS:%=$(PROJECT_INCLUDE)/%)
     75
     76##  General stuff
    1877all-local: $(PREINSTALL_FILES)
    1978
    20 SUBDIRS = sys rtems motorola zilog
    21 
    22 include $(top_srcdir)/../../../automake/subdirs.am
    2379include $(top_srcdir)/../../../automake/local.am

  • c/src/lib/libbsp/i960/cvme961/console/console.c

    r14a67aa9 r49ed8e7  
    1111 *  $Id$
    1212 */
    13 
    14 #define C961_INIT
    1513
    1614#include <bsp.h>

  • c/src/lib/libbsp/i960/cvme961/startup/bspstart.c

    r14a67aa9 r49ed8e7  
    1616
    1717#include <string.h>
     18
     19#define C961_INIT
    1820
    1921#include <bsp.h>

  • c/src/lib/libbsp/i960/rxgen960/include/bsp.h

    r14a67aa9 r49ed8e7  
    113113}
    114114
    115 /*
    116 #ifdef C961_INIT
     115#ifdef RXGEN960_INIT
    117116#undef BSP_EXTERN
    118117#define BSP_EXTERN
    … …  
    121120#define BSP_EXTERN extern
    122121#endif
    123 */
    124 
    125 #undef BSP_EXTERN
    126 #define BSP_EXTERN
    127122
    128123/* miscellaneous stuff assumed to exist */

  • c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c

    r14a67aa9 r49ed8e7  
    2424#include <stdio.h>
    2525 
     26#define RXGEN960_INIT
     27
    2628#include <bsp.h>
    2729#include <rtems/libio.h>

  • cpukit/libcsupport/Makefile.am

    r14a67aa9 r49ed8e7  
    33##
    44
    5 AUTOMAKE_OPTIONS = foreign 1.4
     5AUTOMAKE_OPTIONS = foreign 1.5
    66ACLOCAL_AMFLAGS = -I ../../../aclocal
    77

  • cpukit/libcsupport/configure.ac

    r14a67aa9 r49ed8e7  
    4040AC_CONFIG_FILES([Makefile
    4141include/Makefile
    42 include/rtems/Makefile
    43 include/sys/Makefile
    44 include/motorola/Makefile
    45 include/zilog/Makefile
    4642libc/Makefile])
    4743AC_OUTPUT
Note: See TracChangeset for help on using the changeset viewer.