diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-03 05:16:21 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-03 05:16:21 +0000 |
| commit | 0f4b28e36d7dfd83a6b2c942ba956a56cffbbb48 (patch) | |
| tree | 181d9dd866df660d2ebf7e4a412006748f13334f /c/src/lib/libbsp | |
| parent | 2003-12-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-0f4b28e36d7dfd83a6b2c942ba956a56cffbbb48.tar.bz2 | |
2003-12-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge-in comm/Makefile.am, irq/Makefile.am
* comm/Makefile.am: Remove.
* irq/Makefile.am: Remove.
Diffstat (limited to 'c/src/lib/libbsp')
| -rw-r--r-- | c/src/lib/libbsp/arm/shared/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/shared/Makefile.am | 7 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/shared/comm/Makefile.am | 22 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/shared/irq/Makefile.am | 13 |
4 files changed, 11 insertions, 37 deletions
diff --git a/c/src/lib/libbsp/arm/shared/ChangeLog b/c/src/lib/libbsp/arm/shared/ChangeLog index 5bb4ace80b..9f724e9294 100644 --- a/c/src/lib/libbsp/arm/shared/ChangeLog +++ b/c/src/lib/libbsp/arm/shared/ChangeLog @@ -1,3 +1,9 @@ +2003-12-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Merge-in comm/Makefile.am, irq/Makefile.am + * comm/Makefile.am: Remove. + * irq/Makefile.am: Remove. + 2003-09-04 Joel Sherrill <joel@OARcorp.com> * comm/console.c, comm/uart.c, comm/uart.h, irq/irq_asm.S, diff --git a/c/src/lib/libbsp/arm/shared/Makefile.am b/c/src/lib/libbsp/arm/shared/Makefile.am index d866b01cc5..49e5f78b69 100644 --- a/c/src/lib/libbsp/arm/shared/Makefile.am +++ b/c/src/lib/libbsp/arm/shared/Makefile.am @@ -2,8 +2,11 @@ ## $Id$ ## +# comm +include_HEADERS = comm/uart.h +EXTRA_DIST = comm/console.c comm/uart.c -SUBDIRS = comm irq +# irq +EXTRA_DIST += irq/irq_asm.S irq/irq_init.c -include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/shared/comm/Makefile.am b/c/src/lib/libbsp/arm/shared/comm/Makefile.am deleted file mode 100644 index 130509f18e..0000000000 --- a/c/src/lib/libbsp/arm/shared/comm/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = uart.h - -C_FILES = console.c uart.c - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -PREINSTALL_FILES = $(PROJECT_INCLUDE) \ - $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - -all: $(PREINSTALL_FILES) - -EXTRA_DIST = console.c uart.c - -include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/shared/irq/Makefile.am b/c/src/lib/libbsp/arm/shared/irq/Makefile.am deleted file mode 100644 index 6e8db2bfcc..0000000000 --- a/c/src/lib/libbsp/arm/shared/irq/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -## -## $Id$ -## - - -C_FILES = irq_init.c -S_FILES = irq_asm.S - -all: - -EXTRA_DIST = irq_asm.S irq_init.c - -include $(top_srcdir)/../../../automake/local.am |