summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2010-08-17 14:06:56 +0000
committerSebastian Huber <sebastian.huber@embedded-brains.de>2010-08-17 14:06:56 +0000
commitcac29eed7daa011829e6594171f1b71cc2abbc32 (patch)
tree739b7cca02ce4548790ce76ed92e32fcdb2119bc /c
parent2010-08-17 Sebastian Huber <sebastian.huber@embedded-brains.de> (diff)
downloadrtems-cac29eed7daa011829e6594171f1b71cc2abbc32.tar.bz2
2010-08-17 Sebastian Huber <sebastian.huber@embedded-brains.de>
* libchip/Makefile.am, libchip/preinstall.am: Install <libchip/ata_internal.h>.
Diffstat (limited to 'c')
-rw-r--r--c/src/ChangeLog5
-rw-r--r--c/src/libchip/Makefile.am5
-rw-r--r--c/src/libchip/preinstall.am4
3 files changed, 11 insertions, 3 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index 237c6a46ca..e0fc919648 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,5 +1,10 @@
2010-08-17 Sebastian Huber <sebastian.huber@embedded-brains.de>
+ * libchip/Makefile.am, libchip/preinstall.am: Install
+ <libchip/ata_internal.h>.
+
+2010-08-17 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
* libchip/ide/ata_util.c: New file.
* libchip/Makefile.am: Reflect change from above.
* libchip/ide/ata.c: Moved ata_breq_init(), ata_identify_device(), and
diff --git a/c/src/libchip/Makefile.am b/c/src/libchip/Makefile.am
index fe796e04ba..b7b78423b4 100644
--- a/c/src/libchip/Makefile.am
+++ b/c/src/libchip/Makefile.am
@@ -27,11 +27,10 @@ libflash_a_CPPFLAGS = $(AM_CPPFLAGS)
# ide
include_libchip_HEADERS += ide/ata.h ide/ide_ctrl_cfg.h ide/ide_ctrl.h \
- ide/ide_ctrl_io.h
+ ide/ide_ctrl_io.h ide/ata_internal.h
noinst_LIBRARIES += libide.a
-libide_a_SOURCES = ide/ata.c ide/ata_util.c ide/ide_controller.c \
- ide/ata_internal.h
+libide_a_SOURCES = ide/ata.c ide/ata_util.c ide/ide_controller.c
libide_a_CPPFLAGS = $(AM_CPPFLAGS)
# network
diff --git a/c/src/libchip/preinstall.am b/c/src/libchip/preinstall.am
index 628baa1b12..51c9a4d5aa 100644
--- a/c/src/libchip/preinstall.am
+++ b/c/src/libchip/preinstall.am
@@ -57,6 +57,10 @@ $(PROJECT_INCLUDE)/libchip/ide_ctrl_io.h: ide/ide_ctrl_io.h $(PROJECT_INCLUDE)/l
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/ide_ctrl_io.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/ide_ctrl_io.h
+$(PROJECT_INCLUDE)/libchip/ata_internal.h: ide/ata_internal.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/ata_internal.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/ata_internal.h
+
if HAS_NETWORKING
$(PROJECT_INCLUDE)/libchip/cs8900.h: network/cs8900.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/cs8900.h