summaryrefslogtreecommitdiffstats
path: root/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 /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 'make')
-rw-r--r--make/compilers/gcc-target-default.cfg16
-rw-r--r--make/custom/gen68360.cfg2
-rw-r--r--make/lib.cfg2
3 files changed, 2 insertions, 18 deletions
diff --git a/make/compilers/gcc-target-default.cfg b/make/compilers/gcc-target-default.cfg
index 653f93ed0d..88b5e58c0d 100644
--- a/make/compilers/gcc-target-default.cfg
+++ b/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/make/custom/gen68360.cfg b/make/custom/gen68360.cfg
index 75defe32b8..c607d5acae 100644
--- a/make/custom/gen68360.cfg
+++ b/make/custom/gen68360.cfg
@@ -79,7 +79,7 @@ endef
else
define make-exe
- $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -o $@ \
+ $(LINK.c) $(LDLIBS) -o $@ \
$(LINK_OBJS) $(LINK_LIBS)
$(NM) -g -n $@ > $(basename $@).num
$(SIZE) $@
diff --git a/make/lib.cfg b/make/lib.cfg
index 5c35c6236a..88ba811e9a 100644
--- a/make/lib.cfg
+++ b/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)