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.

6 files changed, 91 insertions, 102 deletions

diff --git a/c/src/lib/libcpu/m68k/ChangeLog b/c/src/lib/libcpu/m68k/ChangeLog
index ec7407dd3d..955374598c 100644
--- a/c/src/lib/libcpu/m68k/ChangeLog
+++ b/c/src/lib/libcpu/m68k/ChangeLog
@@ -1,3 +1,15 @@
+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.
+
 2004-01-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* shared/Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES.
diff --git a/c/src/lib/libcpu/m68k/Makefile.am b/c/src/lib/libcpu/m68k/Makefile.am
index 27a7aed0d8..1cec72dde3 100644
--- a/c/src/lib/libcpu/m68k/Makefile.am
+++ b/c/src/lib/libcpu/m68k/Makefile.am
@@ -4,19 +4,7 @@
 
 ACLOCAL_AMFLAGS = -I ../../../aclocal
 
-if shared
-SHARED_LIB = shared
-endif
-
-if m68040
-CPU_SUBDIR = m68040
-endif
-
-if mcf5206
-CPU_SUBDIR = mcf5206
-endif
-
-SUBDIRS = $(SHARED_LIB) $(CPU_SUBDIR)
+SUBDIRS = shared m68040 mcf5206
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/m68k/configure.ac b/c/src/lib/libcpu/m68k/configure.ac
index 67c3745843..6979b0668f 100644
--- a/c/src/lib/libcpu/m68k/configure.ac
+++ b/c/src/lib/libcpu/m68k/configure.ac
@@ -9,21 +9,19 @@ 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
 RTEMS_PROG_CCAS
 
-RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
-
 # At this time all models should use the shared directory so do this
 AM_CONDITIONAL(shared, true)
 
@@ -45,14 +43,10 @@ AM_CONDITIONAL(mcpu32p, test "$RTEMS_CPU_MODEL" = "m68360" \
 
 AM_CONDITIONAL(mcf5272, test "$RTEMS_CPU_MODEL" = "mcf5272" )
 
-case "$RTEMS_CPU_MODEL" in
-mcf5206 ) AC_CONFIG_SUBDIRS([mcf5206]);;
-*) ;;
-esac
-
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile
 shared/Makefile
 m68040/Makefile
-m68040/fpsp/Makefile])
+mcf5206/Makefile
+])
 AC_OUTPUT
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
diff --git a/c/src/lib/libcpu/m68k/shared/Makefile.am b/c/src/lib/libcpu/m68k/shared/Makefile.am
index 681ca772c5..7cc1a114e2 100644
--- a/c/src/lib/libcpu/m68k/shared/Makefile.am
+++ b/c/src/lib/libcpu/m68k/shared/Makefile.am
@@ -2,44 +2,38 @@
 ## $Id$
 ##
 
-CLEANDIRS =
+CLEANFILES =
 EXTRA_DIST =
+EXTRA_PROGRAMS =
 noinst_DATA =
 
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
+if shared
+include_libcpudir = $(includedir)/libcpu
+
 ## cache
+include_libcpu_HEADERS = ../../shared/include/cache.h
 
-cache_C_FILES = cache/cache.c
-EXTRA_DIST += $(cache_C_FILES)
-cache_OBJECTS = $(cache_C_FILES:cache/%.c=cache/$(ARCH)/%.$(OBJEXT))
-
-common_C_FILES = ../../shared/src/cache_aligned_malloc.c
-common_C_FILES += ../../shared/src/cache_manager.c
-cache_OBJECTS += \
-    $(common_C_FILES:../../shared/src/%.c=cache/$(ARCH)/%.$(OBJEXT))
-
-cache/$(ARCH)/$(dirstamp):
-	@$(mkdir_p) cache/$(ARCH)
-	@: > cache/$(ARCH)/$(dirstamp)
-cache/$(ARCH)/%.$(OBJEXT): cache/%.c cache/$(ARCH)/$(dirstamp)
-	${COMPILE} -I$(srcdir)/cache $(M68K_CPPFLAGS) -o $@ -c $<
-cache/$(ARCH)/%.$(OBJEXT): ../../shared/src/%.c cache/$(ARCH)/$(dirstamp)
-	${COMPILE} -I$(srcdir)/cache $(M68K_CPPFLAGS) -o $@ -c $<
-CLEANDIRS += cache/o-optimize cache/o-debug
-noinst_DATA += $(cache_OBJECTS)
+EXTRA_PROGRAMS += cache.rel
+CLEANFILES += cache.rel
+cache_rel_SOURCES = cache/cache.c cache/cache_.h \
+    ../../shared/src/cache_aligned_malloc.c \
+    ../../shared/src/cache_manager.c
+cache_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -I$(srcdir)/cache
+cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-include_libcpudir = $(includedir)/libcpu
+EXTRA_PROGRAMS += cache_g.rel
+CLEANFILES += cache_g.rel
+cache_g_rel_SOURCES = $(cache_rel_SOURCES)
+cache_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -I$(srcdir)/cache
+cache_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-noinst_HEADERS = cache/cache_.h
-include_libcpu_HEADERS = ../../shared/include/cache.h
+noinst_DATA += cache$(LIB_VARIANT).rel
 
 ## misc
 
-misc_C_FILES = misc/memcpy.c misc/m68kidle.c
-misc_OBJECTS = $(misc_C_FILES:misc/%.c=misc/$(ARCH)/%.$(OBJEXT))
-
 # gcc doesn't recognize difference between the cpu32 and cpu32+ so we have to
 if mcpu32p
 M68K_CPPFLAGS = -D__mcpu32p__
@@ -48,28 +42,40 @@ if mcf5272
 M68K_CPPFLAGS = -Dmcf5272
 endif
 
-misc/$(ARCH)/$(dirstamp):
-	@$(mkdir_p) misc/$(ARCH)
-	@: > misc/$(ARCH)/$(dirstamp)
-misc/$(ARCH)/%.$(OBJEXT): misc/%.c misc/$(ARCH)/$(dirstamp)
-	${COMPILE} $(M68K_CPPFLAGS) -o $@ -c $<
-CLEANDIRS += misc/o-optimize misc/o-debug
-noinst_DATA += $(misc_OBJECTS)
+EXTRA_PROGRAMS += misc.rel
+CLEANFILES += misc.rel
+misc_rel_SOURCES = misc/memcpy.c misc/m68kidle.c
+misc_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) $(M68K_CPPFLAGS)
+misc_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+EXTRA_PROGRAMS += misc_g.rel
+CLEANFILES += misc_g.rel
+misc_g_rel_SOURCES = $(misc_rel_SOURCES)
+misc_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) $(M68K_CPPFLAGS)
+misc_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += misc$(LIB_VARIANT).rel
+endif
 
 ## --
 all-local: $(PREINSTALL_FILES)
 
+PREINSTALL_DIRS =
 PREINSTALL_FILES =
 
+if shared
 $(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/cache.h: ../../shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h
 
-CLEANFILES = $(PREINSTALL_FILES)
+endif
+
+CLEANFILES += $(PREINSTALL_FILES)
+DISTCLEANFILES = $(PREINSTALL_DIRS)
 
 include $(top_srcdir)/../../../automake/local.am