From 49ed8e775846ec69a1100c7d5ae26b0d68cf6db8 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 16 Oct 2001 18:50:03 +0000 Subject: 2001-10-16 Ralf Corsepius * 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. --- c/src/exec/libcsupport/Makefile.am | 2 +- c/src/exec/libcsupport/configure.ac | 4 -- c/src/lib/ChangeLog | 9 ++++ c/src/lib/Makefile.am | 2 +- c/src/lib/configure.ac | 4 -- c/src/lib/include/Makefile.am | 64 +++++++++++++++++++++-- c/src/lib/include/motorola/Makefile.am | 21 -------- c/src/lib/include/rtems/Makefile.am | 21 -------- c/src/lib/include/sys/Makefile.am | 33 ------------ c/src/lib/include/zilog/Makefile.am | 21 -------- c/src/lib/libbsp/i960/cvme961/console/console.c | 2 - c/src/lib/libbsp/i960/cvme961/startup/bspstart.c | 2 + c/src/lib/libbsp/i960/rxgen960/include/bsp.h | 7 +-- c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c | 2 + 14 files changed, 76 insertions(+), 118 deletions(-) delete mode 100644 c/src/lib/include/motorola/Makefile.am delete mode 100644 c/src/lib/include/rtems/Makefile.am delete mode 100644 c/src/lib/include/sys/Makefile.am delete mode 100644 c/src/lib/include/zilog/Makefile.am (limited to 'c/src') diff --git a/c/src/exec/libcsupport/Makefile.am b/c/src/exec/libcsupport/Makefile.am index 7242c7acf3..c21fa52c12 100644 --- a/c/src/exec/libcsupport/Makefile.am +++ b/c/src/exec/libcsupport/Makefile.am @@ -2,7 +2,7 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 ACLOCAL_AMFLAGS = -I ../../../aclocal SUBDIRS = include libc diff --git a/c/src/exec/libcsupport/configure.ac b/c/src/exec/libcsupport/configure.ac index 2665f553f0..ef50a21f9d 100644 --- a/c/src/exec/libcsupport/configure.ac +++ b/c/src/exec/libcsupport/configure.ac @@ -39,9 +39,5 @@ AM_CONFIG_HEADER(libc/config.h) # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile include/Makefile -include/rtems/Makefile -include/sys/Makefile -include/motorola/Makefile -include/zilog/Makefile libc/Makefile]) AC_OUTPUT diff --git a/c/src/lib/ChangeLog b/c/src/lib/ChangeLog index 5c09b91c8e..c515b4712f 100644 --- a/c/src/lib/ChangeLog +++ b/c/src/lib/ChangeLog @@ -1,3 +1,12 @@ +2001-10-16 Ralf Corsepius + + * 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. + 2001-10-12 Joel Sherrill * include/chain.h: Fixed typo. diff --git a/c/src/lib/Makefile.am b/c/src/lib/Makefile.am index 7242c7acf3..c21fa52c12 100644 --- a/c/src/lib/Makefile.am +++ b/c/src/lib/Makefile.am @@ -2,7 +2,7 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 ACLOCAL_AMFLAGS = -I ../../../aclocal SUBDIRS = include libc diff --git a/c/src/lib/configure.ac b/c/src/lib/configure.ac index 2665f553f0..ef50a21f9d 100644 --- a/c/src/lib/configure.ac +++ b/c/src/lib/configure.ac @@ -39,9 +39,5 @@ AM_CONFIG_HEADER(libc/config.h) # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile include/Makefile -include/rtems/Makefile -include/sys/Makefile -include/motorola/Makefile -include/zilog/Makefile libc/Makefile]) AC_OUTPUT diff --git a/c/src/lib/include/Makefile.am b/c/src/lib/include/Makefile.am index 29652d714d..2bb731f2ee 100644 --- a/c/src/lib/include/Makefile.am +++ b/c/src/lib/include/Makefile.am @@ -2,7 +2,7 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 include_HEADERS = bspIo.h chain.h console.h clockdrv.h iosupp.h ringbuf.h rtc.h \ spurious.h timerdrv.h vmeintr.h @@ -12,12 +12,68 @@ PREINSTALL_FILES = $(PROJECT_INCLUDE) \ $(PROJECT_INCLUDE): @$(mkinstalldirs) $@ +$(PROJECT_INCLUDE)/motorola: + @$(mkinstalldirs) $@ +$(PROJECT_INCLUDE)/rtems: + @$(mkinstalldirs) $@ +$(PROJECT_INCLUDE)/sys: + @$(mkinstalldirs) $@ +$(PROJECT_INCLUDE)/zilog: + @$(mkinstalldirs) $@ + $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -all-local: $(PREINSTALL_FILES) +## motorola + +include_motoroladir = $(includedir)/motorola + +include_motorola_HEADERS = motorola/mc68230.h motorola/mc68681.h + +PREINSTALL_FILES += $(PROJECT_INCLUDE)/motorola \ + $(include_motorola_HEADERS:%=$(PROJECT_INCLUDE)/%) + +## rtems +include_rtemsdir = $(includedir)/rtems + +include_rtems_HEADERS = \ + rtems/assoc.h rtems/error.h rtems/libcsupport.h rtems/libio.h rtems/libio_.h \ + rtems/termiostypes.h + +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \ + $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%) -SUBDIRS = sys rtems motorola zilog +## sys + +include_sysdir = $(includedir)/sys + +if !HAS_NETWORKING +NETWORKING_H_FILES = sys/ioctl.h +endif + +if NEWLIB +NEWLIB_H_FILES = sys/termios.h sys/cdefs.h +endif + +include_sys_HEADERS = \ +sys/ioccom.h \ +sys/ttycom.h \ +sys/utime.h \ +$(NEWLIB_H_FILES) $(NETWORKING_H_FILES) + +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys \ + $(include_sys_HEADERS:%=$(PROJECT_INCLUDE)/%) + +## zilog + +include_zilogdir = $(includedir)/zilog + +include_zilog_HEADERS = zilog/z8036.h zilog/z8530.h zilog/z8536.h + +PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog \ + $(include_zilog_HEADERS:%=$(PROJECT_INCLUDE)/%) + +## General stuff +all-local: $(PREINSTALL_FILES) -include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/include/motorola/Makefile.am b/c/src/lib/include/motorola/Makefile.am deleted file mode 100644 index 06bb3cda89..0000000000 --- a/c/src/lib/include/motorola/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -include_motoroladir = $(includedir)/motorola - -include_motorola_HEADERS = mc68230.h mc68681.h - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/motorola \ - $(include_motorola_HEADERS:%=$(PROJECT_INCLUDE)/motorola/%) - -$(PROJECT_INCLUDE)/motorola: - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/motorola/%.h: %.h - $(INSTALL_DATA) $< $@ - -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/include/rtems/Makefile.am b/c/src/lib/include/rtems/Makefile.am deleted file mode 100644 index b10c786f59..0000000000 --- a/c/src/lib/include/rtems/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -include_rtemsdir = $(includedir)/rtems - -include_rtems_HEADERS = assoc.h error.h libcsupport.h libio.h libio_.h termiostypes.h - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \ - $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%) - -$(PROJECT_INCLUDE)/rtems: - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/rtems/%.h: %.h - $(INSTALL_DATA) $< $@ - -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/include/sys/Makefile.am b/c/src/lib/include/sys/Makefile.am deleted file mode 100644 index a37abad178..0000000000 --- a/c/src/lib/include/sys/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -include_sysdir = $(includedir)/sys - -if HAS_NETWORKING -else -NETWORKING_H_FILES = ioctl.h -endif - -if NEWLIB -NEWLIB_H_FILES = termios.h cdefs.h -endif - -include_sys_HEADERS = ioccom.h ttycom.h utime.h \ - $(NEWLIB_H_FILES) $(NETWORKING_H_FILES) - -noinst_HEADERS = utime.h termios.h ioctl.h ioccom.h - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/sys \ - $(include_sys_HEADERS:%=$(PROJECT_INCLUDE)/sys/%) - -$(PROJECT_INCLUDE)/sys: - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/sys/%.h: %.h - $(INSTALL_DATA) $< $@ - -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/include/zilog/Makefile.am b/c/src/lib/include/zilog/Makefile.am deleted file mode 100644 index 64884d8052..0000000000 --- a/c/src/lib/include/zilog/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -include_zilogdir = ${includedir}/zilog - -include_zilog_HEADERS = z8036.h z8530.h z8536.h - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/zilog \ - $(include_zilog_HEADERS:%=$(PROJECT_INCLUDE)/zilog/%) - -$(PROJECT_INCLUDE)/zilog: - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/zilog/%.h: %.h - $(INSTALL_DATA) $< $@ - -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libbsp/i960/cvme961/console/console.c b/c/src/lib/libbsp/i960/cvme961/console/console.c index adad20aa61..823a6dc7dc 100644 --- a/c/src/lib/libbsp/i960/cvme961/console/console.c +++ b/c/src/lib/libbsp/i960/cvme961/console/console.c @@ -11,8 +11,6 @@ * $Id$ */ -#define C961_INIT - #include #include diff --git a/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c b/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c index 4b41718767..6a4e7b8891 100644 --- a/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c +++ b/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c @@ -16,6 +16,8 @@ #include +#define C961_INIT + #include #include #include diff --git a/c/src/lib/libbsp/i960/rxgen960/include/bsp.h b/c/src/lib/libbsp/i960/rxgen960/include/bsp.h index b04766eef4..4a43d7bbf4 100644 --- a/c/src/lib/libbsp/i960/rxgen960/include/bsp.h +++ b/c/src/lib/libbsp/i960/rxgen960/include/bsp.h @@ -112,18 +112,13 @@ static inline i960_PRCB *get_prcb( void ) return ( _prcb ); } -/* -#ifdef C961_INIT +#ifdef RXGEN960_INIT #undef BSP_EXTERN #define BSP_EXTERN #else #undef BSP_EXTERN #define BSP_EXTERN extern #endif -*/ - -#undef BSP_EXTERN -#define BSP_EXTERN /* miscellaneous stuff assumed to exist */ diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c b/c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c index 4bca631e80..83dac2ec2a 100644 --- a/c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c +++ b/c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c @@ -23,6 +23,8 @@ #include #include +#define RXGEN960_INIT + #include #include #include -- cgit v1.2.3