summaryrefslogtreecommitdiffstats
path: root/c/make
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-02-08 22:33:25 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-02-08 22:33:25 +0000
commit70810dcd8970194d96f685ffe4af890911e273c5 (patch)
treecade3ccf39b9bcabc04e7b1ce9105a83f80b177d /c/make
parenta976681e4754543618441a2a2e7b6def98e588fb (diff)
downloadrtems-70810dcd8970194d96f685ffe4af890911e273c5.tar.bz2
Patches rtems-rc-20000204-0.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>
that contains: * Removes remaining (now illegal) references to $(SRC) from a couple of Makefile.ams * Removes duplicate AC_CONFIG_SUBDIRS macro from c/configure.in * Moves ENABLE_LIBCDIR into RTEMS_PROG_C[C|XX]_FOR_TARGET (hides LIBCDIR from most configure scripts, i.e. LIBCDIR becomes less visible) * Adds RTEMS_PROG_C[C|XX]_FOR_TARGET and RTEMS_CANONICALIZE_TOOLS to libbsp/*/configure.ins (A minor bug in previous implementations, which only has an impact when switching to GNU/Cygnus canonicalization) * Cleans up several bogus comments. * Removes MKLIB * Switches the version number to 4.5.0 (for testing version number handling)
Diffstat (limited to 'c/make')
-rw-r--r--c/make/Makefile.am15
-rw-r--r--c/make/configure.in10
2 files changed, 8 insertions, 17 deletions
diff --git a/c/make/Makefile.am b/c/make/Makefile.am
index b1d7b6367f..104e41cc61 100644
--- a/c/make/Makefile.am
+++ b/c/make/Makefile.am
@@ -1,17 +1,16 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
-rtems_makedir=$(prefix)/make
+rtems_makedir = $(prefix)/make
-GENERIC_FILES = \
-target.cfg
+GENERIC_FILES = target.cfg
-rtems_make_DATA = \
-$(GENERIC_FILES)
+rtems_make_DATA = $(GENERIC_FILES)
+
+EXTRA_DIST = target.cfg.in
-include $(top_srcdir)/../../automake/subdirs.am
include $(top_srcdir)/../../automake/local.am
diff --git a/c/make/configure.in b/c/make/configure.in
index 24d8113062..6240f19e8c 100644
--- a/c/make/configure.in
+++ b/c/make/configure.in
@@ -24,14 +24,12 @@ 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++
@@ -44,17 +42,11 @@ 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_ITRON_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)
+# Explicitly list all Makefiles here
AC_OUTPUT(
Makefile
target.cfg