2004-04-12 Ralf Corsepius <ralf_corsepius@rtems.org>

	* acinclude.m4 (RTEMS_CPUOPT): Use AC_DEFINE_UNQUOTED.
	* backward/motorola/mc68681.h, backward/motorola/mc68230.h,
	backward/zilog/z8536.h, backward/zilog/z8036.h,
	backward/zilog/z8030.h: New.
	* Makefile.am: Reflect having added new files above.

8 files changed, 82 insertions, 1 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 0d9ce3512c..62db9052fe 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,11 @@
+2004-04-12	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* acinclude.m4 (RTEMS_CPUOPT): Use AC_DEFINE_UNQUOTED.
+	* backward/motorola/mc68681.h, backward/motorola/mc68230.h,
+	backward/zilog/z8536.h, backward/zilog/z8036.h,
+	backward/zilog/z8030.h: New.
+	* Makefile.am: Reflect having added new files above.
+
 2004-04-09	Ralf Corsepius <ralf_corsepius@rtems.org>
 
 	* wrapup/Makefile.am: Add libblock for !UNIX only.
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index 6210d62c52..6d72915a8d 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -28,6 +28,14 @@ include_HEADERS += backward/asm.h backward/chain.h backward/clockdrv.h \
     backward/ringbuf.h backward/rtc.h backward/spurious.h \
     backward/timerdrv.h backward/vmeintr.h
 
+include_motoroladir = $(includedir)/motorola
+include_motorola_HEADERS = backward/motorola/mc68681.h \
+    backward/motorola/mc68230.h
+
+include_zilogdir = $(includedir)/zilog
+include_zilog_HEADERS = backward/zilog/z8536.h backward/zilog/z8036.h \
+    backward/zilog/z8030.h
+
 if !UNIX
 include_HEADERS += backward/dosfs.h
 endif
@@ -99,6 +107,36 @@ $(PROJECT_INCLUDE)/vmeintr.h: backward/vmeintr.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/vmeintr.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/vmeintr.h
 
+$(PROJECT_INCLUDE)/motorola/$(dirstamp):
+	@$(mkdir_p) $(PROJECT_INCLUDE)/motorola
+	@: > $(PROJECT_INCLUDE)/motorola/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/motorola/$(dirstamp)
+
+$(PROJECT_INCLUDE)/motorola/mc68681.h: backward/motorola/mc68681.h $(PROJECT_INCLUDE)/motorola/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/motorola/mc68681.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/motorola/mc68681.h
+
+$(PROJECT_INCLUDE)/motorola/mc68230.h: backward/motorola/mc68230.h $(PROJECT_INCLUDE)/motorola/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/motorola/mc68230.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/motorola/mc68230.h
+
+$(PROJECT_INCLUDE)/zilog/$(dirstamp):
+	@$(mkdir_p) $(PROJECT_INCLUDE)/zilog
+	@: > $(PROJECT_INCLUDE)/zilog/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/zilog/$(dirstamp)
+
+$(PROJECT_INCLUDE)/zilog/z8536.h: backward/zilog/z8536.h $(PROJECT_INCLUDE)/zilog/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/zilog/z8536.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog/z8536.h
+
+$(PROJECT_INCLUDE)/zilog/z8036.h: backward/zilog/z8036.h $(PROJECT_INCLUDE)/zilog/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/zilog/z8036.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog/z8036.h
+
+$(PROJECT_INCLUDE)/zilog/z8030.h: backward/zilog/z8030.h $(PROJECT_INCLUDE)/zilog/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/zilog/z8030.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog/z8030.h
+
 if !UNIX
 $(PROJECT_INCLUDE)/dosfs.h: backward/dosfs.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dosfs.h
diff --git a/cpukit/acinclude.m4 b/cpukit/acinclude.m4
index a01901df78..ef4268e84b 100644
--- a/cpukit/acinclude.m4
+++ b/cpukit/acinclude.m4
@@ -10,7 +10,7 @@ cat >>cpuopts.tmp <<_ACEOF
 _ACEOF
 ## FIXME: Duplicate the define to the autoheader
 ## Sanity check - Should be removed in future
-    AC_DEFINE([$1],[$3],[$4])
+    AC_DEFINE_UNQUOTED([$1],[$3],[$4])
   else
 cat >>cpuopts.tmp <<\_ACEOF
 
diff --git a/cpukit/backward/motorola/mc68230.h b/cpukit/backward/motorola/mc68230.h
new file mode 100644
index 0000000000..30f4f81db5
--- /dev/null
+++ b/cpukit/backward/motorola/mc68230.h
@@ -0,0 +1,7 @@
+#ifndef __motorola_mc68230_h
+#define __motorola_mc68230_h
+#ifndef RTEMS_NO_WARN_DEPRECATED
+#warning <motorola/mc68230.h> is deprecated, use <rtems/motorola/mc68230.h> instead
+#endif
+#include <rtems/motorola/mc68230.h>
+#endif
diff --git a/cpukit/backward/motorola/mc68681.h b/cpukit/backward/motorola/mc68681.h
new file mode 100644
index 0000000000..3f78a7cd59
--- /dev/null
+++ b/cpukit/backward/motorola/mc68681.h
@@ -0,0 +1,7 @@
+#ifndef __motorola_mc68681_h
+#define __motorola_mc68681_h
+#ifndef RTEMS_NO_WARN_DEPRECATED
+#warning <motorola/mc68681.h> is deprecated, use <rtems/motorola/mc68681.h> instead
+#endif
+#include <rtems/motorola/mc68681.h>
+#endif
diff --git a/cpukit/backward/zilog/z8030.h b/cpukit/backward/zilog/z8030.h
new file mode 100644
index 0000000000..2974a5026e
--- /dev/null
+++ b/cpukit/backward/zilog/z8030.h
@@ -0,0 +1,7 @@
+#ifndef __zilog_z8030_h
+#define __zilog_z8030_h
+#ifndef RTEMS_NO_WARN_DEPRECATED
+#warning <zilog/z8030.h> is deprecated, use <rtems/zilog/z8030.h> instead
+#endif
+#include <rtems/zilog/z8030.h>
+#endif
diff --git a/cpukit/backward/zilog/z8036.h b/cpukit/backward/zilog/z8036.h
new file mode 100644
index 0000000000..d1c5b5ee4c
--- /dev/null
+++ b/cpukit/backward/zilog/z8036.h
@@ -0,0 +1,7 @@
+#ifndef __zilog_z8036_h
+#define __zilog_z8036_h
+#ifndef RTEMS_NO_WARN_DEPRECATED
+#warning <zilog/z8036.h> is deprecated, use <rtems/zilog/z8036.h> instead
+#endif
+#include <rtems/zilog/z8036.h>
+#endif
diff --git a/cpukit/backward/zilog/z8536.h b/cpukit/backward/zilog/z8536.h
new file mode 100644
index 0000000000..4f61feb9ba
--- /dev/null
+++ b/cpukit/backward/zilog/z8536.h
@@ -0,0 +1,7 @@
+#ifndef __zilog_z8536_h
+#define __zilog_z8536_h
+#ifndef RTEMS_NO_WARN_DEPRECATED
+#warning <zilog/z8536.h> is deprecated, use <rtems/zilog/z8536.h> instead
+#endif
+#include <rtems/zilog/z8536.h>
+#endif