2001-10-17 Joel Sherrill <joel@OARcorp.com>

	* timer: New subdirectory.
	* timer/Makefile.am: New file.
	* timer/.cvsignore: New file.
	* Makefile.am: Modified to reflect above.
	* configure.ac: Ditto.

9 files changed, 86 insertions, 3 deletions

diff --git a/c/src/lib/libbsp/arm/armulator/ChangeLog b/c/src/lib/libbsp/arm/armulator/ChangeLog
index a890bcc571..8b1f7efcd4 100644
--- a/c/src/lib/libbsp/arm/armulator/ChangeLog
+++ b/c/src/lib/libbsp/arm/armulator/ChangeLog
@@ -1,3 +1,11 @@
+2001-10-17	Joel Sherrill <joel@OARcorp.com>
+
+	* timer: New subdirectory.
+	* timer/Makefile.am: New file.
+	* timer/.cvsignore: New file.
+	* Makefile.am: Modified to reflect above.
+	* configure.ac: Ditto.
+
 2001-10-12	Joel Sherrill <joel@OARcorp.com>
 
 	* console/console-io.c: Fixed typo.
diff --git a/c/src/lib/libbsp/arm/armulator/Makefile.am b/c/src/lib/libbsp/arm/armulator/Makefile.am
index d6b85e2828..6b9607fd61 100644
--- a/c/src/lib/libbsp/arm/armulator/Makefile.am
+++ b/c/src/lib/libbsp/arm/armulator/Makefile.am
@@ -7,7 +7,7 @@ ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUBDIRS = . include clock console startup start wrapup
+SUBDIRS = . include clock console startup timer start wrapup
 
 include $(top_srcdir)/../../bsp.am
 
diff --git a/c/src/lib/libbsp/arm/armulator/configure.ac b/c/src/lib/libbsp/arm/armulator/configure.ac
index 8464c45c78..9031b549bd 100644
--- a/c/src/lib/libbsp/arm/armulator/configure.ac
+++ b/c/src/lib/libbsp/arm/armulator/configure.ac
@@ -30,5 +30,6 @@ console/Makefile
 include/Makefile
 start/Makefile
 startup/Makefile
+timer/Makefile
 wrapup/Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/armulator/timer/.cvsignore b/c/src/lib/libbsp/arm/armulator/timer/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/c/src/lib/libbsp/arm/armulator/timer/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/c/src/lib/libbsp/arm/armulator/timer/Makefile.am b/c/src/lib/libbsp/arm/armulator/timer/Makefile.am
new file mode 100644
index 0000000000..7e3394e263
--- /dev/null
+++ b/c/src/lib/libbsp/arm/armulator/timer/Makefile.am
@@ -0,0 +1,35 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+VPATH = @srcdir@:@srcdir@/../../../shared
+
+PGM = $(ARCH)/timer.rel
+
+C_FILES = timerstub.c
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
+
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/compile.am
+include $(top_srcdir)/../../../../../../automake/lib.am
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+$(PGM): $(OBJS)
+	$(make-rel)
+
+# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
+
+all-local: $(ARCH) $(OBJS) $(PGM)
+
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = timer.c
+
+include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/m68k/sim68000/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/Makefile.am
index a0320f099b..a18be0ca0c 100644
--- a/c/src/lib/libbsp/m68k/sim68000/Makefile.am
+++ b/c/src/lib/libbsp/m68k/sim68000/Makefile.am
@@ -7,8 +7,7 @@ ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-#SUBDIRS = include start startup clock console timer wrapup
-SUBDIRS = include start startup clock console wrapup
+SUBDIRS = include start startup clock console timer wrapup
 
 include $(top_srcdir)/../../bsp.am
 
diff --git a/c/src/lib/libbsp/m68k/sim68000/configure.ac b/c/src/lib/libbsp/m68k/sim68000/configure.ac
index fa9d869ed7..f27d374035 100644
--- a/c/src/lib/libbsp/m68k/sim68000/configure.ac
+++ b/c/src/lib/libbsp/m68k/sim68000/configure.ac
@@ -30,5 +30,6 @@ console/Makefile
 include/Makefile
 start/Makefile
 startup/Makefile
+timer/Makefile
 wrapup/Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/m68k/sim68000/timer/.cvsignore b/c/src/lib/libbsp/m68k/sim68000/timer/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/c/src/lib/libbsp/m68k/sim68000/timer/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/c/src/lib/libbsp/m68k/sim68000/timer/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/timer/Makefile.am
new file mode 100644
index 0000000000..7e3394e263
--- /dev/null
+++ b/c/src/lib/libbsp/m68k/sim68000/timer/Makefile.am
@@ -0,0 +1,35 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+VPATH = @srcdir@:@srcdir@/../../../shared
+
+PGM = $(ARCH)/timer.rel
+
+C_FILES = timerstub.c
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
+
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/compile.am
+include $(top_srcdir)/../../../../../../automake/lib.am
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+$(PGM): $(OBJS)
+	$(make-rel)
+
+# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
+
+all-local: $(ARCH) $(OBJS) $(PGM)
+
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = timer.c
+
+include $(top_srcdir)/../../../../../../automake/local.am