2004-05-21 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl: Whenever a recursive target is defined, wrap it in a special @if/@endif block, and prepare its maybe dependency in the @if/@endif block * configure.in: Instead of writing maybe dependencies, remove the @if/@endif statements, and remove the @if/@endif blocks that remain. * configure: Regenerate. * Makefile.in: Regenerate.
This commit is contained in:
Paolo Bonzini
parent
bfa768973c
commit
a7e609d6a9
3292
Makefile.in
3292
Makefile.in
File diff suppressed because it is too large
Load Diff
55
Makefile.tpl
55
Makefile.tpl
|
|
@ -697,6 +697,8 @@ TAGS: do-TAGS
|
|||
[+ FOR build_modules +]
|
||||
.PHONY: configure-build-[+module+] maybe-configure-build-[+module+]
|
||||
maybe-configure-build-[+module+]:
|
||||
@if build-[+module+]
|
||||
maybe-configure-build-[+module+]: configure-build-[+module+]
|
||||
configure-build-[+module+]:
|
||||
@test ! -f $(BUILD_SUBDIR)/[+module+]/Makefile || exit 0; \
|
||||
$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/[+module+] ; \
|
||||
|
|
@ -757,13 +759,17 @@ configure-build-[+module+]:
|
|||
$(BUILD_CONFIGARGS) $${srcdiroption} \
|
||||
--with-build-subdir="$(BUILD_SUBDIR)" \
|
||||
|| exit 1
|
||||
@endif build-[+module+]
|
||||
|
||||
.PHONY: all-build-[+module+] maybe-all-build-[+module+]
|
||||
maybe-all-build-[+module+]:
|
||||
@if build-[+module+]
|
||||
maybe-all-build-[+module+]: all-build-[+module+]
|
||||
all-build-[+module+]: configure-build-[+module+]
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
(cd $(BUILD_SUBDIR)/[+module+] && $(MAKE) all)
|
||||
@endif build-[+module+]
|
||||
[+ ENDFOR build_modules +]
|
||||
|
||||
# --------------------------------------
|
||||
|
|
@ -772,6 +778,8 @@ all-build-[+module+]: configure-build-[+module+]
|
|||
[+ FOR host_modules +]
|
||||
.PHONY: configure-[+module+] maybe-configure-[+module+]
|
||||
maybe-configure-[+module+]:
|
||||
@if [+module+]
|
||||
maybe-configure-[+module+]: configure-[+module+]
|
||||
configure-[+module+]:
|
||||
@test ! -f [+module+]/Makefile || exit 0; \
|
||||
[ -d [+module+] ] || mkdir [+module+]; \
|
||||
|
|
@ -809,9 +817,12 @@ configure-[+module+]:
|
|||
$(SHELL) $${libsrcdir}/configure \
|
||||
$(HOST_CONFIGARGS) $${srcdiroption} \
|
||||
|| exit 1
|
||||
@endif [+module+]
|
||||
|
||||
.PHONY: all-[+module+] maybe-all-[+module+]
|
||||
maybe-all-[+module+]:
|
||||
@if [+module+]
|
||||
maybe-all-[+module+]: all-[+module+]
|
||||
all-[+module+]: configure-[+module+]
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
|
|
@ -820,9 +831,12 @@ all-[+module+]: configure-[+module+]
|
|||
IF with_x
|
||||
+] $(X11_FLAGS_TO_PASS)[+
|
||||
ENDIF with_x +] all)
|
||||
@endif [+module+]
|
||||
|
||||
.PHONY: check-[+module+] maybe-check-[+module+]
|
||||
maybe-check-[+module+]:
|
||||
@if [+module+]
|
||||
maybe-check-[+module+]: check-[+module+]
|
||||
[+ IF no_check +]
|
||||
check-[+module+]:
|
||||
[+ ELIF no_check_cross +]
|
||||
|
|
@ -847,9 +861,12 @@ check-[+module+]:
|
|||
+] $(X11_FLAGS_TO_PASS)[+
|
||||
ENDIF with_x +] check)
|
||||
[+ ENDIF no_check +]
|
||||
@endif [+module+]
|
||||
|
||||
.PHONY: install-[+module+] maybe-install-[+module+]
|
||||
maybe-install-[+module+]:
|
||||
@if [+module+]
|
||||
maybe-install-[+module+]: install-[+module+]
|
||||
[+ IF no_install +]
|
||||
install-[+module+]:
|
||||
[+ ELSE install +]
|
||||
|
|
@ -862,11 +879,14 @@ install-[+module+]: installdirs
|
|||
+] $(X11_FLAGS_TO_PASS)[+
|
||||
ENDIF with_x +] install)
|
||||
[+ ENDIF no_install +]
|
||||
@endif [+module+]
|
||||
|
||||
# Other targets (info, dvi, etc.)
|
||||
[+ FOR recursive_targets +]
|
||||
.PHONY: maybe-[+make_target+]-[+module+] [+make_target+]-[+module+]
|
||||
maybe-[+make_target+]-[+module+]:
|
||||
@if [+module+]
|
||||
maybe-[+make_target+]-[+module+]: [+make_target+]-[+module+]
|
||||
[+ IF (match-value? = "missing" (get "make_target") ) +]
|
||||
# [+module+] doesn't support [+make_target+].
|
||||
[+make_target+]-[+module+]:
|
||||
|
|
@ -891,6 +911,7 @@ maybe-[+make_target+]-[+module+]:
|
|||
[+make_target+]) \
|
||||
|| exit 1
|
||||
[+ ENDIF +]
|
||||
@endif [+module+]
|
||||
[+ ENDFOR recursive_targets +]
|
||||
[+ ENDFOR host_modules +]
|
||||
|
||||
|
|
@ -900,6 +921,8 @@ maybe-[+make_target+]-[+module+]:
|
|||
[+ FOR target_modules +]
|
||||
.PHONY: configure-target-[+module+] maybe-configure-target-[+module+]
|
||||
maybe-configure-target-[+module+]:
|
||||
@if target-[+module+]
|
||||
maybe-configure-target-[+module+]: configure-target-[+module+]
|
||||
|
||||
# There's only one multilib.out. Cleverer subdirs shouldn't need it copied.
|
||||
$(TARGET_SUBDIR)/[+module+]/multilib.out: multilib.out
|
||||
|
|
@ -974,9 +997,12 @@ ENDIF raw_cxx +]
|
|||
$(TARGET_CONFIGARGS) $${srcdiroption} \
|
||||
--with-target-subdir="$(TARGET_SUBDIR)" \
|
||||
|| exit 1
|
||||
@endif target-[+module+]
|
||||
|
||||
.PHONY: all-target-[+module+] maybe-all-target-[+module+]
|
||||
maybe-all-target-[+module+]:
|
||||
@if target-[+module+]
|
||||
maybe-all-target-[+module+]: all-target-[+module+]
|
||||
all-target-[+module+]: configure-target-[+module+]
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
|
|
@ -987,9 +1013,12 @@ all-target-[+module+]: configure-target-[+module+]
|
|||
+] 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' [+
|
||||
ENDIF raw_cxx
|
||||
+] all)
|
||||
@endif target-[+module+]
|
||||
|
||||
.PHONY: check-target-[+module+] maybe-check-target-[+module+]
|
||||
maybe-check-target-[+module+]:
|
||||
@if target-[+module+]
|
||||
maybe-check-target-[+module+]: check-target-[+module+]
|
||||
[+ IF no_check +]
|
||||
# Dummy target for uncheckable module.
|
||||
check-target-[+module+]:
|
||||
|
|
@ -1005,9 +1034,12 @@ check-target-[+module+]:
|
|||
ENDIF raw_cxx
|
||||
+] check)
|
||||
[+ ENDIF no_check +]
|
||||
@endif target-[+module+]
|
||||
|
||||
.PHONY: install-target-[+module+] maybe-install-target-[+module+]
|
||||
maybe-install-target-[+module+]:
|
||||
@if target-[+module+]
|
||||
maybe-install-target-[+module+]: install-target-[+module+]
|
||||
[+ IF no_install +]
|
||||
# Dummy target for uninstallable.
|
||||
install-target-[+module+]:
|
||||
|
|
@ -1019,11 +1051,14 @@ install-target-[+module+]: installdirs
|
|||
(cd $(TARGET_SUBDIR)/[+module+] && \
|
||||
$(MAKE) $(TARGET_FLAGS_TO_PASS) install)
|
||||
[+ ENDIF no_install +]
|
||||
@endif target-[+module+]
|
||||
|
||||
# Other targets (info, dvi, etc.)
|
||||
[+ FOR recursive_targets +]
|
||||
.PHONY: maybe-[+make_target+]-target-[+module+] [+make_target+]-target-[+module+]
|
||||
maybe-[+make_target+]-target-[+module+]:
|
||||
@if target-[+module+]
|
||||
maybe-[+make_target+]-target-[+module+]: [+make_target+]-target-[+module+]
|
||||
[+ IF (match-value? = "missing" (get "make_target") ) +]
|
||||
# [+module+] doesn't support [+make_target+].
|
||||
[+make_target+]-target-[+module+]:
|
||||
|
|
@ -1048,6 +1083,7 @@ maybe-[+make_target+]-target-[+module+]:
|
|||
[+make_target+]) \
|
||||
|| exit 1
|
||||
[+ ENDIF +]
|
||||
@endif target-[+module+]
|
||||
[+ ENDFOR recursive_targets +]
|
||||
[+ ENDFOR target_modules +]
|
||||
|
||||
|
|
@ -1067,6 +1103,8 @@ maybe-[+make_target+]-target-[+module+]:
|
|||
# We must skip configuring if toplevel bootstrap is going.
|
||||
.PHONY: configure-gcc maybe-configure-gcc
|
||||
maybe-configure-gcc:
|
||||
@if gcc
|
||||
maybe-configure-gcc: configure-gcc
|
||||
configure-gcc:
|
||||
@test ! -f gcc/Makefile || exit 0; \
|
||||
[ -f stage_last ] && exit 0; \
|
||||
|
|
@ -1108,12 +1146,15 @@ configure-gcc:
|
|||
$(SHELL) $${libsrcdir}/configure \
|
||||
$(HOST_CONFIGARGS) $${srcdiroption} \
|
||||
|| exit 1
|
||||
@endif gcc
|
||||
|
||||
# Don't 'make all' in gcc if it's already been made by 'bootstrap'; that
|
||||
# causes trouble. This wart will be fixed eventually by moving
|
||||
# the bootstrap behavior to this file.
|
||||
.PHONY: all-gcc maybe-all-gcc
|
||||
maybe-all-gcc:
|
||||
@if gcc
|
||||
maybe-all-gcc: all-gcc
|
||||
all-gcc: configure-gcc
|
||||
r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
|
|
@ -1126,6 +1167,7 @@ all-gcc: configure-gcc
|
|||
$(SET_LIB_PATH) \
|
||||
(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) all); \
|
||||
fi
|
||||
@endif gcc
|
||||
|
||||
# Building GCC uses some tools for rebuilding "source" files
|
||||
# like texinfo, bison/byacc, etc. So we must depend on those.
|
||||
|
|
@ -1203,6 +1245,8 @@ cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld
|
|||
|
||||
.PHONY: check-gcc maybe-check-gcc
|
||||
maybe-check-gcc:
|
||||
@if gcc
|
||||
maybe-check-gcc: check-gcc
|
||||
check-gcc:
|
||||
@if [ -f ./gcc/Makefile ] ; then \
|
||||
r=`${PWD_COMMAND}`; export r; \
|
||||
|
|
@ -1226,9 +1270,12 @@ check-gcc-c++:
|
|||
|
||||
.PHONY: check-c++
|
||||
check-c++: check-target-libstdc++-v3 check-gcc-c++
|
||||
@endif gcc
|
||||
|
||||
.PHONY: install-gcc maybe-install-gcc
|
||||
maybe-install-gcc:
|
||||
@if gcc
|
||||
maybe-install-gcc: install-gcc
|
||||
install-gcc:
|
||||
@if [ -f ./gcc/Makefile ] ; then \
|
||||
r=`${PWD_COMMAND}`; export r; \
|
||||
|
|
@ -1238,6 +1285,7 @@ install-gcc:
|
|||
else \
|
||||
true; \
|
||||
fi
|
||||
@endif gcc
|
||||
|
||||
# Install the gcc headers files, but not the fixed include files,
|
||||
# which Cygnus is not allowed to distribute. This rule is very
|
||||
|
|
@ -1264,6 +1312,8 @@ gcc-no-fixedincludes:
|
|||
[+ FOR recursive_targets +]
|
||||
.PHONY: maybe-[+make_target+]-gcc [+make_target+]-gcc
|
||||
maybe-[+make_target+]-gcc:
|
||||
@if gcc
|
||||
maybe-[+make_target+]-gcc: [+make_target+]-gcc
|
||||
[+make_target+]-gcc: [+
|
||||
FOR depend +]\
|
||||
[+depend+]-gcc [+
|
||||
|
|
@ -1283,6 +1333,7 @@ maybe-[+make_target+]-gcc:
|
|||
"DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
|
||||
[+make_target+]) \
|
||||
|| exit 1
|
||||
@endif gcc
|
||||
|
||||
[+ ENDFOR recursive_targets +]
|
||||
|
||||
|
|
@ -1712,10 +1763,6 @@ configure-target-gperf: $(ALL_GCC_CXX)
|
|||
all-target-gperf: maybe-all-target-libiberty maybe-all-target-libstdc++-v3
|
||||
configure-target-qthreads: $(ALL_GCC_C)
|
||||
|
||||
# Dependencies of maybe-foo on foo. These are used because, for example,
|
||||
# all-gcc only depends on all-gas if gas is present and being configured.
|
||||
@maybe_dependencies@
|
||||
|
||||
# Serialization dependencies. Host configures don't work well in parallel to
|
||||
# each other, due to contention over config.cache. Target configures and
|
||||
# build configures are similar.
|
||||
|
|
|
|||
|
|
@ -3009,31 +3009,28 @@ case "$enable_gdbtk" in
|
|||
;;
|
||||
esac
|
||||
|
||||
# Create the 'maybe dependencies'. This uses a temporary file.
|
||||
# Strip out unwanted targets.
|
||||
|
||||
# While at that, we remove Makefiles if we were started for recursive
|
||||
# configuration, so that the top-level Makefile reconfigures them,
|
||||
# like we used to do when configure itself was recursive.
|
||||
rm -f maybedep.tmp
|
||||
echo '# maybedep.tmp' > maybedep.tmp
|
||||
|
||||
# Make-targets which may need maybe dependencies.
|
||||
mts="configure all install check clean distclean dvi info install-info"
|
||||
mts="${mts} installcheck mostlyclean maintainer-clean TAGS"
|
||||
# Loop over modules. $extrasub must be used with care, limiting as
|
||||
# much as possible the usage of range addresses. That's because autoconf
|
||||
# splits the sed script to overcome limits in the number of commands,
|
||||
# and relying on carefully-timed sed passes may turn out to be very hard
|
||||
# to maintain later. In this particular case, you just have to be careful
|
||||
# not to nest @if/@endif pairs, because configure will not warn you at all.
|
||||
|
||||
# Loop over modules and make-targets.
|
||||
for module in ${build_modules} ; do
|
||||
if test -z "${no_recursion}" \
|
||||
&& test -f ${build_subdir}/${module}/Makefile; then
|
||||
echo 1>&2 "*** removing ${build_subdir}/${module}/Makefile to force reconfigure"
|
||||
rm -f ${build_subdir}/${module}/Makefile
|
||||
fi
|
||||
for mt in ${mts} ; do
|
||||
case ${mt} in
|
||||
install) ;; # No installing build modules.
|
||||
*) echo "maybe-${mt}-build-${module}: ${mt}-build-${module}" >> maybedep.tmp ;;
|
||||
esac
|
||||
done
|
||||
extrasub="$extrasub
|
||||
/^@if build-$module\$/d
|
||||
/^@endif build-$module\$/d"
|
||||
done
|
||||
for module in ${configdirs} ; do
|
||||
if test -z "${no_recursion}" \
|
||||
|
|
@ -3041,9 +3038,9 @@ for module in ${configdirs} ; do
|
|||
echo 1>&2 "*** removing ${module}/Makefile to force reconfigure"
|
||||
rm -f ${module}/Makefile
|
||||
fi
|
||||
for mt in ${mts} ; do
|
||||
echo "maybe-${mt}-${module}: ${mt}-${module}" >> maybedep.tmp
|
||||
done
|
||||
extrasub="$extrasub
|
||||
/^@if $module\$/d
|
||||
/^@endif $module\$/d"
|
||||
done
|
||||
for module in ${target_configdirs} ; do
|
||||
if test -z "${no_recursion}" \
|
||||
|
|
@ -3051,12 +3048,12 @@ for module in ${target_configdirs} ; do
|
|||
echo 1>&2 "*** removing ${target_subdir}/${module}/Makefile to force reconfigure"
|
||||
rm -f ${target_subdir}/${module}/Makefile
|
||||
fi
|
||||
for mt in ${mts} ; do
|
||||
echo "maybe-${mt}-target-${module}: ${mt}-target-${module}" >> maybedep.tmp
|
||||
done
|
||||
extrasub="$extrasub
|
||||
/^@if target-$module\$/d
|
||||
/^@endif target-$module\$/d"
|
||||
done
|
||||
maybe_dependencies=maybedep.tmp
|
||||
|
||||
extrasub="$extrasub
|
||||
/^@if /,/^@endif /d"
|
||||
|
||||
# Create the serialization dependencies. This uses a temporary file.
|
||||
|
||||
|
|
@ -3437,7 +3434,7 @@ test -n "$target_alias" && ncn_target_tool_prefix=$target_alias-
|
|||
# Extract the first word of "${ncn_tool_prefix}ar", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}ar; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3441: checking for $ac_word" >&5
|
||||
echo "configure:3438: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3470,7 +3467,7 @@ if test -z "$ac_cv_prog_AR" ; then
|
|||
# Extract the first word of "ar", so it can be a program name with args.
|
||||
set dummy ar; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3474: checking for $ac_word" >&5
|
||||
echo "configure:3471: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AR'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3509,7 +3506,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}as", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}as; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3513: checking for $ac_word" >&5
|
||||
echo "configure:3510: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3542,7 +3539,7 @@ if test -z "$ac_cv_prog_AS" ; then
|
|||
# Extract the first word of "as", so it can be a program name with args.
|
||||
set dummy as; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3546: checking for $ac_word" >&5
|
||||
echo "configure:3543: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AS'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3581,7 +3578,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}dlltool", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}dlltool; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3585: checking for $ac_word" >&5
|
||||
echo "configure:3582: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3614,7 +3611,7 @@ if test -z "$ac_cv_prog_DLLTOOL" ; then
|
|||
# Extract the first word of "dlltool", so it can be a program name with args.
|
||||
set dummy dlltool; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3618: checking for $ac_word" >&5
|
||||
echo "configure:3615: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_DLLTOOL'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3653,7 +3650,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}ld", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}ld; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3657: checking for $ac_word" >&5
|
||||
echo "configure:3654: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3686,7 +3683,7 @@ if test -z "$ac_cv_prog_LD" ; then
|
|||
# Extract the first word of "ld", so it can be a program name with args.
|
||||
set dummy ld; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3690: checking for $ac_word" >&5
|
||||
echo "configure:3687: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_LD'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3725,7 +3722,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}nm", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}nm; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3729: checking for $ac_word" >&5
|
||||
echo "configure:3726: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3758,7 +3755,7 @@ if test -z "$ac_cv_prog_NM" ; then
|
|||
# Extract the first word of "nm", so it can be a program name with args.
|
||||
set dummy nm; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3762: checking for $ac_word" >&5
|
||||
echo "configure:3759: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_NM'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3797,7 +3794,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}ranlib", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}ranlib; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3801: checking for $ac_word" >&5
|
||||
echo "configure:3798: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3830,7 +3827,7 @@ if test -z "$ac_cv_prog_RANLIB" ; then
|
|||
# Extract the first word of "ranlib", so it can be a program name with args.
|
||||
set dummy ranlib; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3834: checking for $ac_word" >&5
|
||||
echo "configure:3831: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_RANLIB'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3869,7 +3866,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}windres", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}windres; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3873: checking for $ac_word" >&5
|
||||
echo "configure:3870: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3902,7 +3899,7 @@ if test -z "$ac_cv_prog_WINDRES" ; then
|
|||
# Extract the first word of "windres", so it can be a program name with args.
|
||||
set dummy windres; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3906: checking for $ac_word" >&5
|
||||
echo "configure:3903: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_WINDRES'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3941,7 +3938,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}objcopy", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}objcopy; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3945: checking for $ac_word" >&5
|
||||
echo "configure:3942: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3974,7 +3971,7 @@ if test -z "$ac_cv_prog_OBJCOPY" ; then
|
|||
# Extract the first word of "objcopy", so it can be a program name with args.
|
||||
set dummy objcopy; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3978: checking for $ac_word" >&5
|
||||
echo "configure:3975: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJCOPY'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4013,7 +4010,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}objdump", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}objdump; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4017: checking for $ac_word" >&5
|
||||
echo "configure:4014: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4046,7 +4043,7 @@ if test -z "$ac_cv_prog_OBJDUMP" ; then
|
|||
# Extract the first word of "objdump", so it can be a program name with args.
|
||||
set dummy objdump; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4050: checking for $ac_word" >&5
|
||||
echo "configure:4047: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJDUMP'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4095,7 +4092,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}ar", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}ar; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4099: checking for $ac_word" >&5
|
||||
echo "configure:4096: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_AR_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4128,7 +4125,7 @@ if test -z "$ac_cv_prog_CONFIGURED_AR_FOR_TARGET" ; then
|
|||
# Extract the first word of "ar", so it can be a program name with args.
|
||||
set dummy ar; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4132: checking for $ac_word" >&5
|
||||
echo "configure:4129: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AR_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4167,7 +4164,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}as", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}as; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4171: checking for $ac_word" >&5
|
||||
echo "configure:4168: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_AS_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4200,7 +4197,7 @@ if test -z "$ac_cv_prog_CONFIGURED_AS_FOR_TARGET" ; then
|
|||
# Extract the first word of "as", so it can be a program name with args.
|
||||
set dummy as; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4204: checking for $ac_word" >&5
|
||||
echo "configure:4201: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AS_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4239,7 +4236,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}dlltool", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}dlltool; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4243: checking for $ac_word" >&5
|
||||
echo "configure:4240: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4272,7 +4269,7 @@ if test -z "$ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET" ; then
|
|||
# Extract the first word of "dlltool", so it can be a program name with args.
|
||||
set dummy dlltool; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4276: checking for $ac_word" >&5
|
||||
echo "configure:4273: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4311,7 +4308,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}ld", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}ld; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4315: checking for $ac_word" >&5
|
||||
echo "configure:4312: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_LD_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4344,7 +4341,7 @@ if test -z "$ac_cv_prog_CONFIGURED_LD_FOR_TARGET" ; then
|
|||
# Extract the first word of "ld", so it can be a program name with args.
|
||||
set dummy ld; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4348: checking for $ac_word" >&5
|
||||
echo "configure:4345: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_LD_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4383,7 +4380,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}nm", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}nm; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4387: checking for $ac_word" >&5
|
||||
echo "configure:4384: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_NM_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4416,7 +4413,7 @@ if test -z "$ac_cv_prog_CONFIGURED_NM_FOR_TARGET" ; then
|
|||
# Extract the first word of "nm", so it can be a program name with args.
|
||||
set dummy nm; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4420: checking for $ac_word" >&5
|
||||
echo "configure:4417: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_NM_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4455,7 +4452,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}ranlib", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}ranlib; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4459: checking for $ac_word" >&5
|
||||
echo "configure:4456: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4488,7 +4485,7 @@ if test -z "$ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET" ; then
|
|||
# Extract the first word of "ranlib", so it can be a program name with args.
|
||||
set dummy ranlib; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4492: checking for $ac_word" >&5
|
||||
echo "configure:4489: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_RANLIB_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4527,7 +4524,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}windres", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}windres; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4531: checking for $ac_word" >&5
|
||||
echo "configure:4528: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4560,7 +4557,7 @@ if test -z "$ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET" ; then
|
|||
# Extract the first word of "windres", so it can be a program name with args.
|
||||
set dummy windres; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4564: checking for $ac_word" >&5
|
||||
echo "configure:4561: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_WINDRES_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4645,7 +4642,7 @@ RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target}
|
|||
NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target}
|
||||
|
||||
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
|
||||
echo "configure:4649: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
||||
echo "configure:4646: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
||||
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
|
||||
if test "${enable_maintainer_mode+set}" = set; then
|
||||
enableval="$enable_maintainer_mode"
|
||||
|
|
@ -4770,34 +4767,15 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
|
|||
# Transform confdefs.h into DEFS.
|
||||
# Protect against shell expansion while executing Makefile rules.
|
||||
# Protect against Makefile macro expansion.
|
||||
#
|
||||
# If the first sed substitution is executed (which looks for macros that
|
||||
# take arguments), then we branch to the quote section. Otherwise,
|
||||
# look for a macro that doesn't take arguments.
|
||||
cat >confdef2opt.sed <<\_ACEOF
|
||||
t clear
|
||||
: clear
|
||||
s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
|
||||
t quote
|
||||
s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
|
||||
t quote
|
||||
d
|
||||
: quote
|
||||
s,[ `~#$^&*(){}\\|;'"<>?],\\&,g
|
||||
s,\[,\\&,g
|
||||
s,\],\\&,g
|
||||
s,\$,$$,g
|
||||
p
|
||||
_ACEOF
|
||||
# We use echo to avoid assuming a particular line-breaking character.
|
||||
# The extra dot is to prevent the shell from consuming trailing
|
||||
# line-breaks from the sub-command output. A line-break within
|
||||
# single-quotes doesn't work because, if this script is created in a
|
||||
# platform that uses two characters for line-breaks (e.g., DOS), tr
|
||||
# would break.
|
||||
ac_LF_and_DOT=`echo; echo .`
|
||||
DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
|
||||
rm -f confdef2opt.sed
|
||||
cat > conftest.defs <<\EOF
|
||||
s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
|
||||
s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g
|
||||
s%\[%\\&%g
|
||||
s%\]%\\&%g
|
||||
s%\$%$$%g
|
||||
EOF
|
||||
DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
|
||||
rm -f conftest.defs
|
||||
|
||||
|
||||
# Without the "./", some shells look in PATH for config.status.
|
||||
|
|
@ -4899,8 +4877,6 @@ s%@stage1_languages@%$stage1_languages%g
|
|||
s%@DEFAULT_YACC@%$DEFAULT_YACC%g
|
||||
s%@DEFAULT_M4@%$DEFAULT_M4%g
|
||||
s%@DEFAULT_LEX@%$DEFAULT_LEX%g
|
||||
/@maybe_dependencies@/r $maybe_dependencies
|
||||
s%@maybe_dependencies@%%g
|
||||
/@serialization_dependencies@/r $serialization_dependencies
|
||||
s%@serialization_dependencies@%%g
|
||||
/@host_makefile_frag@/r $host_makefile_frag
|
||||
|
|
|
|||
39
configure.in
39
configure.in
|
|
@ -1716,31 +1716,28 @@ case "$enable_gdbtk" in
|
|||
;;
|
||||
esac
|
||||
|
||||
# Create the 'maybe dependencies'. This uses a temporary file.
|
||||
# Strip out unwanted targets.
|
||||
|
||||
# While at that, we remove Makefiles if we were started for recursive
|
||||
# configuration, so that the top-level Makefile reconfigures them,
|
||||
# like we used to do when configure itself was recursive.
|
||||
rm -f maybedep.tmp
|
||||
echo '# maybedep.tmp' > maybedep.tmp
|
||||
|
||||
# Make-targets which may need maybe dependencies.
|
||||
mts="configure all install check clean distclean dvi info install-info"
|
||||
mts="${mts} installcheck mostlyclean maintainer-clean TAGS"
|
||||
# Loop over modules. $extrasub must be used with care, limiting as
|
||||
# much as possible the usage of range addresses. That's because autoconf
|
||||
# splits the sed script to overcome limits in the number of commands,
|
||||
# and relying on carefully-timed sed passes may turn out to be very hard
|
||||
# to maintain later. In this particular case, you just have to be careful
|
||||
# not to nest @if/@endif pairs, because configure will not warn you at all.
|
||||
|
||||
# Loop over modules and make-targets.
|
||||
for module in ${build_modules} ; do
|
||||
if test -z "${no_recursion}" \
|
||||
&& test -f ${build_subdir}/${module}/Makefile; then
|
||||
echo 1>&2 "*** removing ${build_subdir}/${module}/Makefile to force reconfigure"
|
||||
rm -f ${build_subdir}/${module}/Makefile
|
||||
fi
|
||||
for mt in ${mts} ; do
|
||||
case ${mt} in
|
||||
install) ;; # No installing build modules.
|
||||
*) echo "maybe-${mt}-build-${module}: ${mt}-build-${module}" >> maybedep.tmp ;;
|
||||
esac
|
||||
done
|
||||
extrasub="$extrasub
|
||||
/^@if build-$module\$/d
|
||||
/^@endif build-$module\$/d"
|
||||
done
|
||||
for module in ${configdirs} ; do
|
||||
if test -z "${no_recursion}" \
|
||||
|
|
@ -1748,9 +1745,9 @@ for module in ${configdirs} ; do
|
|||
echo 1>&2 "*** removing ${module}/Makefile to force reconfigure"
|
||||
rm -f ${module}/Makefile
|
||||
fi
|
||||
for mt in ${mts} ; do
|
||||
echo "maybe-${mt}-${module}: ${mt}-${module}" >> maybedep.tmp
|
||||
done
|
||||
extrasub="$extrasub
|
||||
/^@if $module\$/d
|
||||
/^@endif $module\$/d"
|
||||
done
|
||||
for module in ${target_configdirs} ; do
|
||||
if test -z "${no_recursion}" \
|
||||
|
|
@ -1758,12 +1755,12 @@ for module in ${target_configdirs} ; do
|
|||
echo 1>&2 "*** removing ${target_subdir}/${module}/Makefile to force reconfigure"
|
||||
rm -f ${target_subdir}/${module}/Makefile
|
||||
fi
|
||||
for mt in ${mts} ; do
|
||||
echo "maybe-${mt}-target-${module}: ${mt}-target-${module}" >> maybedep.tmp
|
||||
done
|
||||
extrasub="$extrasub
|
||||
/^@if target-$module\$/d
|
||||
/^@endif target-$module\$/d"
|
||||
done
|
||||
maybe_dependencies=maybedep.tmp
|
||||
AC_SUBST_FILE(maybe_dependencies)
|
||||
extrasub="$extrasub
|
||||
/^@if /,/^@endif /d"
|
||||
|
||||
# Create the serialization dependencies. This uses a temporary file.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue