From ac904b681fcac563b912a5e6c5ec03c307f0b38c Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 6 Feb 2004 08:11:43 +0000 Subject: 2004-02-06 Ralf Corsepius * Makefile.am: Pickup files from ../../arm/shared instead of ../shared. Reformat. --- c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog | 5 +++++ c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am | 8 +++++--- c/src/lib/libbsp/arm/edb7312/ChangeLog | 5 +++++ c/src/lib/libbsp/arm/edb7312/Makefile.am | 5 +++-- c/src/lib/libbsp/arm/vegaplus/ChangeLog | 5 +++++ c/src/lib/libbsp/arm/vegaplus/Makefile.am | 8 +++++--- 6 files changed, 28 insertions(+), 8 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog b/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog index 8fa44f0ea8..f582c2428c 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog @@ -1,3 +1,8 @@ +2004-02-06 Ralf Corsepius + + * Makefile.am: Pickup files from ../../arm/shared instead of + ../shared. Reformat. + 2004-01-28 Ralf Corsepius * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am index 57546a599f..86841b7b82 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am @@ -55,7 +55,8 @@ noinst_DATA += clock$(LIB_VARIANT).rel EXTRA_PROGRAMS += console.rel CLEANFILES += console.rel -console_rel_SOURCES = ../shared/comm/uart.c ../shared/comm/console.c +console_rel_SOURCES = ../../arm/shared/comm/uart.c \ + ../../arm/shared/comm/console.c console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) @@ -85,8 +86,9 @@ include_HEADERS += irq/irq.h EXTRA_PROGRAMS += irq.rel CLEANFILES += irq.rel -irq_rel_SOURCES = irq/irq.c ../shared/irq/irq_init.c irq/bsp_irq_init.c \ - ../shared/irq/irq_asm.S irq/bsp_irq_asm.S irq/irq.h +irq_rel_SOURCES = irq/irq.c ../../arm/shared/irq/irq_init.c \ + irq/bsp_irq_init.c ../../arm/shared/irq/irq_asm.S irq/bsp_irq_asm.S \ + irq/irq.h irq_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) diff --git a/c/src/lib/libbsp/arm/edb7312/ChangeLog b/c/src/lib/libbsp/arm/edb7312/ChangeLog index f458b5b916..2052eb493e 100644 --- a/c/src/lib/libbsp/arm/edb7312/ChangeLog +++ b/c/src/lib/libbsp/arm/edb7312/ChangeLog @@ -1,3 +1,8 @@ +2004-02-06 Ralf Corsepius + + * Makefile.am: Pickup files from ../../arm/shared instead of + ../shared. Reformat. + 2004-01-28 Ralf Corsepius * include/bsp.h: Remove config. diff --git a/c/src/lib/libbsp/arm/edb7312/Makefile.am b/c/src/lib/libbsp/arm/edb7312/Makefile.am index d6f50b3417..5e186e32f9 100644 --- a/c/src/lib/libbsp/arm/edb7312/Makefile.am +++ b/c/src/lib/libbsp/arm/edb7312/Makefile.am @@ -84,8 +84,9 @@ include_HEADERS += irq/irq.h EXTRA_PROGRAMS += irq.rel CLEANFILES += irq.rel -irq_rel_SOURCES = irq/irq.c irq/bsp_irq_init.c ../shared/irq/irq_init.c \ - irq/bsp_irq_asm.S ../shared/irq/irq_asm.S irq/irq.h +irq_rel_SOURCES = irq/irq.c irq/bsp_irq_init.c \ + ../../arm/shared/irq/irq_init.c irq/bsp_irq_asm.S \ + ../../arm/shared/irq/irq_asm.S irq/irq.h irq_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) diff --git a/c/src/lib/libbsp/arm/vegaplus/ChangeLog b/c/src/lib/libbsp/arm/vegaplus/ChangeLog index b2a2ac08c1..1b69257c61 100644 --- a/c/src/lib/libbsp/arm/vegaplus/ChangeLog +++ b/c/src/lib/libbsp/arm/vegaplus/ChangeLog @@ -1,3 +1,8 @@ +2004-02-06 Ralf Corsepius + + * Makefile.am: Pickup files from ../../arm/shared instead of + ../shared. Reformat. + 2004-01-28 Ralf Corsepius * configure.ac: Add nostdinc to AUTOMAKE_OPTIONS. diff --git a/c/src/lib/libbsp/arm/vegaplus/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/Makefile.am index d8ee30babe..0a190a8d4d 100644 --- a/c/src/lib/libbsp/arm/vegaplus/Makefile.am +++ b/c/src/lib/libbsp/arm/vegaplus/Makefile.am @@ -43,8 +43,9 @@ include_HEADERS += irq/irq.h EXTRA_PROGRAMS += irq.rel CLEANFILES += irq.rel -irq_rel_SOURCES = irq/irq.c ../shared/irq/irq_init.c irq/bsp_irq_init.c \ - ../shared/irq/irq_asm.S irq/bsp_irq_asm.S irq/irq.h +irq_rel_SOURCES = irq/irq.c ../../arm/shared/irq/irq_init.c \ + irq/bsp_irq_init.c ../../arm/shared/irq/irq_asm.S irq/bsp_irq_asm.S \ + irq/irq.h irq_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) @@ -72,7 +73,8 @@ noinst_DATA += clock$(LIB_VARIANT).rel EXTRA_PROGRAMS += console.rel CLEANFILES += console.rel -console_rel_SOURCES = ../shared/comm/uart.c ../shared/comm/console.c +console_rel_SOURCES = ../../arm/shared/comm/uart.c \ + ../../arm/shared/comm/console.c console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -- cgit v1.2.3