summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/i386/i386ex
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2008-09-26 04:56:17 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2008-09-26 04:56:17 +0000
commita1bc0a15d81a628ec0a480a6d78786a995c1c447 (patch)
tree6dd8c80e5f04af2c86b25d2e85ef09dfeebda6e1 /c/src/lib/libbsp/i386/i386ex
parent2008-09-26 Ralf Corsépius <ralf.corsepius@rtems.org> (diff)
downloadrtems-a1bc0a15d81a628ec0a480a6d78786a995c1c447.tar.bz2
2008-09-26 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.am: Cleanup ../../shared/include/bootcard.h handling.
Diffstat (limited to 'c/src/lib/libbsp/i386/i386ex')
-rw-r--r--c/src/lib/libbsp/i386/i386ex/ChangeLog4
-rw-r--r--c/src/lib/libbsp/i386/i386ex/Makefile.am4
-rw-r--r--c/src/lib/libbsp/i386/i386ex/preinstall.am14
3 files changed, 16 insertions, 6 deletions
diff --git a/c/src/lib/libbsp/i386/i386ex/ChangeLog b/c/src/lib/libbsp/i386/i386ex/ChangeLog
index d5350f533d..adb009a07b 100644
--- a/c/src/lib/libbsp/i386/i386ex/ChangeLog
+++ b/c/src/lib/libbsp/i386/i386ex/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-26 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * Makefile.am: Cleanup ../../shared/include/bootcard.h handling.
+
2008-09-23 Joel Sherrill <joel.sherrill@oarcorp.com>
* configure.ac: Make letting boot_card() handle work area allocation
diff --git a/c/src/lib/libbsp/i386/i386ex/Makefile.am b/c/src/lib/libbsp/i386/i386ex/Makefile.am
index 3f15902bd1..1896902279 100644
--- a/c/src/lib/libbsp/i386/i386ex/Makefile.am
+++ b/c/src/lib/libbsp/i386/i386ex/Makefile.am
@@ -7,19 +7,21 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../bsp.am
+include_bspdir = $(includedir)/bsp
+
dist_project_lib_DATA = bsp_specs
include_HEADERS = include/bsp.h
include_HEADERS += include/tm27.h
nodist_include_HEADERS = include/bspopts.h
+nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
DISTCLEANFILES = include/bspopts.h
noinst_PROGRAMS =
include_HEADERS += include/coverhd.h
-include_bspdir = $(includedir)/bsp
include_bsp_HEADERS = ../../i386/shared/irq/irq.h \
../../i386/shared/irq/irq_asm.h
diff --git a/c/src/lib/libbsp/i386/i386ex/preinstall.am b/c/src/lib/libbsp/i386/i386ex/preinstall.am
index 42c8d119b3..58c44d196f 100644
--- a/c/src/lib/libbsp/i386/i386ex/preinstall.am
+++ b/c/src/lib/libbsp/i386/i386ex/preinstall.am
@@ -28,6 +28,11 @@ $(PROJECT_INCLUDE)/$(dirstamp):
@: > $(PROJECT_INCLUDE)/$(dirstamp)
PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
+$(PROJECT_INCLUDE)/bsp/$(dirstamp):
+ @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
+ @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+
$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
@@ -44,15 +49,14 @@ $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
+$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
+
$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
- @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
$(PROJECT_INCLUDE)/bsp/irq.h: ../../i386/shared/irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h