diff options
| -rw-r--r-- | cpukit/ChangeLog | 9 | ||||
| -rw-r--r-- | cpukit/Makefile.am | 74 | ||||
| -rw-r--r-- | cpukit/itron/Makefile.am | 19 | ||||
| -rw-r--r-- | cpukit/libcsupport/Makefile.am | 72 | ||||
| -rw-r--r-- | cpukit/libfs/Makefile.am | 27 |
5 files changed, 143 insertions, 58 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 48e11ad8b2..fb6e58ca5e 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,14 @@ 2004-04-01 Ralf Corsepius <ralf_corsepius@rtems.org> + * Makefile.am: Add backward/*.h headers. + * itron/Makefile.am: Install itron.h to $(includedir)/rtems. + * libcsupport/Makefile.am: Install RTEMS specific headers to + $(includedir)/rtems. + * libfs/Makefile.am: Install imfs.h and dosfs.h to + $(includedir)/rtems. + +2004-04-01 Ralf Corsepius <ralf_corsepius@rtems.org> + * libblock/include/rtems/bdbuf.h: Include <rtems/chain.h> instead of <chain.h>. * libblock/include/rtems/ide_part_table.h: Include <rtems/chain.h> instead of <chain.h>. * libcsupport/src/malloc.c: Include <rtems/chain.h> instead of <chain.h>. diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index 53b276b2df..a8dc0d82ae 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -20,6 +20,19 @@ preinstall-stamp: touch preinstall-stamp CLEANFILES = preinstall-stamp +include_HEADERS = backward/asm.h backward/chain.h backward/clockdrv.h \ + backward/console.h backward/imfs.h backward/iosupp.h backward/ringbuf.h \ + backward/rtc.h backward/spurious.h backward/timerdrv.h \ + backward/vmeintr.h + +if !UNIX +include_HEADERS += backward/dosfs.h +endif + +if HAS_ITRON +include_HEADERS += backward/itron.h +endif + include_rtemsdir = $(includedir)/rtems include_rtems_HEADERS = include/rtems/bspIo.h include/rtems/userenv.h \ include/rtems/fs.h include/rtems/pci.h include/rtems/stdint.h \ @@ -28,6 +41,67 @@ include_rtems_HEADERS = include/rtems/bspIo.h include/rtems/userenv.h \ PREINSTALL_DIRS = PREINSTALL_FILES = +$(PROJECT_INCLUDE)/$(dirstamp): + @$(mkdir_p) $(PROJECT_INCLUDE) + @: > $(PROJECT_INCLUDE)/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) + +$(PROJECT_INCLUDE)/asm.h: backward/asm.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h + +$(PROJECT_INCLUDE)/chain.h: backward/chain.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/chain.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/chain.h + +$(PROJECT_INCLUDE)/clockdrv.h: backward/clockdrv.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/clockdrv.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/clockdrv.h + +$(PROJECT_INCLUDE)/console.h: backward/console.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/console.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/console.h + +$(PROJECT_INCLUDE)/imfs.h: backward/imfs.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/imfs.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/imfs.h + +$(PROJECT_INCLUDE)/iosupp.h: backward/iosupp.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/iosupp.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/iosupp.h + +$(PROJECT_INCLUDE)/ringbuf.h: backward/ringbuf.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ringbuf.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/ringbuf.h + +$(PROJECT_INCLUDE)/rtc.h: backward/rtc.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtc.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtc.h + +$(PROJECT_INCLUDE)/spurious.h: backward/spurious.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/spurious.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/spurious.h + +$(PROJECT_INCLUDE)/timerdrv.h: backward/timerdrv.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/timerdrv.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/timerdrv.h + +$(PROJECT_INCLUDE)/vmeintr.h: backward/vmeintr.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/vmeintr.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/vmeintr.h + +if !UNIX +$(PROJECT_INCLUDE)/dosfs.h: backward/dosfs.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dosfs.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/dosfs.h +endif + +if HAS_ITRON +$(PROJECT_INCLUDE)/itron.h: backward/itron.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/itron.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/itron.h +endif + $(PROJECT_INCLUDE)/rtems/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/rtems @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp) diff --git a/cpukit/itron/Makefile.am b/cpukit/itron/Makefile.am index d4354b41d6..cdcf7797e1 100644 --- a/cpukit/itron/Makefile.am +++ b/cpukit/itron/Makefile.am @@ -11,7 +11,8 @@ CLEANFILES = if HAS_ITRON ## include -include_HEADERS = include/itron.h +include_rtemsdir = $(includedir)/rtems +include_rtems_HEADERS = include/itron.h ## itronsys @@ -127,15 +128,15 @@ EXTRA_DIST += $(UNUSED_C_FILES) src/TODO PREINSTALL_DIRS = PREINSTALL_FILES = -$(PROJECT_INCLUDE)/$(dirstamp): - @$(mkdir_p) $(PROJECT_INCLUDE) - @: > $(PROJECT_INCLUDE)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) - if HAS_ITRON -$(PROJECT_INCLUDE)/itron.h: include/itron.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/itron.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/itron.h +$(PROJECT_INCLUDE)/rtems/$(dirstamp): + @$(mkdir_p) $(PROJECT_INCLUDE)/rtems + @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp) + +$(PROJECT_INCLUDE)/rtems/itron.h: include/itron.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron.h $(PROJECT_INCLUDE)/itronsys/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/itronsys diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am index 7fc66b6c01..53e5f31682 100644 --- a/cpukit/libcsupport/Makefile.am +++ b/cpukit/libcsupport/Makefile.am @@ -16,10 +16,12 @@ EXTRA_LIBRARIES += libcsupport_g.a CLEANFILES += libcsupport_g.a libcsupport_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -include_HEADERS = include/chain.h include/console.h include/clockdrv.h \ +include_rtemsdir = $(includedir)/rtems +include_rtems_HEADERS = include/chain.h include/console.h include/clockdrv.h \ include/iosupp.h include/ringbuf.h include/rtc.h include/spurious.h \ include/timerdrv.h include/vmeintr.h +include_HEADERS = if NEED_STDINT_H include_HEADERS += include/stdint.h endif @@ -35,9 +37,7 @@ include_motorola_HEADERS = include/motorola/mc68230.h \ include/motorola/mc68681.h ## rtems -include_rtemsdir = $(includedir)/rtems - -include_rtems_HEADERS = include/rtems/assoc.h include/rtems/error.h \ +include_rtems_HEADERS += include/rtems/assoc.h include/rtems/error.h \ include/rtems/libcsupport.h include/rtems/libio.h include/rtems/libio_.h \ include/rtems/termiostypes.h include/rtems/cdefs.h @@ -137,41 +137,46 @@ $(PROJECT_INCLUDE)/$(dirstamp): @: > $(PROJECT_INCLUDE)/$(dirstamp) PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) -$(PROJECT_INCLUDE)/chain.h: include/chain.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/chain.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/chain.h +$(PROJECT_INCLUDE)/rtems/$(dirstamp): + @$(mkdir_p) $(PROJECT_INCLUDE)/rtems + @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp) -$(PROJECT_INCLUDE)/console.h: include/console.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/console.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/console.h +$(PROJECT_INCLUDE)/rtems/chain.h: include/chain.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/chain.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/chain.h -$(PROJECT_INCLUDE)/clockdrv.h: include/clockdrv.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/clockdrv.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/clockdrv.h +$(PROJECT_INCLUDE)/rtems/console.h: include/console.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/console.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/console.h -$(PROJECT_INCLUDE)/iosupp.h: include/iosupp.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/iosupp.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/iosupp.h +$(PROJECT_INCLUDE)/rtems/clockdrv.h: include/clockdrv.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/clockdrv.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/clockdrv.h -$(PROJECT_INCLUDE)/ringbuf.h: include/ringbuf.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ringbuf.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/ringbuf.h +$(PROJECT_INCLUDE)/rtems/iosupp.h: include/iosupp.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/iosupp.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/iosupp.h -$(PROJECT_INCLUDE)/rtc.h: include/rtc.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtc.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtc.h +$(PROJECT_INCLUDE)/rtems/ringbuf.h: include/ringbuf.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ringbuf.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ringbuf.h -$(PROJECT_INCLUDE)/spurious.h: include/spurious.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/spurious.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/spurious.h +$(PROJECT_INCLUDE)/rtems/rtc.h: include/rtc.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtc.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtc.h -$(PROJECT_INCLUDE)/timerdrv.h: include/timerdrv.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/timerdrv.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/timerdrv.h +$(PROJECT_INCLUDE)/rtems/spurious.h: include/spurious.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/spurious.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/spurious.h -$(PROJECT_INCLUDE)/vmeintr.h: include/vmeintr.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/vmeintr.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/vmeintr.h +$(PROJECT_INCLUDE)/rtems/timerdrv.h: include/timerdrv.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/timerdrv.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/timerdrv.h + +$(PROJECT_INCLUDE)/rtems/vmeintr.h: include/vmeintr.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/vmeintr.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/vmeintr.h if NEED_STDINT_H $(PROJECT_INCLUDE)/stdint.h: include/stdint.h $(PROJECT_INCLUDE)/$(dirstamp) @@ -198,11 +203,6 @@ $(PROJECT_INCLUDE)/motorola/mc68681.h: include/motorola/mc68681.h $(PROJECT_INCL $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/motorola/mc68681.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/motorola/mc68681.h -$(PROJECT_INCLUDE)/rtems/$(dirstamp): - @$(mkdir_p) $(PROJECT_INCLUDE)/rtems - @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp) - $(PROJECT_INCLUDE)/rtems/assoc.h: include/rtems/assoc.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/assoc.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/assoc.h diff --git a/cpukit/libfs/Makefile.am b/cpukit/libfs/Makefile.am index 4cc3258dd4..e8b6585783 100644 --- a/cpukit/libfs/Makefile.am +++ b/cpukit/libfs/Makefile.am @@ -9,7 +9,8 @@ AM_CPPFLAGS += -I$(top_builddir) EXTRA_DIST = README -include_HEADERS = +include_rtemsdir = $(includedir)/rtems +include_rtems_HEADERS = EXTRA_LIBRARIES = libimfs.a CLEANFILES = libimfs.a @@ -43,7 +44,7 @@ endif libimfs_g_a_SOURCES = $(libimfs_a_SOURCES) -include_HEADERS += src/imfs/imfs.h +include_rtems_HEADERS += src/imfs/imfs.h IMFSLIB = libimfs$(LIB_VARIANT).a @@ -74,7 +75,7 @@ libdosfs_a_SOURCES += src/dosfs/msdos_create.c src/dosfs/msdos_dir.c \ libdosfs_g_a_SOURCES = $(libdosfs_a_SOURCES) -include_HEADERS += src/dosfs/dosfs.h +include_rtems_HEADERS += src/dosfs/dosfs.h DOSFSLIB = libdosfs$(LIB_VARIANT).a endif @@ -88,19 +89,19 @@ all-local: $(PREINSTALL_FILES) $(IMFSLIB) $(DOSFSLIB) PREINSTALL_DIRS = PREINSTALL_FILES = -$(PROJECT_INCLUDE)/$(dirstamp): - @$(mkdir_p) $(PROJECT_INCLUDE) - @: > $(PROJECT_INCLUDE)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) +$(PROJECT_INCLUDE)/rtems/$(dirstamp): + @$(mkdir_p) $(PROJECT_INCLUDE)/rtems + @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp) -$(PROJECT_INCLUDE)/imfs.h: src/imfs/imfs.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/imfs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/imfs.h +$(PROJECT_INCLUDE)/rtems/imfs.h: src/imfs/imfs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/imfs.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/imfs.h if !UNIX -$(PROJECT_INCLUDE)/dosfs.h: src/dosfs/dosfs.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dosfs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/dosfs.h +$(PROJECT_INCLUDE)/rtems/dosfs.h: src/dosfs/dosfs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/dosfs.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/dosfs.h endif CLEANFILES += $(PREINSTALL_FILES) |