summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--c/src/lib/libbsp/m68k/sim68000/ChangeLog5
-rw-r--r--c/src/lib/libbsp/m68k/sim68000/clock/Makefile.am3
-rw-r--r--c/src/lib/libbsp/m68k/sim68000/console/Makefile.am3
-rw-r--r--c/src/lib/libbsp/m68k/sim68000/start/Makefile.am1
-rw-r--r--c/src/lib/libbsp/m68k/sim68000/startup/Makefile.am1
-rw-r--r--c/src/lib/libbsp/m68k/sim68000/wrapup/Makefile.am5
6 files changed, 14 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/m68k/sim68000/ChangeLog b/c/src/lib/libbsp/m68k/sim68000/ChangeLog
index 101734ce64..92f64eb66c 100644
--- a/c/src/lib/libbsp/m68k/sim68000/ChangeLog
+++ b/c/src/lib/libbsp/m68k/sim68000/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/m68k/sim68000/clock/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/clock/Makefile.am
index 23a7a9cff4..7269c206ea 100644
--- a/c/src/lib/libbsp/m68k/sim68000/clock/Makefile.am
+++ b/c/src/lib/libbsp/m68k/sim68000/clock/Makefile.am
@@ -14,6 +14,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
#
@@ -29,7 +30,7 @@ all-local: $(ARCH) $(OBJS) $(PGM)
.PRECIOUS: $(PGM)
-# XXX add the other variant files here
+# XXX add the other variant files here
EXTRA_DIST = clockdrv.c
include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/m68k/sim68000/console/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/console/Makefile.am
index 2ee7fd276e..235321c7d3 100644
--- a/c/src/lib/libbsp/m68k/sim68000/console/Makefile.am
+++ b/c/src/lib/libbsp/m68k/sim68000/console/Makefile.am
@@ -11,12 +11,13 @@ PGM = $(ARCH)/console.rel
C_FILES = conscfg.c console.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/m68k/sim68000/start/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/start/Makefile.am
index e5a9f26a27..86053b9e99 100644
--- a/c/src/lib/libbsp/m68k/sim68000/start/Makefile.am
+++ b/c/src/lib/libbsp/m68k/sim68000/start/Makefile.am
@@ -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/m68k/sim68000/startup/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/startup/Makefile.am
index 7215533447..58b682e5f3 100644
--- a/c/src/lib/libbsp/m68k/sim68000/startup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/sim68000/startup/Makefile.am
@@ -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/m68k/sim68000/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/wrapup/Makefile.am
index ae52204fdb..81b4604e8a 100644
--- a/c/src/lib/libbsp/m68k/sim68000/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/sim68000/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