summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-01-16 22:53:30 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-01-16 22:53:30 +0000
commit64b1f8105264bdc4a38a618ff9c24050f7b537bf (patch)
tree5a216abcce2780a51a6cd619fee2326a4bbf0e56 /c
parent38fcef5cf4af4c5692bb19ee3f1b57c610692395 (diff)
downloadrtems-64b1f8105264bdc4a38a618ff9c24050f7b537bf.tar.bz2
2002-01-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Apply @subdirs. Remove POSIX_SUBDIRS. Remove ITRON_SUBDIRS. * configure.ac: Rework enable_unixlib handling. Add RTEMS_MULTILIBS to cpuopts.h. * include/Makefile.am: Add rtems/fs.h, rtems/userenv.h. Add $(PROJECT_INCLUDE)/rtems. Remove libio_.h.
Diffstat (limited to 'c')
-rw-r--r--c/src/exec/ChangeLog10
-rw-r--r--c/src/exec/Makefile.am10
-rw-r--r--c/src/exec/configure.ac13
-rw-r--r--c/src/exec/include/Makefile.am8
4 files changed, 25 insertions, 16 deletions
diff --git a/c/src/exec/ChangeLog b/c/src/exec/ChangeLog
index f2f8f19b81..f909c479c2 100644
--- a/c/src/exec/ChangeLog
+++ b/c/src/exec/ChangeLog
@@ -1,3 +1,13 @@
+2002-01-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Apply @subdirs. Remove POSIX_SUBDIRS. Remove
+ ITRON_SUBDIRS.
+ * configure.ac: Rework enable_unixlib handling.
+ Add RTEMS_MULTILIBS to cpuopts.h.
+ * include/Makefile.am: Add rtems/fs.h, rtems/userenv.h.
+ Add $(PROJECT_INCLUDE)/rtems. Remove libio_.h.
+
+
2002-01-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/Makefile.am: Add install-hook.
diff --git a/c/src/exec/Makefile.am b/c/src/exec/Makefile.am
index c4bbee1556..21dc23fd8e 100644
--- a/c/src/exec/Makefile.am
+++ b/c/src/exec/Makefile.am
@@ -7,15 +7,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
include $(top_srcdir)/../../../automake/multilib.am
-if HAS_POSIX
-POSIX_SUBDIRS = posix
-endif
-
-if HAS_ITRON
-ITRON_SUBDIRS = itron
-endif
-
-SUBDIRS = include score rtems $(POSIX_SUBDIRS) $(ITRON_SUBDIRS) sapi wrapup
+SUBDIRS = include score rtems sapi @subdirs@ wrapup
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/exec/configure.ac b/c/src/exec/configure.ac
index 24aae1e70e..3d565980fe 100644
--- a/c/src/exec/configure.ac
+++ b/c/src/exec/configure.ac
@@ -66,13 +66,13 @@ RTEMS_DEFINE_MULTIPROCESSING
# HACK: We should use a feature-based configuration.
AS_IF([test x"${RTEMS_CPU}" = x"unix"],[
- AC_DEFINE_UNQUOTED(RTEMS_UNIX,1,[to indicate RTEMS unix])
+ AC_DEFINE_UNQUOTED([RTEMS_UNIX],[1],[to indicate RTEMS unix])
# HACK: silently accept --enable-unixlib
- test "${enable_unixlib}+set" != set || enable_unixlib="yes"
+ test -n "${enable_unixlib}" || enable_unixlib="yes"
])
AS_IF([test x"${enable_unixlib}" = x"yes"],
- [AC_DEFINE_UNQUOTED(RTEMS_UNIXLIB,[1],
+ [AC_DEFINE_UNQUOTED([RTEMS_UNIXLIB],[1],
[to indicate RTEMS using RTEMS's unixlib])]
)
@@ -80,6 +80,13 @@ AM_CONFIG_HEADER(score/include/rtems/score/cpuopts-tmp.h)
AC_ENABLE_MULTILIB([Makefile],[..])
+## HACK: Add a define to cpuopts.h to indicate using multilibs
+## Can be applied to produce compiler errors if using
+## multilib-incompatible settings somewhere else (eg. bspopts.h).
+AS_IF([test x"${enable_multilib}" = x"yes"],[
+ AC_DEFINE_UNQUOTED([RTEMS_MULTILIBS],[1],[using multilib'ed RTEMS])
+])
+
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
include/Makefile
diff --git a/c/src/exec/include/Makefile.am b/c/src/exec/include/Makefile.am
index e994ec0134..9b9073ffd1 100644
--- a/c/src/exec/include/Makefile.am
+++ b/c/src/exec/include/Makefile.am
@@ -10,14 +10,14 @@ $(PROJECT_INCLUDE)/%.h: %.h
$(PROJECT_INCLUDE):
@$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/rtems:
+ @$(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) $@
+include_rtems_HEADERS = rtems/bspIo.h rtems/userenv.h rtems/fs.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
$(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%)