2005-01-18 Ralf Corsepius <ralf.corsepius@rtems.org>

	* Makefile.am: Use ../../shared/tod.h instead of include/tod.h.
	* include/tod.h: Remove.

3 files changed, 11 insertions, 48 deletions

diff --git a/c/src/lib/libbsp/m68k/mvme162/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/ChangeLog
index 72e1688280..cab093e8aa 100644
--- a/c/src/lib/libbsp/m68k/mvme162/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme162/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-18	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* Makefile.am: Use ../../shared/tod.h instead of include/tod.h.
+	* include/tod.h: Remove.
+
 2005-01-07	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Eliminate CFLAGS_OPTIMIZE_V.
diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
index 8a96bd3a7d..d8c1e159c2 100644
--- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
@@ -21,9 +21,9 @@ noinst_PROGRAMS =
 # from the individual .rel files built in other directories
 SUBDIRS = . tools
 
+include_HEADERS += ../../shared/tod.h
 include_HEADERS += include/coverhd.h
 include_HEADERS += include/page_table.h
-include_HEADERS += include/tod.h
 
 nodist_include_HEADERS += $(top_srcdir)/../shared/mvme/mvme16x_hw.h
 
@@ -68,8 +68,7 @@ if HAS_NETWORKING
 network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
 noinst_PROGRAMS += network.rel
 network_rel_SOURCES = ../mvme167/network/network.c
-network_rel_CPPFLAGS = $(AM_CPPFLAGS) \
-    $(network_CPPFLAGS)
+network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS)
 network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 #--
@@ -119,6 +118,10 @@ $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
 
+$(PROJECT_INCLUDE)/tod.h: ../../shared/tod.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tod.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.h
+
 $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
@@ -127,10 +130,6 @@ $(PROJECT_INCLUDE)/page_table.h: include/page_table.h $(PROJECT_INCLUDE)/$(dirst
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/page_table.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/page_table.h
 
-$(PROJECT_INCLUDE)/tod.h: include/tod.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tod.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.h
-
 $(PROJECT_INCLUDE)/mvme16x_hw.h: $(top_srcdir)/../shared/mvme/mvme16x_hw.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mvme16x_hw.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/mvme16x_hw.h
diff --git a/c/src/lib/libbsp/m68k/mvme162/include/tod.h b/c/src/lib/libbsp/m68k/mvme162/include/tod.h
deleted file mode 100644
index 7335b2b4f1..0000000000
--- a/c/src/lib/libbsp/m68k/mvme162/include/tod.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Real Time Clock (MK48T08) for RTEMS on MVME162
- *
- *  Author:
- *    COPYRIGHT (C) 1997
- *    by Katsutoshi Shibuya - BU Denken Co.,Ltd. - Sapporo - JAPAN
- *    ALL RIGHTS RESERVED
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- *
- *  This material is a part of the MVME162 Board Support Package
- *  for the RTEMS executive. Its licensing policies are those of the
- *  RTEMS above.
- *
- *  $Id$
- */
-
-#ifndef TOD_H
-#define TOD_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern void setRealTimeToRTEMS();
-/* Read real time from RTC and set it to RTEMS' clock manager */
-
-extern void setRealTimeFromRTEMS();
-/* Read time from RTEMS' clock manager and set it to RTC */
-
-extern int checkRealTime();
-/* Return the difference between RTC and RTEMS' clock manager time in minutes.
-   If the difference is greater than 1 day, this returns 9999. */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif