diff options
Diffstat (limited to '')
-rw-r--r-- | c/src/make/directory.cfg | 7 | ||||
-rw-r--r-- | c/src/make/host.cfg.in | 20 |
2 files changed, 14 insertions, 13 deletions
diff --git a/c/src/make/directory.cfg b/c/src/make/directory.cfg index 1714204318..056e9fa55e 100644 --- a/c/src/make/directory.cfg +++ b/c/src/make/directory.cfg @@ -8,8 +8,6 @@ # See also make/main.cfg # -# RULE=$(shell echo $@ | $(SED) -e s/debug_// -e s/profile_//) - # This is a simplified variant of automake-1.4's rule for handling # subdirectories $(RECURSE_TARGETS): @@ -17,8 +15,11 @@ $(RECURSE_TARGETS): dot_seen=no; \ target=`echo $@ | sed -e s/-recursive// -e s/debug_// -e s/profile_// `; \ list='$(SUB_DIRS)'; for subdir in $$list; do \ - echo "Making $$target RTEMS_BSP=${RTEMS_BSP} in $$subdir"; \ + echo "Making $$target in $$subdir"; \ local_target="$$target"; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done && test -z "$$fail" + +preinstall: preinstall-recursive +.PHONY: preinstall preinstall-am preinstall-recursive diff --git a/c/src/make/host.cfg.in b/c/src/make/host.cfg.in index bcbcf4eec6..18ddc85d8b 100644 --- a/c/src/make/host.cfg.in +++ b/c/src/make/host.cfg.in @@ -3,8 +3,6 @@ # # OS-specific configuration # -# Author: Ralf Corsepius (corsepiu@faw.uni-ulm.de) 97/11/08 -# # Derived from rtems/c/make/os/*.cfg in previous RTEMS version. # @@ -17,23 +15,24 @@ RTEMS_HOST = @RTEMS_HOST@ CLEAN_OS = CLOBBER_OS = *~ *.bak TAGS tags -SHELL=/bin/sh +SHELL=@SHELL@ ECHO=echo -CAT=@CAT@ +CAT=cat RM=@RM@ -f CP=@CP@ MV=@MV@ LN=@LN@ MKDIR=mkdir -CHMOD=@CHMOD@ -SED=@SED@ -M4=@M4@ +CHMOD=chmod +SED=sed +# Anybody using this? +# M4=@M4@ # Global tools -PACKHEX=$(PROJECT_TOOLS)/packhex +PACKHEX=$(PROJECT_BIN)/packhex -INSTALL_CHANGE=$(PROJECT_TOOLS)/install-if-change +INSTALL_CHANGE=$(PROJECT_BIN)/install-if-change INSTALL_VARIANT=$(INSTALL_CHANGE) -V "$(LIB_VARIANT)" # FIXME: HACK for a bug in cygwin-hosted egcs which returns a mixture @@ -51,7 +50,7 @@ KSH=@KSH@ # # RCS support # -RCS_CLEAN=$(PROJECT_TOOLS)/rcs-clean +RCS_CLEAN=$(PROJECT_BIN)/rcs-clean # # Rule to install a shell script with the proper shell to run it. @@ -63,6 +62,7 @@ RCS_CLEAN=$(PROJECT_TOOLS)/rcs-clean # -$(RM) $@.old # -$(MV) $@ $@.old >/dev/null 2>&1 +# OBSOLETE: Don't use this anymore, this may be removed in future define make-script -$(RM) $@ $(SED) -e '1,1s?^#!KSHELL?#!$(KSH)?' \ |