summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-01-04 17:57:28 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-01-04 17:57:28 +0000
commit8217c40656e00102bb2f96c4b36edd47c0aadcfc (patch)
treead2e9a485187d3805489eac0735b88d8b219e25d /cpukit
parent46ea78a08cb4a29a847e90e487ae1c3e5ba8ae96 (diff)
downloadrtems-8217c40656e00102bb2f96c4b36edd47c0aadcfc.tar.bz2
2001-12-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Use AS_IF instead of if/then/else. Add AC_DEFINE_UNQUOTED(RTEMS_UNIX) for RTEMS_CPU==unix. Add AC_DEFINE_UNQUOTED(RTEMS_UNIXLIB) for RTEMS_CPU==unix. Add include/Makefile to CONFIG_FILES. Add AC_ENABLE_MULITLIB. Remove wrapup/rtems, wrapup/itron, wrapup/posix. Remove */optman/Makefile from CONFIG_FILES. * Makefile.am: Add include to SUBDIRS. * rtems/Makefile.am: Remove optman from SUBDIRS. * sapi/Makefile.am: Remove optman from SUBDIRS. * include/Makefile.am: New file. * include/rtems/bspIo.h: Relocated from lib/include. * include/rtems/libio_.h: Relocated from lib/include.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/ChangeLog16
-rw-r--r--cpukit/Makefile.am2
-rw-r--r--cpukit/configure.ac52
-rw-r--r--cpukit/include/Makefile.am27
-rw-r--r--cpukit/include/rtems/libio_.h3
-rw-r--r--cpukit/rtems/Makefile.am2
-rw-r--r--cpukit/sapi/Makefile.am2
-rw-r--r--cpukit/wrapup/.cvsignore2
-rw-r--r--cpukit/wrapup/Makefile.am18
9 files changed, 74 insertions, 50 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 6662750f44..5624f090c8 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,19 @@
+2001-12-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.ac: Use AS_IF instead of if/then/else.
+ Add AC_DEFINE_UNQUOTED(RTEMS_UNIX) for RTEMS_CPU==unix.
+ Add AC_DEFINE_UNQUOTED(RTEMS_UNIXLIB) for RTEMS_CPU==unix.
+ Add include/Makefile to CONFIG_FILES.
+ Add AC_ENABLE_MULITLIB.
+ Remove wrapup/rtems, wrapup/itron, wrapup/posix.
+ Remove */optman/Makefile from CONFIG_FILES.
+ * Makefile.am: Add include to SUBDIRS.
+ * rtems/Makefile.am: Remove optman from SUBDIRS.
+ * sapi/Makefile.am: Remove optman from SUBDIRS.
+ * include/Makefile.am: New file.
+ * include/rtems/bspIo.h: Relocated from lib/include.
+ * include/rtems/libio_.h: Relocated from lib/include.
+
2001-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/posix/Makefile.am: Add multilib support.
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index c7627f5948..c4bbee1556 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -15,7 +15,7 @@ if HAS_ITRON
ITRON_SUBDIRS = itron
endif
-SUBDIRS = score rtems $(POSIX_SUBDIRS) $(ITRON_SUBDIRS) sapi wrapup
+SUBDIRS = include score rtems $(POSIX_SUBDIRS) $(ITRON_SUBDIRS) sapi wrapup
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index 2b63fab559..24aae1e70e 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -39,26 +39,25 @@ RTEMS_CHECK_POSIX_API(RTEMS_BSP)
RTEMS_CHECK_ITRON_API(RTEMS_BSP)
# If RTEMS macros are enabled, then use them. Otherwise, use inlines.
-if test "$RTEMS_USE_MACROS" = "yes"; then
- INLINEdir="macros"
-else
- INLINEdir="inline"
-fi
-AM_CONDITIONAL(INLINE,test "$INLINEdir" = "inline" )
-AM_CONDITIONAL(MACROS,test "$INLINEdir" = "macros" )
-AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes" )
+AS_IF([test "$RTEMS_USE_MACROS" = "yes"],
+ [INLINEdir="macros"],
+ [INLINEdir="inline"])
+
+AM_CONDITIONAL(INLINE,test x"$INLINEdir" = x"inline" )
+AM_CONDITIONAL(MACROS,test x"$INLINEdir" = x"macros" )
+AM_CONDITIONAL(HAS_MP,test x"$HAS_MP" = x"yes" )
AC_SUBST(RTEMS_VERSION)
-AM_CONDITIONAL(HAS_POSIX,test "$HAS_POSIX_API" = "yes")
-AM_CONDITIONAL(HAS_ITRON,test "$HAS_ITRON_API" = "yes")
+AM_CONDITIONAL(HAS_POSIX,test x"$HAS_POSIX_API" = x"yes")
+AM_CONDITIONAL(HAS_ITRON,test x"$HAS_ITRON_API" = x"yes")
-if test "$HAS_POSIX_API" = "yes"; then
- AC_CONFIG_SUBDIRS(posix)
-fi
-if test "$HAS_ITRON_API" = "yes"; then
- AC_CONFIG_SUBDIRS(itron)
-fi
+AS_IF([test x"$HAS_POSIX_API" = x"yes"],
+ [AC_CONFIG_SUBDIRS([posix])]
+)
+AS_IF([test x"$HAS_ITRON_API" = x"yes"],
+ [AC_CONFIG_SUBDIRS(itron)]
+)
RTEMS_CPU_SUBDIRS([score/cpu])
RTEMS_DEFINE_POSIX_API
@@ -66,18 +65,27 @@ RTEMS_DEFINE_ITRON_API
RTEMS_DEFINE_MULTIPROCESSING
# HACK: We should use a feature-based configuration.
-if test x"${RTEMS_CPU}" = x"unix"; then
-AC_DEFINE_UNQUOTED(RTEMS_UNIX,1,[to indicate RTEMS unix])
-fi
+AS_IF([test x"${RTEMS_CPU}" = x"unix"],[
+ AC_DEFINE_UNQUOTED(RTEMS_UNIX,1,[to indicate RTEMS unix])
+# HACK: silently accept --enable-unixlib
+ test "${enable_unixlib}+set" != set || enable_unixlib="yes"
+])
+
+AS_IF([test x"${enable_unixlib}" = x"yes"],
+ [AC_DEFINE_UNQUOTED(RTEMS_UNIXLIB,[1],
+ [to indicate RTEMS using RTEMS's unixlib])]
+)
AM_CONFIG_HEADER(score/include/rtems/score/cpuopts-tmp.h)
+AC_ENABLE_MULTILIB([Makefile],[..])
+
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
+include/Makefile
rtems/Makefile
rtems/src/Makefile
rtems/include/Makefile
-rtems/optman/Makefile
rtems/inline/Makefile
rtems/macros/Makefile
sapi/Makefile
@@ -86,7 +94,6 @@ sapi/include/Makefile
sapi/include/rtems/sptables.h
sapi/inline/Makefile
sapi/macros/Makefile
-sapi/optman/Makefile
score/Makefile
score/cpu/Makefile
score/include/Makefile
@@ -94,8 +101,5 @@ score/inline/Makefile
score/macros/Makefile
score/src/Makefile
wrapup/Makefile
-wrapup/rtems/Makefile
-wrapup/itron/Makefile
-wrapup/posix/Makefile
])
AC_OUTPUT
diff --git a/cpukit/include/Makefile.am b/cpukit/include/Makefile.am
new file mode 100644
index 0000000000..e994ec0134
--- /dev/null
+++ b/cpukit/include/Makefile.am
@@ -0,0 +1,27 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.5
+
+$(PROJECT_INCLUDE)/%.h: %.h
+ $(INSTALL_DATA) $< $@
+
+$(PROJECT_INCLUDE):
+ @$(mkinstalldirs) $@
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE) \
+ $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS = rtems/bspIo.h rtems/libio_.h
+
+$(PROJECT_INCLUDE)/rtems:
+ @$(mkinstalldirs) $@
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
+ $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%)
+
+all-local: $(PREINSTALL_FILES)
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/include/rtems/libio_.h b/cpukit/include/rtems/libio_.h
index 6a4943be75..f0721dafb6 100644
--- a/cpukit/include/rtems/libio_.h
+++ b/cpukit/include/rtems/libio_.h
@@ -308,6 +308,3 @@ int init_fs_mount_table();
#endif
/* end of include file */
-
-
-
diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am
index 59f18c7a79..d11a25c0c5 100644
--- a/cpukit/rtems/Makefile.am
+++ b/cpukit/rtems/Makefile.am
@@ -4,7 +4,7 @@
AUTOMAKE_OPTIONS = foreign 1.5
-SUBDIRS = include inline macros optman src
+SUBDIRS = include inline macros src
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/sapi/Makefile.am b/cpukit/sapi/Makefile.am
index 59f18c7a79..d11a25c0c5 100644
--- a/cpukit/sapi/Makefile.am
+++ b/cpukit/sapi/Makefile.am
@@ -4,7 +4,7 @@
AUTOMAKE_OPTIONS = foreign 1.5
-SUBDIRS = include inline macros optman src
+SUBDIRS = include inline macros src
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/wrapup/.cvsignore b/cpukit/wrapup/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/cpukit/wrapup/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am
deleted file mode 100644
index 67e58c56c3..0000000000
--- a/cpukit/wrapup/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-
-if HAS_POSIX
-POSIX_DIRS = posix
-endif
-
-if HAS_ITRON
-ITRON_DIRS = itron
-endif
-
-SUBDIRS = rtems $(POSIX_DIRS) $(ITRON_DIRS)
-
-include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am