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

	* syscall/Makefile.am: Remove.
	* reg_win/Makefile.am: Remove.
	* cache/Makefile.am: Remove.
	* Makefile.am: Merge-in Makefile.ams above. Use automake compilation
	rules.
	* configure.ac: Reflect changes above.
	Add subdir-objects to AUTOMAKE_OPTIONS.
	Require automake >= 1.8.2.

6 files changed, 89 insertions, 116 deletions

diff --git a/c/src/lib/libcpu/sparc/ChangeLog b/c/src/lib/libcpu/sparc/ChangeLog
index 69edba3fbe..15bab0998f 100644
--- a/c/src/lib/libcpu/sparc/ChangeLog
+++ b/c/src/lib/libcpu/sparc/ChangeLog
@@ -1,3 +1,14 @@
+2004-01-18	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* syscall/Makefile.am: Remove.
+	* reg_win/Makefile.am: Remove.
+	* cache/Makefile.am: Remove.
+	* Makefile.am: Merge-in Makefile.ams above. Use automake compilation
+	rules.
+	* configure.ac: Reflect changes above.
+	Add subdir-objects to AUTOMAKE_OPTIONS.
+	Require automake >= 1.8.2.
+
 2004-01-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* cache/Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES.
diff --git a/c/src/lib/libcpu/sparc/Makefile.am b/c/src/lib/libcpu/sparc/Makefile.am
index 859e9929c4..716d862a2e 100644
--- a/c/src/lib/libcpu/sparc/Makefile.am
+++ b/c/src/lib/libcpu/sparc/Makefile.am
@@ -4,7 +4,80 @@
 
 ACLOCAL_AMFLAGS = -I ../../../aclocal
 
-SUBDIRS = cache reg_win syscall
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
+
+DISTCLEANFILES =
+CLEANFILES =
+EXTRA_PROGRAMS =
+noinst_DATA =
+
+include_libcpudir = $(includedir)/libcpu
+include_libcpu_HEADERS = $(top_srcdir)/../shared/include/cache.h
+
+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)
+
+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)
+
+if has_instruction_cache
+cache_rel_CPPFLAGS += -DHAS_INSTRUCTION_CACHE
+cache_g_rel_CPPFLAGS += -DHAS_INSTRUCTION_CACHE
+endif
+
+noinst_DATA += cache$(LIB_VARIANT).rel
+
+EXTRA_PROGRAMS += syscall.rel
+CLEANFILES += syscall.rel
+syscall_rel_SOURCES = syscall/syscall.S syscall/syscall.h
+syscall_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+syscall_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+EXTRA_PROGRAMS += syscall_g.rel
+CLEANFILES += syscall_g.rel
+syscall_g_rel_SOURCES = $(syscall_rel_SOURCES)
+syscall_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+syscall_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += syscall$(LIB_VARIANT).rel
+
+EXTRA_PROGRAMS += reg_win.rel
+CLEANFILES += reg_win.rel
+reg_win_rel_SOURCES = reg_win/window.S
+reg_win_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+reg_win_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+EXTRA_PROGRAMS += reg_win_g.rel
+CLEANFILES += reg_win_g.rel
+reg_win_g_rel_SOURCES = $(reg_win_rel_SOURCES)
+reg_win_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+reg_win_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += reg_win$(LIB_VARIANT).rel
+
+all-local: $(PREINSTALL_FILES)
+
+PREINSTALL_DIRS =
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
+	@$(mkdir_p) $(PROJECT_INCLUDE)/libcpu
+	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+
+$(PROJECT_INCLUDE)/libcpu/cache.h: $(top_srcdir)/../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)
+DISTCLEANFILES += $(PREINSTALL_DIRS)
 
-include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/sparc/cache/Makefile.am b/c/src/lib/libcpu/sparc/cache/Makefile.am
deleted file mode 100644
index b9af8529bd..0000000000
--- a/c/src/lib/libcpu/sparc/cache/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-##
-## $Id$
-##
-
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
-
-src_C_FILES = cache.c
-common_C_FILES = ../../shared/src/cache_aligned_malloc.c
-common_C_FILES += ../../shared/src/cache_manager.c
-
-OBJS = $(src_C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-OBJS += $(common_C_FILES:../../shared/src/%.c=$(ARCH)/%.$(OBJEXT))
-
-include_libcpudir = $(includedir)/libcpu
-
-include_libcpu_HEADERS = ../../shared/include/cache.h
-noinst_HEADERS = cache_.h
-
-if has_instruction_cache
-CACHE_DEFINE = -DHAS_INSTRUCTION_CACHE
-endif
-
-AM_CPPFLAGS += -I$(srcdir) $(CACHE_DEFINE)
-
-$(ARCH)/%.$(OBJEXT): ../../shared/src/%.c $(ARCH)/$(dirstamp)
-	${COMPILE} -o $@ -c $<
-
-all-local: $(PREINSTALL_FILES) $(OBJS)
-
-EXTRA_DIST = cache.c cache_.h
-
-PREINSTALL_FILES =
-
-$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
-	@$(mkdir_p) $(PROJECT_INCLUDE)/libcpu
-	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-PREINSTALL_FILES += $(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)
-
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/sparc/configure.ac b/c/src/lib/libcpu/sparc/configure.ac
index 126678eac5..010d77b035 100644
--- a/c/src/lib/libcpu/sparc/configure.ac
+++ b/c/src/lib/libcpu/sparc/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
 RTEMS_PROG_CCAS
 
@@ -28,9 +28,6 @@ AM_CONDITIONAL(has_instruction_cache, test "$RTEMS_CPU_MODEL" = "leon1" \
 || test "$RTEMS_CPU_MODEL" = "leon2" )
 
 # Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile
-cache/Makefile
-reg_win/Makefile
-syscall/Makefile])
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 
diff --git a/c/src/lib/libcpu/sparc/reg_win/Makefile.am b/c/src/lib/libcpu/sparc/reg_win/Makefile.am
deleted file mode 100644
index 9bb708e465..0000000000
--- a/c/src/lib/libcpu/sparc/reg_win/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-##
-## $Id$
-##
-
-PGM = $(ARCH)/reg_win.rel
-
-S_FILES = window.S
-reg_win_rel_OBJECTS = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
-
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-$(PGM): $(reg_win_rel_OBJECTS)
-	$(make-rel)
-
-# the .rel file built here will be put into libbsp.a by
-#    libbsp/sparc/BSP/wrapup/Makefile
-
-all-local: $(reg_win_rel_OBJECTS) $(PGM)
-
-.PRECIOUS: $(PGM)
-
-EXTRA_DIST = window.S
-
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/sparc/syscall/Makefile.am b/c/src/lib/libcpu/sparc/syscall/Makefile.am
deleted file mode 100644
index 8c2a1ae4cb..0000000000
--- a/c/src/lib/libcpu/sparc/syscall/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-##
-## $Id$
-##
-
-PGM = $(ARCH)/syscall.rel
-
-## Assembly sources
-S_FILES = syscall.S
-
-noinst_HEADERS = syscall.h
-
-syscall_rel_OBJECTS = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
-
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-$(PGM): $(syscall_rel_OBJECTS)
-	$(make-rel)
-
-# the .rel file built here will be put into libbsp.a by
-#    libbsp/sparc/BSP/wrapup/Makefile
-
-all-local: $(syscall_rel_OBJECTS) $(PGM)
-
-.PRECIOUS: $(PGM)
-
-EXTRA_DIST = syscall.S syscall.h
-
-include $(top_srcdir)/../../../automake/local.am