diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-02-08 22:33:25 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-02-08 22:33:25 +0000 |
| commit | 70810dcd8970194d96f685ffe4af890911e273c5 (patch) | |
| tree | cade3ccf39b9bcabc04e7b1ce9105a83f80b177d /c/src/make | |
| parent | changed version to 4.5.0-beta1 (diff) | |
| download | rtems-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/src/make')
| -rw-r--r-- | c/src/make/compilers/gcc-target-default.cfg | 16 | ||||
| -rw-r--r-- | c/src/make/configure.in | 3 | ||||
| -rw-r--r-- | c/src/make/lib.cfg | 2 |
3 files changed, 2 insertions, 19 deletions
diff --git a/c/src/make/compilers/gcc-target-default.cfg b/c/src/make/compilers/gcc-target-default.cfg index 653f93ed0d..88b5e58c0d 100644 --- a/c/src/make/compilers/gcc-target-default.cfg +++ b/c/src/make/compilers/gcc-target-default.cfg @@ -163,24 +163,8 @@ AR_SYMBOL_TABLE="HIGHLY-UNLIKELY-TO-CONFLICT" ARFLAGS=ruv # -# Command to convert a normal archive to one searchable by $(LD) -# -# NOTE: Obsolete, use $(RANLIB) instead, MKLIB may disappear soon -MKLIB=$(RANLIB) - - -# # How to compile stuff into ${ARCH} subdirectory # -# OBSOLETE: we use make's default rules now -# -# NOTE: we override COMPILE.[c|cc|S] -# because gmake default rules use TARGET_ARCH for different purposes -# -# -# COMPILE.c=$(CC) $(CPPFLAGS) $(CFLAGS) -c -# COMPILE.cc=$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -# COMPILE.S=$(CC) $(ASFLAGS) $(CPPFLAGS) -c ${ARCH}/%.o: %.c ${COMPILE.c} $(AM_CPPFLAGS) $(AM_CFLAGS) -o $@ $< diff --git a/c/src/make/configure.in b/c/src/make/configure.in index 24068a65bf..a73b18dd0c 100644 --- a/c/src/make/configure.in +++ b/c/src/make/configure.in @@ -24,7 +24,6 @@ RTEMS_ENABLE_RDBG RTEMS_ENABLE_INLINES RTEMS_ENABLE_CXX RTEMS_ENABLE_GCC28 -RTEMS_ENABLE_LIBCDIR RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -56,7 +55,6 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET dnl check for g++ @@ -120,6 +118,7 @@ AC_LINK_FILES($cfg_dir/leaf.cfg,leaf.cfg) AC_LINK_FILES($cfg_dir/lib.cfg,lib.cfg) AC_LINK_FILES($cfg_dir/README,README) +# Explicitly list all Makefiles here AC_OUTPUT( Makefile Makefile.inc diff --git a/c/src/make/lib.cfg b/c/src/make/lib.cfg index 5c35c6236a..88ba811e9a 100644 --- a/c/src/make/lib.cfg +++ b/c/src/make/lib.cfg @@ -12,7 +12,7 @@ include $(RTEMS_ROOT)/make/leaf.cfg define make-library $(RM) $@ $(AR) $(ARFLAGS) $@ $(OBJS) -$(MKLIB) $@ +$(RANLIB) $@ endef .PRECIOUS: $(LIB) |