summaryrefslogtreecommitdiffstats
path: root/c/make
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-11-16 15:48:11 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-11-16 15:48:11 +0000
commitd6c8352925bc2286b24f01b8cfababa16782b1f5 (patch)
tree2543aced22107ce690b426cf39b6431dda5e07b9 /c/make
parentModified file to match seen output. (diff)
downloadrtems-d6c8352925bc2286b24f01b8cfababa16782b1f5.tar.bz2
Patch rtems-rc-19991105-1.diff.gz from Ralf Corsepius
<corsepiu@faw.uni-ulm.de> which does the following: This is the configuration cleanup patch: Main changes: * TARGET_ARCH removed * target.cfg.in moved to c/make/target.cfg.in (Only configured once for all BSPs of a target) * BARE_XXX variables appended to bsp.cfg.in * autogen renamed to bootstrap * removed stray variables from make/custom/*.cfg To apply: cd <source-tree> rm c/src/make/target.cfg.in cp autogen bootstrap mkdir c/make cp make/target.cfg.in c/make/target.cfg.in rm make/target.cfg.in rm autogen patch -p1 < rtems-rc-19991105-1.diff
Diffstat (limited to '')
-rw-r--r--c/make/Makefile.am17
-rw-r--r--c/make/configure.in59
-rw-r--r--c/make/target.cfg.in (renamed from c/src/make/target.cfg.in)4
3 files changed, 76 insertions, 4 deletions
diff --git a/c/make/Makefile.am b/c/make/Makefile.am
new file mode 100644
index 0000000000..b1d7b6367f
--- /dev/null
+++ b/c/make/Makefile.am
@@ -0,0 +1,17 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+rtems_makedir=$(prefix)/make
+
+GENERIC_FILES = \
+target.cfg
+
+rtems_make_DATA = \
+$(GENERIC_FILES)
+
+include $(top_srcdir)/../../automake/subdirs.am
+include $(top_srcdir)/../../automake/local.am
diff --git a/c/make/configure.in b/c/make/configure.in
new file mode 100644
index 0000000000..9f1b3ec83c
--- /dev/null
+++ b/c/make/configure.in
@@ -0,0 +1,59 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl $Id$
+
+dnl
+dnl This script configures the configuration files below c/make/
+dnl
+
+AC_PREREQ(2.13)
+AC_INIT(target.cfg.in)
+RTEMS_TOP(../..)
+AC_CONFIG_AUX_DIR(../..)
+
+RTEMS_CANONICAL_TARGET_CPU
+
+AM_INIT_AUTOMAKE(rtems-c-make,$RTEMS_VERSION,no)
+AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_MULTIPROCESSING
+RTEMS_ENABLE_POSIX
+RTEMS_ENABLE_NETWORKING
+RTEMS_ENABLE_RDBG
+RTEMS_ENABLE_INLINES
+RTEMS_ENABLE_CXX
+RTEMS_ENABLE_GCC28
+RTEMS_ENABLE_LIBCDIR
+
+RTEMS_CHECK_CPU
+RTEMS_CANONICAL_HOST
+
+RTEMS_PROJECT_ROOT
+
+dnl check target cc
+RTEMS_PROG_CC_FOR_TARGET
+
+dnl check for g++
+if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
+ RTEMS_PROG_CXX_FOR_TARGET
+fi
+
+RTEMS_CANONICALIZE_TOOLS
+
+AC_SUBST(rtems_cv_prog_cc_cross)
+AC_SUBST(RTEMS_HAS_POSIX)
+AC_SUBST(RTEMS_HOST)
+AC_SUBST(RTEMS_HAS_MULTIPROCESSING)
+AC_SUBST(RTEMS_HAS_POSIX_API)
+AC_SUBST(RTEMS_HAS_NETWORKING)
+AC_SUBST(RTEMS_HAS_RDBG)
+AC_SUBST(RTEMS_HAS_CPLUSPLUS)
+AC_SUBST(RTEMS_USE_MACROS)
+AC_SUBST(RTEMS_USE_GCC272)
+AC_SUBST(RTEMS_LIBC_DIR)
+AC_SUBST(RTEMS_CPU)
+
+AC_OUTPUT(
+Makefile
+target.cfg
+)
diff --git a/c/src/make/target.cfg.in b/c/make/target.cfg.in
index a49cf8a8e3..4fa72f6ed8 100644
--- a/c/src/make/target.cfg.in
+++ b/c/make/target.cfg.in
@@ -48,10 +48,6 @@ RTEMS_USE_GCC272 = @RTEMS_USE_GCC272@
RTEMS_LIBC_DIR = @RTEMS_LIBC_DIR@
RTEMS_CPU = @RTEMS_CPU@
-# the following are only used for the bare bsp
-BARE_CPU_MODEL = @BARE_CPU_MODEL@
-BARE_CPU_CFLAGS = @BARE_CPU_CFLAGS@
-
XCFLAGS=$(CFLAGS_FOR_TARGET)
export RTEMS_BSP