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

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

10 files changed, 34 insertions, 22 deletions

diff --git a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog
index 101734ce64..badcf19a29 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog
+++ b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-04	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* clock/Makefile.am, console/Makefile.am, start/Makefile.am,
+	startup/Makefile.am, timer/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/c4x/c4xsim/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/Makefile.am
index f6239d217d..b0ba3532c5 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/Makefile.am
+++ b/c/src/lib/libbsp/c4x/c4xsim/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/c4x/c4xsim/clock/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/clock/Makefile.am
index 1f2b57d4c5..2ec91f793c 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/clock/Makefile.am
+++ b/c/src/lib/libbsp/c4x/c4xsim/clock/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
@@ -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/c4x/c4xsim/console/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/console/Makefile.am
index 50545f9ed9..c3a38d51b8 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/console/Makefile.am
+++ b/c/src/lib/libbsp/c4x/c4xsim/console/Makefile.am
@@ -1,19 +1,20 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = $(ARCH)/console.rel
-
 VPATH = @srcdir@:@srcdir@/../../../shared
 
+PGM = $(ARCH)/console.rel
+
 C_FILES = console.c consolereserveresources.c debugio.c simio.c
 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/c4x/c4xsim/include/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/include/Makefile.am
index 39708ee467..957c6552e6 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/include/Makefile.am
+++ b/c/src/lib/libbsp/c4x/c4xsim/include/Makefile.am
@@ -1,10 +1,10 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_FILES = bsp.h simio.h 
+H_FILES = bsp.h simio.h
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
@@ -16,7 +16,7 @@ $(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h
 	$(INSTALL_DATA) $< $@
 
 PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \
-    $(PROJECT_INCLUDE)/coverhd.h 
+    $(PROJECT_INCLUDE)/coverhd.h
 
 all-local: $(PREINSTALL_FILES)
 
diff --git a/c/src/lib/libbsp/c4x/c4xsim/start/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/start/Makefile.am
index 824d7a22c5..86053b9e99 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/start/Makefile.am
+++ b/c/src/lib/libbsp/c4x/c4xsim/start/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
@@ -12,6 +12,7 @@ S_O_FILES = $(S_FILES:%.S=$(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/c4x/c4xsim/startup/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/startup/Makefile.am
index e8319e2af0..157e643730 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/startup/Makefile.am
+++ b/c/src/lib/libbsp/c4x/c4xsim/startup/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
@@ -16,6 +16,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/c4x/c4xsim/timer/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/timer/Makefile.am
index 7f16dcc233..53b53ebc99 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/timer/Makefile.am
+++ b/c/src/lib/libbsp/c4x/c4xsim/timer/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
@@ -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/c4x/c4xsim/tools/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/tools/Makefile.am
index fd48f4ee00..8e4c9de6ae 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/tools/Makefile.am
+++ b/c/src/lib/libbsp/c4x/c4xsim/tools/Makefile.am
@@ -5,7 +5,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-noinst_SCRIPTS=runtest
+noinst_SCRIPTS = runtest
 
 #HACK: install to build-tree
 all-local: $(SCRIPTS)
diff --git a/c/src/lib/libbsp/c4x/c4xsim/wrapup/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/wrapup/Makefile.am
index 6e3c0f8144..4d7c516a87 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/c4x/c4xsim/wrapup/Makefile.am
@@ -1,12 +1,12 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
 BSP_PIECES = startup console clock timer
 # pieces to pick up out of libcpu/sparc
-CPU_PIECES = 
+CPU_PIECES =
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
@@ -14,6 +14,7 @@ OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
 LIB = $(ARCH)/libbsp.a
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/compile.am
 include $(top_srcdir)/../../../../../../automake/lib.am
 
 #