2011-03-03 Yao Qi <yao@codesourcery.com>
* Makefile.in (configure-common): Remove. Let Makefile in dir common to rebuild itself. (common/Makefile): Likewise.
This commit is contained in:
parent
c171f8549c
commit
ced54c8ff8
|
@ -1,3 +1,9 @@
|
|||
2011-03-03 Yao Qi <yao@codesourcery.com>
|
||||
|
||||
* Makefile.in (configure-common): Remove. Let Makefile
|
||||
in dir common to rebuild itself.
|
||||
(common/Makefile): Likewise.
|
||||
|
||||
2011-03-03 Joel Brobecker <brobecker@adacore.com>
|
||||
|
||||
* utils.c (parse_escape): Add i18n markup in error message.
|
||||
|
|
|
@ -1174,22 +1174,6 @@ all-lib: gnulib/Makefile
|
|||
$(LIBCOMMON): $(LIBCOMMON_DIR)/Makefile
|
||||
@$(MAKE) $(FLAGS_TO_PASS) DO=all DODIRS=common subdir_do
|
||||
|
||||
configure-common:
|
||||
@: $(MAKE); $(unstage)
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
test ! -f common/Makefile || exit 0; \
|
||||
$(SHELL) $(srcdir)/../mkinstalldirs common ; \
|
||||
$(HOST_EXPORTS) \
|
||||
echo Configuring in common; \
|
||||
cd "common" || exit 1; \
|
||||
commondir="$$s/common"; \
|
||||
srcdiroption="--srcdir=$${commondir}"; \
|
||||
$(SHELL) $${commondir}/configure --enable-gdbserver=no \
|
||||
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
|
||||
--target=${target_alias} $${srcdiroption} \
|
||||
|| exit 1
|
||||
|
||||
# Convenience rule to handle recursion.
|
||||
.PHONY: all-data-directory
|
||||
all-data-directory: data-directory/Makefile
|
||||
|
@ -1325,13 +1309,6 @@ data-directory/Makefile: data-directory/Makefile.in config.status @frags@
|
|||
CONFIG_LINKS= \
|
||||
$(SHELL) config.status
|
||||
|
||||
common/Makefile: configure-common common/Makefile.in config.status @frags@
|
||||
CONFIG_FILES="common/Makefile" \
|
||||
CONFIG_COMMANDS="depfiles" \
|
||||
CONFIG_HEADERS= \
|
||||
CONFIG_LINKS= \
|
||||
$(SHELL) config.status
|
||||
|
||||
config.h: stamp-h ; @true
|
||||
stamp-h: $(srcdir)/config.in config.status
|
||||
CONFIG_HEADERS=config.h:config.in \
|
||||
|
|
Loading…
Reference in New Issue