From f3d7592e22f7b42e6461ebe43046b646c02f4367 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 5 Feb 2001 18:25:50 +0000 Subject: 2001-02-03 Ralf Corsepius * include/zilog/Makefile.am, include/Makefile.am, include/motorola/Makefile.am, include/sys/Makefile.am include/rtems/Makefile.am: Apply include_*HEADERS instead of H_FILES. --- c/src/lib/ChangeLog | 7 +++++++ c/src/lib/include/Makefile.am | 6 ++---- c/src/lib/include/motorola/Makefile.am | 6 +++--- c/src/lib/include/rtems/Makefile.am | 6 +++--- c/src/lib/include/sys/Makefile.am | 7 +++++-- c/src/lib/include/zilog/Makefile.am | 6 +++--- 6 files changed, 23 insertions(+), 15 deletions(-) diff --git a/c/src/lib/ChangeLog b/c/src/lib/ChangeLog index 12a9268d5d..f68a250eab 100644 --- a/c/src/lib/ChangeLog +++ b/c/src/lib/ChangeLog @@ -1,4 +1,11 @@ +2001-02-03 Ralf Corsepius + + * include/zilog/Makefile.am, include/Makefile.am, + include/motorola/Makefile.am, include/sys/Makefile.am + include/rtems/Makefile.am: Apply include_*HEADERS instead of + H_FILES. + 2001-01-26 Joel Sherrill * libc/chroot.c: Fixed naming problems. Names were changed diff --git a/c/src/lib/include/Makefile.am b/c/src/lib/include/Makefile.am index f36ec45698..8f1ddedc91 100644 --- a/c/src/lib/include/Makefile.am +++ b/c/src/lib/include/Makefile.am @@ -4,13 +4,11 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = bspIo.h chain.h console.h clockdrv.h iosupp.h ringbuf.h spurious.h \ +include_HEADERS = bspIo.h chain.h console.h clockdrv.h iosupp.h ringbuf.h spurious.h \ timerdrv.h vmeintr.h -noinst_HEADERS = $(H_FILES) - PREINSTALL_FILES += $(PROJECT_INCLUDE) \ - $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%) + $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) $(PROJECT_INCLUDE): @$(mkinstalldirs) $@ diff --git a/c/src/lib/include/motorola/Makefile.am b/c/src/lib/include/motorola/Makefile.am index cb589bda78..9d4cfbbf93 100644 --- a/c/src/lib/include/motorola/Makefile.am +++ b/c/src/lib/include/motorola/Makefile.am @@ -4,12 +4,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = mc68230.h mc68681.h +include_motoroladir = $(includedir)/motorola -noinst_HEADERS = $(H_FILES) +include_motorola_HEADERS = mc68230.h mc68681.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/motorola \ - $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/motorola/%) + $(include_motorola_HEADERS:%=$(PROJECT_INCLUDE)/motorola/%) $(PROJECT_INCLUDE)/motorola: @$(mkinstalldirs) $@ diff --git a/c/src/lib/include/rtems/Makefile.am b/c/src/lib/include/rtems/Makefile.am index e8f8df896c..71435cfbc3 100644 --- a/c/src/lib/include/rtems/Makefile.am +++ b/c/src/lib/include/rtems/Makefile.am @@ -4,12 +4,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = assoc.h error.h libcsupport.h libio.h libio_.h termiostypes.h +include_rtemsdir = $(includedir)/rtems -noinst_HEADERS = $(H_FILES) +include_rtems_HEADERS = assoc.h error.h libcsupport.h libio.h libio_.h termiostypes.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \ - $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%) + $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%) $(PROJECT_INCLUDE)/rtems: @$(mkinstalldirs) $@ diff --git a/c/src/lib/include/sys/Makefile.am b/c/src/lib/include/sys/Makefile.am index a9e3912b84..70929555a9 100644 --- a/c/src/lib/include/sys/Makefile.am +++ b/c/src/lib/include/sys/Makefile.am @@ -4,6 +4,8 @@ AUTOMAKE_OPTIONS = foreign 1.4 +include_sysdir = $(includedir)/sys + if HAS_NETWORKING else NETWORKING_H_FILES += ioctl.h @@ -13,12 +15,13 @@ if NEWLIB NEWLIB_H_FILES += termios.h cdefs.h endif -H_FILES = ioccom.h ttycom.h utime.h $(NEWLIB_H_FILES) $(NETWORKING_H_FILES) +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 \ - $(H_FILES:%=$(PROJECT_INCLUDE)/sys/%) + $(include_sys_HEADERS:%=$(PROJECT_INCLUDE)/sys/%) $(PROJECT_INCLUDE)/sys: @$(mkinstalldirs) $@ diff --git a/c/src/lib/include/zilog/Makefile.am b/c/src/lib/include/zilog/Makefile.am index db9ab19472..4276428fb5 100644 --- a/c/src/lib/include/zilog/Makefile.am +++ b/c/src/lib/include/zilog/Makefile.am @@ -4,12 +4,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = z8036.h z8530.h z8536.h +include_zilogdir = ${includedir}/zilog -noinst_HEADERS = $(H_FILES) +include_zilog_HEADERS = z8036.h z8530.h z8536.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog \ - $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/zilog/%) + $(include_zilog_HEADERS:%=$(PROJECT_INCLUDE)/zilog/%) $(PROJECT_INCLUDE)/zilog: @$(mkinstalldirs) $@ -- cgit v1.2.3