2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* i960ca/Makefile.am, i960ka/Makefile.am, i960rp/Makefile.am:
	Use automake compilation rules.
	* Makefile.am: Add PREINSTALL_DIRS.
	* configure.ac: Add subdir-objects to AUTOMAKE_OPTIONS.
	Require automake >= 1.8.2.

6 files changed, 64 insertions, 32 deletions

diff --git a/c/src/lib/libcpu/i960/ChangeLog b/c/src/lib/libcpu/i960/ChangeLog
index f5ac1639cd..306fab6556 100644
--- a/c/src/lib/libcpu/i960/ChangeLog
+++ b/c/src/lib/libcpu/i960/ChangeLog
@@ -1,3 +1,11 @@
+2004-01-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* i960ca/Makefile.am, i960ka/Makefile.am, i960rp/Makefile.am:
+	Use automake compilation rules.
+	* Makefile.am: Add PREINSTALL_DIRS.
+	* configure.ac: Add subdir-objects to AUTOMAKE_OPTIONS.
+	Require automake >= 1.8.2.
+
 2004-01-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES.
diff --git a/c/src/lib/libcpu/i960/Makefile.am b/c/src/lib/libcpu/i960/Makefile.am
index 46cb4e97d2..3c629fd2ea 100644
--- a/c/src/lib/libcpu/i960/Makefile.am
+++ b/c/src/lib/libcpu/i960/Makefile.am
@@ -11,14 +11,15 @@ include_libcpudir = $(includedir)/libcpu
 include_libcpu_HEADERS = include/i960CA.h include/i960HA.h include/i960KA.h \
     include/i960RP.h include/i960JX_RP_common.h
 
-all-local: $(TMPINSTALL_FILES)
+all-local: $(PREINSTALL_FILES)
 
+PREINSTALL_DIRS =
 PREINSTALL_FILES =
 
 $(PROJECT_INCLUDE)/libcpu/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_INCLUDE)/libcpu
 	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
 
 $(PROJECT_INCLUDE)/libcpu/i960CA.h: include/i960CA.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/i960CA.h
@@ -41,6 +42,7 @@ $(PROJECT_INCLUDE)/libcpu/i960JX_RP_common.h: include/i960JX_RP_common.h $(PROJE
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/i960JX_RP_common.h
 
 CLEANFILES = $(PREINSTALL_FILES)
+DISTCLEANFILES = $(PREINSTALL_DIRS)
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/i960/configure.ac b/c/src/lib/libcpu/i960/configure.ac
index 610c67303e..59b29989d2 100644
--- a/c/src/lib/libcpu/i960/configure.ac
+++ b/c/src/lib/libcpu/i960/configure.ac
@@ -9,16 +9,16 @@ RTEMS_TOP(../../../../..)
 
 RTEMS_CANONICAL_TARGET_CPU
 
-AM_INIT_AUTOMAKE([no-define foreign 1.8])
+AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.8.2])
 AM_MAINTAINER_MODE
 
 RTEMS_ENABLE_BARE
 RTEMS_ENV_RTEMSBSP
 
-
 RTEMS_PROJECT_ROOT
 
 RTEMS_PROG_CC_FOR_TARGET
+AM_PROG_CC_C_O
 RTEMS_CANONICALIZE_TOOLS
 
 AM_CONDITIONAL(i960ca, test "$RTEMS_CPU_MODEL" = "i960ca")
@@ -29,6 +29,7 @@ AM_CONDITIONAL(i960rp, test "$RTEMS_CPU_MODEL" = "i960rp")
 AC_CONFIG_FILES([Makefile
 i960ca/Makefile
 i960ka/Makefile
-i960rp/Makefile])
+i960rp/Makefile
+])
 AC_OUTPUT
 
diff --git a/c/src/lib/libcpu/i960/i960ca/Makefile.am b/c/src/lib/libcpu/i960/i960ca/Makefile.am
index e7aaa471ad..60de75db0c 100644
--- a/c/src/lib/libcpu/i960/i960ca/Makefile.am
+++ b/c/src/lib/libcpu/i960/i960ca/Makefile.am
@@ -5,17 +5,24 @@
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
-C_FILES = cpu_install_intr_stack.c cpu_install_raw_isr.c
-OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
+EXTRA_PROGRAMS =
+CLEANFILES =
+noinst_DATA =
 
 if i960ca
-all-local: $(OBJS)
-endif
+EXTRA_PROGRAMS += score.rel
+CLEANFILES += score.rel
+score_rel_SOURCES = cpu_install_intr_stack.c cpu_install_raw_isr.c
+score_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+score_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_DIST = cpu_install_intr_stack.c cpu_install_raw_isr.c
+EXTRA_PROGRAMS += score_g.rel
+CLEANFILES += score_g.rel
+score_g_rel_SOURCES = $(score_rel_SOURCES)
+score_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+score_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += score$(LIB_VARIANT).rel
+endif
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/i960/i960ka/Makefile.am b/c/src/lib/libcpu/i960/i960ka/Makefile.am
index 5673190f12..4089fb3c40 100644
--- a/c/src/lib/libcpu/i960/i960ka/Makefile.am
+++ b/c/src/lib/libcpu/i960/i960ka/Makefile.am
@@ -5,17 +5,24 @@
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
-C_FILES = cpu_install_intr_stack.c cpu_install_raw_isr.c
-OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
+EXTRA_PROGRAMS =
+CLEANFILES =
+noinst_DATA =
 
 if i960ka
-all-local: $(OBJS)
-endif
+EXTRA_PROGRAMS += score.rel
+CLEANFILES += score.rel
+score_rel_SOURCES = cpu_install_intr_stack.c cpu_install_raw_isr.c
+score_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+score_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_DIST = cpu_install_intr_stack.c cpu_install_raw_isr.c
+EXTRA_PROGRAMS += score_g.rel
+CLEANFILES += score_g.rel
+score_g_rel_SOURCES = $(score_rel_SOURCES)
+score_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+score_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += score$(LIB_VARIANT).rel
+endif
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/i960/i960rp/Makefile.am b/c/src/lib/libcpu/i960/i960rp/Makefile.am
index 4d168fadae..c8edbaa3e9 100644
--- a/c/src/lib/libcpu/i960/i960rp/Makefile.am
+++ b/c/src/lib/libcpu/i960/i960rp/Makefile.am
@@ -5,17 +5,24 @@
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
-C_FILES = cpu_install_intr_stack.c cpu_install_raw_isr.c
-OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
+EXTRA_PROGRAMS =
+CLEANFILES =
+noinst_DATA =
 
 if i960rp
-all-local: $(OBJS)
-endif
+EXTRA_PROGRAMS += score.rel
+CLEANFILES += score.rel
+score_rel_SOURCES = cpu_install_intr_stack.c cpu_install_raw_isr.c
+score_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+score_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_DIST = cpu_install_intr_stack.c cpu_install_raw_isr.c
+EXTRA_PROGRAMS += score_g.rel
+CLEANFILES += score_g.rel
+score_g_rel_SOURCES = $(score_rel_SOURCES)
+score_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+score_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += score$(LIB_VARIANT).rel
+endif
 
 include $(top_srcdir)/../../../automake/local.am