From f8284c95cf40692916a3280fbbe3ed242807192d Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Thu, 1 Apr 2004 15:12:39 +0000
Subject: 2004-04-01	Ralf Corsepius <ralf_corsepius@rtems.org>

	* backward/confdefs.h: New.
	* Makefile.am: Add  backward/confdefs.h.
	Add conditional DEPRECATED.
	* configure.ac: Add --enable-deprecated.
	Add conditional DEPRECATED.
---
 cpukit/ChangeLog           |  8 ++++++++
 cpukit/Makefile.am         | 18 ++++++++++++++----
 cpukit/backward/confdefs.h |  7 +++++++
 cpukit/configure.ac        |  9 +++++++++
 4 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 cpukit/backward/confdefs.h

(limited to 'cpukit')

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 006f37ee7c..2de2dfd485 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,11 @@
+2004-04-01	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* backward/confdefs.h: New.
+	* Makefile.am: Add  backward/confdefs.h.
+	Add conditional DEPRECATED.
+	* configure.ac: Add --enable-deprecated.
+	Add conditional DEPRECATED.
+
 2004-04-01	Ralf Corsepius <ralf_corsepius@rtems.org>
 
 	* sapi/Makefile.am: Install confdefs.h to $(includedir)/rtems.
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index a8dc0d82ae..6210d62c52 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -20,10 +20,13 @@ preinstall-stamp:
 	touch preinstall-stamp
 CLEANFILES = preinstall-stamp
 
-include_HEADERS = backward/asm.h backward/chain.h backward/clockdrv.h \
-    backward/console.h backward/imfs.h backward/iosupp.h backward/ringbuf.h \
-    backward/rtc.h backward/spurious.h backward/timerdrv.h \
-    backward/vmeintr.h
+include_HEADERS =
+
+if DEPRECATED
+include_HEADERS += backward/asm.h backward/chain.h backward/clockdrv.h \
+    backward/confdefs.h backward/console.h backward/imfs.h backward/iosupp.h \
+    backward/ringbuf.h backward/rtc.h backward/spurious.h \
+    backward/timerdrv.h backward/vmeintr.h
 
 if !UNIX
 include_HEADERS += backward/dosfs.h
@@ -32,6 +35,7 @@ endif
 if HAS_ITRON
 include_HEADERS += backward/itron.h
 endif
+endif
 
 include_rtemsdir = $(includedir)/rtems
 include_rtems_HEADERS = include/rtems/bspIo.h include/rtems/userenv.h \
@@ -46,6 +50,7 @@ $(PROJECT_INCLUDE)/$(dirstamp):
 	@: > $(PROJECT_INCLUDE)/$(dirstamp)
 PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
 
+if DEPRECATED
 $(PROJECT_INCLUDE)/asm.h: backward/asm.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h
@@ -58,6 +63,10 @@ $(PROJECT_INCLUDE)/clockdrv.h: backward/clockdrv.h $(PROJECT_INCLUDE)/$(dirstamp
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/clockdrv.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/clockdrv.h
 
+$(PROJECT_INCLUDE)/confdefs.h: backward/confdefs.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/confdefs.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/confdefs.h
+
 $(PROJECT_INCLUDE)/console.h: backward/console.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/console.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/console.h
@@ -101,6 +110,7 @@ $(PROJECT_INCLUDE)/itron.h: backward/itron.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/itron.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/itron.h
 endif
+endif
 
 $(PROJECT_INCLUDE)/rtems/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_INCLUDE)/rtems
diff --git a/cpukit/backward/confdefs.h b/cpukit/backward/confdefs.h
new file mode 100644
index 0000000000..85bc2d6175
--- /dev/null
+++ b/cpukit/backward/confdefs.h
@@ -0,0 +1,7 @@
+#ifndef __confdefs_h
+#define __confdefs_h
+#ifndef RTEMS_NO_WARN_DEPRECATED
+#warning <confdefs.h> is deprecated, use <rtems/confdefs.h> instead
+#endif
+#include <rtems/confdefs.h>
+#endif
diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index 67a24ad5fe..4d6aacdcb4 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -67,6 +67,15 @@ AC_ARG_ENABLE([ada],
   *)  AC_MSG_ERROR([bad value ${enable_ada} for --enable-ada]) ;;
 esac],[enable_ada=no])
 
+AC_ARG_ENABLE([deprecated],
+[AS_HELP_STRING(--enable-deprecated,allow using deprecated files)],
+[case "${enable_deprecated}" in
+  yes) ;;
+  no) ;;
+  *) enable_deprecated=yes ;;
+esac],[enable_deprecated=yes])
+AM_CONDITIONAL([DEPRECATED],[test "$enable_deprecated" = "yes"])
+
 # HACK: We should use a feature-based configuration.
 AS_IF([test x"${RTEMS_CPU}" = x"unix"],[
 # HACK: silently accept --enable-unixlib
-- 
cgit v1.2.3