summaryrefslogtreecommitdiffstats
path: root/cpukit/posix
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-07-08 13:46:51 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-07-08 13:46:51 +0000
commit13482e5dcfe9029a46825232b0a7d116af08ad1b (patch)
treec0b22e84943a4adb6212608010c283bbee7b01ce /cpukit/posix
parentc1a72962ab7499b298f2cf4d7e3c3cee6722e2ef (diff)
downloadrtems-13482e5dcfe9029a46825232b0a7d116af08ad1b.tar.bz2
2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Remove (Merged-in into ../configure.ac) * Makefile.am: Reflect having merged configure.ac into ../configure.ac. * src/config.h: New.
Diffstat (limited to 'cpukit/posix')
-rw-r--r--cpukit/posix/ChangeLog7
-rw-r--r--cpukit/posix/Makefile.am16
-rw-r--r--cpukit/posix/configure.ac54
-rw-r--r--cpukit/posix/src/config.h5
4 files changed, 21 insertions, 61 deletions
diff --git a/cpukit/posix/ChangeLog b/cpukit/posix/ChangeLog
index 985b1ab096..6d2ae36807 100644
--- a/cpukit/posix/ChangeLog
+++ b/cpukit/posix/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.ac: Remove (Merged-in into ../configure.ac)
+ * Makefile.am:
+ Reflect having merged configure.ac into ../configure.ac.
+ * src/config.h: New.
+
2003-02-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: AM_INIT_AUTOMAKE([1.7.2]).
diff --git a/cpukit/posix/Makefile.am b/cpukit/posix/Makefile.am
index 86fd283bf1..3493b06180 100644
--- a/cpukit/posix/Makefile.am
+++ b/cpukit/posix/Makefile.am
@@ -2,11 +2,9 @@
## $Id$
##
-ACLOCAL_AMFLAGS = -I ../aclocal
-
-include $(top_srcdir)/../automake/multilib.am
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/lib.am
+include $(top_srcdir)/automake/multilib.am
+include $(top_srcdir)/automake/compile.am
+include $(top_srcdir)/automake/lib.am
EXTRA_DIST =
@@ -20,12 +18,15 @@ $(PROJECT_INCLUDE)/%.h: include/%.h
$(PROJECT_INCLUDE)/%.inl: $(INLINEdir)/%.inl
$(INSTALL_DATA) $< $@
+if HAS_POSIX
+
PREINSTALL_FILES = $(PROJECT_INCLUDE)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix
# include
noinst_HEADERS = include/devctl.h include/intr.h
+noinst_HEADERS += src/config.h
include_HEADERS = include/sched.h include/aio.h include/mqueue.h include/semaphore.h
@@ -170,12 +171,13 @@ OBJS = $(C_FILES:src/%.c=${ARCH}/%.$(OBJEXT))
# Add local stuff here using +=
#
-AM_CPPFLAGS += -Isrc -D__RTEMS_INSIDE__
+AM_CPPFLAGS += -I$(srcdir)/src -D__RTEMS_INSIDE__
all-local: ${ARCH} $(PREINSTALL_FILES) $(LIB)
$(LIB): ${OBJS}
$(make-library)
+endif
${ARCH}/%.$(OBJEXT): src/%.c
${COMPILE} -o $@ -c $<
@@ -191,4 +193,4 @@ not:
EXTRA_DIST += $(C_FILES) $(UNUSED_C_FILES)
-include $(top_srcdir)/../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/cpukit/posix/configure.ac b/cpukit/posix/configure.ac
deleted file mode 100644
index ab87e64690..0000000000
--- a/cpukit/posix/configure.ac
+++ /dev/null
@@ -1,54 +0,0 @@
-## Process this file with autoconf to produce a configure script.
-##
-## $Id$
-
-AC_PREREQ(2.57)
-AC_INIT([rtems-cpukit-posix],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
-AC_CONFIG_SRCDIR([src/pthread.c])
-RTEMS_TOP(../..)
-AC_CONFIG_AUX_DIR(../..)
-
-RTEMS_CANONICAL_TARGET_CPU
-
-AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2])
-AM_MAINTAINER_MODE
-
-RTEMS_ENABLE_POSIX
-RTEMS_ENABLE_INLINES
-
-RTEMS_ENV_RTEMSCPU
-
-RTEMS_CHECK_CPU
-RTEMS_CANONICAL_HOST
-
-RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
-RTEMS_CANONICALIZE_TOOLS
-AC_PROG_RANLIB
-
-RTEMS_CHECK_MULTIPROCESSING
-RTEMS_CHECK_POSIX_API
-
-# If RTEMS macros are enabled, then use them. Otherwise, use inlines.
-if test "$RTEMS_USE_MACROS" = "yes"; then
- INLINEdir="macros"
-else
- INLINEdir="inline"
-fi
-AC_SUBST(INLINEdir)
-AM_CONDITIONAL(INLINE,test "$INLINEdir" = "inline" )
-AM_CONDITIONAL(MACROS,test "$INLINEdir" = "macros" )
-AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes" )
-
-## Needed when using automake for libs/rels
-RTEMS_CHECK_NEWLIB
-
-## Refuse to build if bsp does not support libposix
-if test "$HAS_POSIX_API" != "yes"; then
-AC_MSG_ERROR([libposix is not supported by this configuration])
-fi
-
-AM_CONFIG_HEADER([src/config.h])
-
-# Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
diff --git a/cpukit/posix/src/config.h b/cpukit/posix/src/config.h
new file mode 100644
index 0000000000..09fe652e2c
--- /dev/null
+++ b/cpukit/posix/src/config.h
@@ -0,0 +1,5 @@
+/* HACK:
+ * Pull-in RTEMS global config-header cpuopts.h as local config.h
+ */
+
+#include <rtems/score/cpuopts.h>