2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* clock/Makefile.am, console/Makefile.am, start/Makefile.am,
	startup/Makefile.am, wrapup/Makefile.am: Include compile.am

7 files changed, 15 insertions, 5 deletions

diff --git a/c/src/lib/libbsp/arm/armulator/ChangeLog b/c/src/lib/libbsp/arm/armulator/ChangeLog
index 101734ce64..92f64eb66c 100644
--- a/c/src/lib/libbsp/arm/armulator/ChangeLog
+++ b/c/src/lib/libbsp/arm/armulator/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-04	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* clock/Makefile.am, console/Makefile.am, start/Makefile.am,
+	startup/Makefile.am, wrapup/Makefile.am: Include compile.am
+
 2000-08-10	Joel Sherrill <joel@OARcorp.com>
 
 	* ChangeLog: New file.
diff --git a/c/src/lib/libbsp/arm/armulator/Makefile.am b/c/src/lib/libbsp/arm/armulator/Makefile.am
index d76b6662be..27b5bfe9ec 100644
--- a/c/src/lib/libbsp/arm/armulator/Makefile.am
+++ b/c/src/lib/libbsp/arm/armulator/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
diff --git a/c/src/lib/libbsp/arm/armulator/clock/Makefile.am b/c/src/lib/libbsp/arm/armulator/clock/Makefile.am
index 7c33173275..17ecfe4e15 100644
--- a/c/src/lib/libbsp/arm/armulator/clock/Makefile.am
+++ b/c/src/lib/libbsp/arm/armulator/clock/Makefile.am
@@ -12,6 +12,7 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 OBJS = $(C_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/compile.am
 include $(top_srcdir)/../../../../../../automake/lib.am
 
 #
diff --git a/c/src/lib/libbsp/arm/armulator/console/Makefile.am b/c/src/lib/libbsp/arm/armulator/console/Makefile.am
index 371c0b2e36..473ee66895 100644
--- a/c/src/lib/libbsp/arm/armulator/console/Makefile.am
+++ b/c/src/lib/libbsp/arm/armulator/console/Makefile.am
@@ -11,12 +11,13 @@ PGM = $(ARCH)/console.rel
 C_FILES = console-io.c console-polled.c
 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
-S_FILES = 
+S_FILES =
 S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
 
 OBJS = $(C_O_FILES) $(S_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/compile.am
 include $(top_srcdir)/../../../../../../automake/lib.am
 
 #
diff --git a/c/src/lib/libbsp/arm/armulator/start/Makefile.am b/c/src/lib/libbsp/arm/armulator/start/Makefile.am
index 44e006c298..b0982463a9 100644
--- a/c/src/lib/libbsp/arm/armulator/start/Makefile.am
+++ b/c/src/lib/libbsp/arm/armulator/start/Makefile.am
@@ -12,6 +12,7 @@ S_O_FILES = $(S_FILES:%.c=$(ARCH)/%.o)
 OBJS = $(S_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/compile.am
 include $(top_srcdir)/../../../../../../automake/lib.am
 
 #
diff --git a/c/src/lib/libbsp/arm/armulator/startup/Makefile.am b/c/src/lib/libbsp/arm/armulator/startup/Makefile.am
index 35d84913b7..74afb51aa9 100644
--- a/c/src/lib/libbsp/arm/armulator/startup/Makefile.am
+++ b/c/src/lib/libbsp/arm/armulator/startup/Makefile.am
@@ -18,6 +18,7 @@ S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
 OBJS = $(C_O_FILES) $(S_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/compile.am
 include $(top_srcdir)/../../../../../../automake/lib.am
 
 #
diff --git a/c/src/lib/libbsp/arm/armulator/wrapup/Makefile.am b/c/src/lib/libbsp/arm/armulator/wrapup/Makefile.am
index ae52204fdb..81b4604e8a 100644
--- a/c/src/lib/libbsp/arm/armulator/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/arm/armulator/wrapup/Makefile.am
@@ -7,12 +7,13 @@ AUTOMAKE_OPTIONS = foreign 1.4
 BSP_FILES = startup clock console timer
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/compile.am
 include $(top_srcdir)/../../../../../../automake/lib.am
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
-  $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.o) \
-  $(foreach piece, $(GENERIC_FILES), ../../../$(piece)/$(ARCH)/$(piece).rel)
+    $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.o) \
+    $(foreach piece, $(GENERIC_FILES), ../../../$(piece)/$(ARCH)/$(piece).rel)
 
 LIB = $(ARCH)/libbsp.a