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.

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,

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

c/src/lib/libbsp/arm/shared/comm/Makefile.am

@@ -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

c/src/lib/libbsp/arm/shared/irq/Makefile.am

@@ -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