diff options
-rw-r--r-- | c/src/lib/libbsp/arm/nds/ChangeLog | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/nds/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/nds/fb/fb.c | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/nds/preinstall.am | 32 |
4 files changed, 24 insertions, 18 deletions
diff --git a/c/src/lib/libbsp/arm/nds/ChangeLog b/c/src/lib/libbsp/arm/nds/ChangeLog index b737b7bed0..07ab2efa17 100644 --- a/c/src/lib/libbsp/arm/nds/ChangeLog +++ b/c/src/lib/libbsp/arm/nds/ChangeLog @@ -1,3 +1,8 @@ +2009-08-10 Joel Sherrill <joel.sherrill@OARcorp.com> + + * Makefile.am, preinstall.am, fb/fb.c: Install nds specific .h files + into nds subdirectory. + 2009-08-03 Roxana Leontie <roxana.leontie@gmail.com> * fb/fb.c: changed the references to mw_fb.h into fb.h diff --git a/c/src/lib/libbsp/arm/nds/Makefile.am b/c/src/lib/libbsp/arm/nds/Makefile.am index 76d26bcc55..5616fc8264 100644 --- a/c/src/lib/libbsp/arm/nds/Makefile.am +++ b/c/src/lib/libbsp/arm/nds/Makefile.am @@ -31,8 +31,8 @@ dist_project_lib_DATA += startup/linkcmds noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = fb/fb.h touchscreen/touchscreen.h sound/sound.h +include_ndsdir = $(includedir)/nds +include_nds_HEADERS = fb/fb.h touchscreen/touchscreen.h sound/sound.h noinst_PROGRAMS += startup.rel startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ diff --git a/c/src/lib/libbsp/arm/nds/fb/fb.c b/c/src/lib/libbsp/arm/nds/fb/fb.c index 7738f20606..6b142e577e 100644 --- a/c/src/lib/libbsp/arm/nds/fb/fb.c +++ b/c/src/lib/libbsp/arm/nds/fb/fb.c @@ -22,6 +22,7 @@ #include <nds.h> #include <rtems/fb.h> +#include <nds/fb.h> /* * screen information for the driver (fb0). diff --git a/c/src/lib/libbsp/arm/nds/preinstall.am b/c/src/lib/libbsp/arm/nds/preinstall.am index 1b4cd729cd..ed9191c6f0 100644 --- a/c/src/lib/libbsp/arm/nds/preinstall.am +++ b/c/src/lib/libbsp/arm/nds/preinstall.am @@ -65,22 +65,22 @@ $(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds -$(PROJECT_INCLUDE)/rtems/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems - @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp) - -$(PROJECT_INCLUDE)/rtems/fb.h: fb/fb.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/fb.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/fb.h - -$(PROJECT_INCLUDE)/rtems/touchscreen.h: touchscreen/touchscreen.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/touchscreen.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/touchscreen.h - -$(PROJECT_INCLUDE)/rtems/sound.h: sound/sound.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/sound.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/sound.h +$(PROJECT_INCLUDE)/nds/$(dirstamp): + @$(MKDIR_P) $(PROJECT_INCLUDE)/nds + @: > $(PROJECT_INCLUDE)/nds/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/nds/$(dirstamp) + +$(PROJECT_INCLUDE)/nds/fb.h: fb/fb.h $(PROJECT_INCLUDE)/nds/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nds/fb.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/nds/fb.h + +$(PROJECT_INCLUDE)/nds/touchscreen.h: touchscreen/touchscreen.h $(PROJECT_INCLUDE)/nds/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nds/touchscreen.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/nds/touchscreen.h + +$(PROJECT_INCLUDE)/nds/sound.h: sound/sound.h $(PROJECT_INCLUDE)/nds/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nds/sound.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/nds/sound.h $(PROJECT_INCLUDE)/irq.h: irq/irq.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/irq.h |