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

	* clock/Makefile.am: Convert to using automake compilation rules.
	* mongoosev/Makefile.am: Ditto.
	* r46xx/Makefile.am: Ditto.
	* shared/Makefile.am: Ditto.
	* timer/Makefile.am: Ditto.
	* tx39/Makefile.am: Ditto.
	* Makefile.am: Remove conditional subdirs.
	* configure.ac: Add subdir-object to AUTOMAKE_OPTIONS.
	Require automake-1.8.2. Add AM_PROG_CC_C_O.

1 files changed, 31 insertions, 30 deletions

diff --git a/c/src/lib/libcpu/mips/mongoosev/Makefile.am b/c/src/lib/libcpu/mips/mongoosev/Makefile.am
index 994caa2963..9c3fb721b5 100644
--- a/c/src/lib/libcpu/mips/mongoosev/Makefile.am
+++ b/c/src/lib/libcpu/mips/mongoosev/Makefile.am
@@ -4,13 +4,15 @@
 
 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
 
+EXTRA_PROGRAMS =
 EXTRA_DIST =
-CLEANDIRS =
+CLEANFILES =
 noinst_DATA =
 
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
+if mongoosev
 include_mipsdir = $(includedir)/libcpu
 include_mips_HEADERS = include/mongoose-v.h
 
@@ -18,46 +20,44 @@ include_mips_HEADERS = include/mongoose-v.h
 include_libchipdir = $(includedir)/libchip
 include_libchip_HEADERS = duart/mg5uart.h
 
-duart_C_FILES = duart/mg5uart.c duart/mg5uart_reg.c
-EXTRA_DIST += $(duart_C_FILES) duart/README.mguart
+EXTRA_DIST += duart/README.mguart
 
-duart_rel_OBJECTS = $(duart_C_FILES:duart/%.c=duart/$(ARCH)/%.$(OBJEXT))
+EXTRA_PROGRAMS += duart.rel
+CLEANFILES += duart.rel
+duart_rel_SOURCES = duart/mg5uart.c duart/mg5uart.h duart/mg5uart_reg.c
+duart_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+duart_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-duart/$(ARCH)/$(dirstamp):
-	@$(mkdir_p) duart/$(ARCH)
-	@: > duart/$(ARCH)/$(dirstamp)
-duart/$(ARCH)/%.$(OBJEXT): duart/%.c duart/$(ARCH)/$(dirstamp)
-	${COMPILE} -o $@ -c $<
-duart/$(ARCH)/mg5uart.rel: $(duart_rel_OBJECTS)
-	$(make-rel)
-CLEANDIRS += duart/o-optimize duart/o-debug
-noinst_DATA += duart/$(ARCH)/mg5uart.rel
+EXTRA_PROGRAMS += duart_g.rel
+CLEANFILES += duart_g.rel
+duart_g_rel_SOURCES = $(duart_rel_SOURCES)
+duart_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+duart_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-## vectorisrs
-vectorisrs_C_FILES = vectorisrs/maxvectors.c vectorisrs/vectorisrs.c
-EXTRA_DIST += $(vectorisrs_C_FILES)
+noinst_DATA += duart$(LIB_VARIANT).rel
 
-vectorisrs_rel_OBJECTS = \
-    $(vectorisrs_C_FILES:vectorisrs/%.c=vectorisrs/$(ARCH)/%.$(OBJEXT))
+## vectorisrs
 
-vectorisrs/$(ARCH)/$(dirstamp):
-	@$(mkdir_p) vectorisrs/$(ARCH)
-	@: > vectorisrs/$(ARCH)/$(dirstamp)
-vectorisrs/$(ARCH)/%.$(OBJEXT): vectorisrs/%.c vectorisrs/$(ARCH)/$(dirstamp)
-	${COMPILE} -o $@ -c $<
-vectorisrs/$(ARCH)/vectorisrs.rel: $(vectorisrs_rel_OBJECTS)
-	$(make-rel)
-CLEANDIRS += vectorisrs/o-optimize vectorisrs/o-debug
-noinst_DATA += vectorisrs/$(ARCH)/vectorisrs.rel
+EXTRA_PROGRAMS += vectorisrs.rel
+CLEANFILES += vectorisrs.rel
+vectorisrs_rel_SOURCES = vectorisrs/maxvectors.c vectorisrs/vectorisrs.c
+vectorisrs_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+vectorisrs_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-## --
+EXTRA_PROGRAMS += vectorisrs_g.rel
+CLEANFILES += vectorisrs_g.rel
+vectorisrs_g_rel_SOURCES = $(vectorisrs_rel_SOURCES)
+vectorisrs_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+vectorisrs_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-all-local: $(PREINSTALL_FILES)
+noinst_DATA += vectorisrs$(LIB_VARIANT).rel
+endif
 
 all-local: $(PREINSTALL_FILES)
 
 PREINSTALL_FILES =
 
+if mongoosev
 $(PROJECT_INCLUDE)/libcpu/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_INCLUDE)/libcpu
 	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
@@ -75,7 +75,8 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/$(dirstamp)
 $(PROJECT_INCLUDE)/libchip/mg5uart.h: duart/mg5uart.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/mg5uart.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/mg5uart.h
+endif
 
-CLEANFILES = $(PREINSTALL_FILES)
+CLEANFILES += $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am