diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-09-26 04:04:51 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-09-26 04:04:51 +0000 |
| commit | 3416c4415680de506cb03c84e126828e4f252e2c (patch) | |
| tree | c7a29f65959c077bd4ee8c9a6fed1c58dfbc5510 /c/src/lib/libbsp/arm/lpc24xx | |
| parent | 2008-09-25 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-3416c4415680de506cb03c84e126828e4f252e2c.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/arm/lpc24xx')
| -rw-r--r-- | c/src/lib/libbsp/arm/lpc24xx/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/lpc24xx/Makefile.am | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/lpc24xx/preinstall.am | 12 |
3 files changed, 15 insertions, 6 deletions
diff --git a/c/src/lib/libbsp/arm/lpc24xx/ChangeLog b/c/src/lib/libbsp/arm/lpc24xx/ChangeLog index 8feef61525..d41bdcbd17 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/ChangeLog +++ b/c/src/lib/libbsp/arm/lpc24xx/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-25 Joel Sherrill <joel.sherrill@oarcorp.com> * preinstall.am: Regenerated. diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am index 28c6007f37..7ed62633eb 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am @@ -12,10 +12,10 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -dist_project_lib_DATA = bsp_specs - include_bspdir = $(includedir)/bsp +dist_project_lib_DATA = bsp_specs + ############################################################################### # Header # ############################################################################### @@ -23,6 +23,7 @@ include_bspdir = $(includedir)/bsp include_HEADERS = include/bsp.h nodist_include_HEADERS = include/bspopts.h +nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h include_bsp_HEADERS = ../../shared/include/utility.h \ diff --git a/c/src/lib/libbsp/arm/lpc24xx/preinstall.am b/c/src/lib/libbsp/arm/lpc24xx/preinstall.am index 5856e70827..26d8337b89 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/preinstall.am +++ b/c/src/lib/libbsp/arm/lpc24xx/preinstall.am @@ -28,15 +28,15 @@ $(PROJECT_INCLUDE)/$(dirstamp): @: > $(PROJECT_INCLUDE)/$(dirstamp) PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) -$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs -PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs - $(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 + $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h @@ -45,6 +45,10 @@ $(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)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h |