diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-09 02:47:48 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-09 02:47:48 +0000 |
| commit | bceb652ff982daea11bb865586814089dd9383c5 (patch) | |
| tree | 156559c70e8cd99c5515a0bf79618f0f700cb902 /cpukit | |
| parent | 2004-04-09 Ralf Corsepius <ralf_corsepius@rtems.org> (diff) | |
| download | rtems-bceb652ff982daea11bb865586814089dd9383c5.tar.bz2 | |
2004-04-09 Ralf Corsepius <ralf_corsepius@rtems.org>
* libblock/Makefile.am: Build libblock for !UNIX only.
* libcsupport/Makefile.am: Build $(TERMIOS_C_FILES) for !UNIX only.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 7 | ||||
| -rw-r--r-- | cpukit/libblock/Makefile.am | 8 | ||||
| -rw-r--r-- | cpukit/libcsupport/Makefile.am | 6 |
3 files changed, 16 insertions, 5 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 4d93ca603f..bc0844e8ae 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,10 @@ 2004-04-09 Ralf Corsepius <ralf_corsepius@rtems.org> + * libblock/Makefile.am: Build libblock for !UNIX only. + * libcsupport/Makefile.am: Build $(TERMIOS_C_FILES) for !UNIX only. + +2004-04-09 Ralf Corsepius <ralf_corsepius@rtems.org> + * libblock/Makefile.am: Remove LIBC_DEFINES (Unsupported). * libfs/Makefile.am: Remove LIBC_DEFINES (Unsupported). @@ -11,7 +16,7 @@ * libcsupport/Makefile.am: Remove $(LIBC_DEFINES) (Unsupported). Install motorola-headers to $(includedir)/rtems/motorola. - Install zilog-header $(includedir)/rtems/zilog. + Install zilog-headers to $(includedir)/rtems/zilog. 2004-04-06 Ralf Corsepius <ralf_corsepius@rtems.org> diff --git a/cpukit/libblock/Makefile.am b/cpukit/libblock/Makefile.am index 46e5c19999..d79be4e589 100644 --- a/cpukit/libblock/Makefile.am +++ b/cpukit/libblock/Makefile.am @@ -7,10 +7,13 @@ include $(top_srcdir)/automake/compile.am AM_CPPFLAGS += -I$(top_builddir) +CLEANFILES = + +if !UNIX include_rtemsdir = $(includedir)/rtems EXTRA_LIBRARIES = libblock.a -CLEANFILES = libblock.a +CLEANFILES += libblock.a libblock_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) EXTRA_LIBRARIES += libblock_g.a @@ -27,10 +30,12 @@ libblock_a_SOURCES = src/bdbuf.c src/blkdev.c src/diskdevs.c src/ramdisk.c \ libblock_g_a_SOURCES = $(libblock_a_SOURCES) all-local: $(PREINSTALL_FILES) libblock$(LIB_VARIANT).a +endif PREINSTALL_DIRS = PREINSTALL_FILES = +if !UNIX $(PROJECT_INCLUDE)/rtems/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/rtems @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp) @@ -55,6 +60,7 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ramdisk.h $(PROJECT_INCLUDE)/rtems/ide_part_table.h: include/rtems/ide_part_table.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ide_part_table.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ide_part_table.h +endif CLEANFILES += $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am index 732d4fbfec..1601f18fa8 100644 --- a/cpukit/libcsupport/Makefile.am +++ b/cpukit/libcsupport/Makefile.am @@ -110,7 +110,7 @@ LIBC_GLUE_C_FILES = src/__getpid.c src/__gettod.c src/__times.c \ BSD_LIBC_C_FILES = src/strlcpy.c src/strlcat.c libcsupport_a_SOURCES = src/gxx_wrappers.c src/printk.c $(BSD_LIBC_C_FILES) \ - $(BASE_FS_C_FILES) $(MALLOC_C_FILES) $(TERMIOS_C_FILES) $(ERROR_C_FILES) \ + $(BASE_FS_C_FILES) $(MALLOC_C_FILES) $(ERROR_C_FILES) \ $(ASSOCIATION_C_FILES) if UNIX @@ -118,13 +118,13 @@ libcsupport_a_SOURCES += src/unixlibc.c src/hosterr.c else libcsupport_a_SOURCES += $(LIBC_GLUE_C_FILES) $(PASSWORD_GROUP_C_FILES) \ $(TERMINAL_IDENTIFICATION_C_FILES) $(SYSTEM_CALL_C_FILES) \ - $(DIRECTORY_SCAN_C_FILES) $(ID_C_FILES) src/envlock.c + $(DIRECTORY_SCAN_C_FILES) $(ID_C_FILES) src/envlock.c \ + $(TERMIOS_C_FILES) endif libcsupport_g_a_SOURCES = $(libcsupport_a_SOURCES) EXTRA_DIST = src/TODO src/CASES src/README -EXTRA_DIST += $(UNUSED_FILES) DISTCLEANFILES = |