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

	* m68040/Makefile.am: Merge-in m68040/fpsp/Makefile.am.
	Use automake-compilation rules.
	* m68040/fpsp/Makefile.am: Remove.
	* shared/Makefile.am: Use automake compilation rules.
	* Makefile.am: Reflect changes above. Remove CPU_SUBDIR.
	* configure.ac: Require automake >= 1.8.2.
	Add subdir-objects to AUTOMAKE_OPTIONS.
	Remove CHECK_CUSTOM_BSP.
	Reflect changes above.

2 files changed, 34 insertions, 45 deletions

diff --git a/c/src/lib/libcpu/m68k/m68040/Makefile.am b/c/src/lib/libcpu/m68k/m68040/Makefile.am
index 76b654350c..c8610a3984 100644
--- a/c/src/lib/libcpu/m68k/m68040/Makefile.am
+++ b/c/src/lib/libcpu/m68k/m68040/Makefile.am
@@ -2,7 +2,39 @@
 ## $Id$
 ##
 
-SUBDIRS = fpsp
+EXTRA_PROGRAMS =
+CLEANFILES =
+noinst_DATA =
+
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
+
+if m68040
+EXTRA_PROGRAMS += fpsp.rel
+CLEANFILES += fpsp.rel
+fpsp_rel_SOURCES = fpsp/rtems_fpsp.c fpsp/bindec.S fpsp/binstr.S \
+    fpsp/bugfix.S fpsp/decbin.S fpsp/do_func.S fpsp/gen_except.S \
+    fpsp/get_op.S fpsp/kernel_ex.S fpsp/res_func.S fpsp/round.S \
+    fpsp/rtems_skel.S fpsp/sacos.S fpsp/sasin.S fpsp/satan.S fpsp/satanh.S \
+    fpsp/scale.S fpsp/scosh.S fpsp/setox.S fpsp/sgetem.S fpsp/sint.S \
+    fpsp/slog2.S fpsp/slogn.S fpsp/smovecr.S fpsp/srem_mod.S fpsp/ssin.S \
+    fpsp/ssinh.S fpsp/stan.S fpsp/stanh.S fpsp/sto_res.S fpsp/stwotox.S \
+    fpsp/tbldo.S fpsp/util.S fpsp/x_bsun.S fpsp/x_fline.S fpsp/x_operr.S \
+    fpsp/x_ovfl.S fpsp/x_snan.S fpsp/x_store.S fpsp/x_unfl.S fpsp/x_unimp.S \
+    fpsp/x_unsupp.S
+fpsp_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+fpsp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+EXTRA_PROGRAMS += fpsp_g.rel
+CLEANFILES += fpsp_g.rel
+fpsp_g_rel_SOURCES = $(fpsp_rel_SOURCES)
+fpsp_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+fpsp_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += fpsp$(LIB_VARIANT).rel
+
+noinst_HEADERS = fpsp/fpsp.defs
+endif
+EXTRA_DIST = fpsp/README
 
-include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.am b/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.am
deleted file mode 100644
index dd856d76a8..0000000000
--- a/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-##
-## $Id$
-##
-
-PGM = $(ARCH)/fpsp.rel
-
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
-
-C_FILES = rtems_fpsp.c
-OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-noinst_HEADERS = fpsp.defs
-
-S_FILES = bindec.S binstr.S bugfix.S decbin.S do_func.S gen_except.S \
-    get_op.S kernel_ex.S res_func.S round.S rtems_skel.S sacos.S sasin.S \
-    satan.S satanh.S scale.S scosh.S setox.S sgetem.S sint.S slog2.S slogn.S \
-    smovecr.S srem_mod.S ssin.S ssinh.S stan.S stanh.S sto_res.S stwotox.S \
-    tbldo.S util.S x_bsun.S x_fline.S x_operr.S x_ovfl.S x_snan.S x_store.S \
-    x_unfl.S x_unimp.S x_unsupp.S
-OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-$(PGM): $(OBJS)
-	$(make-rel)
-
-if m68040
-all-local: $(OBJS) $(PGM)
-endif
-
-.PRECIOUS: $(PGM)
-
-EXTRA_DIST = README bindec.S binstr.S bugfix.S decbin.S do_func.S fpsp.defs \
-    gen_except.S get_op.S kernel_ex.S res_func.S round.S rtems_fpsp.c \
-    rtems_skel.S sacos.S sasin.S satan.S satanh.S scale.S scosh.S setox.S \
-    sgetem.S sint.S slog2.S slogn.S smovecr.S srem_mod.S ssin.S ssinh.S \
-    stan.S stanh.S sto_res.S stwotox.S tbldo.S util.S x_bsun.S x_fline.S \
-    x_operr.S x_ovfl.S x_snan.S x_store.S x_unfl.S x_unimp.S x_unsupp.S
-
-include $(top_srcdir)/../../../automake/local.am