Alexandre Julliard : configure: Always run makedep on the top-level makefile.
Alexandre Julliard
julliard at winehq.org
Tue Mar 11 14:45:40 CDT 2014
Module: wine
Branch: master
Commit: 25084233d4d23d3bd66ac9f6f130a50ae8fb03e8
URL: http://source.winehq.org/git/wine.git/?a=commit;h=25084233d4d23d3bd66ac9f6f130a50ae8fb03e8
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Mar 11 11:23:35 2014 +0100
configure: Always run makedep on the top-level makefile.
---
configure | 7 +++++--
configure.ac | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index b82130e..b802bc2 100755
--- a/configure
+++ b/configure
@@ -4846,13 +4846,16 @@ else
fi
fi
if test -z "$wine_cv_toolsdir"; then
+ wine_makedep=tools/makedep
wine_cv_toolsdir="\$(top_builddir)"
elif test -d "$wine_cv_toolsdir/tools/winebuild"; then
+ wine_makedep=$wine_cv_toolsdir/tools/makedep
case "$wine_cv_toolsdir" in
/*) ;;
*) wine_cv_toolsdir="\$(top_builddir)/$wine_cv_toolsdir" ;;
esac
enable_tools=${enable_tools:-no}
+ test -f "$wine_makedep" || as_fn_error $? "the Wine tools have not yet been built in $wine_cv_toolsdir" "$LINENO" 5
else
as_fn_error $? "could not find Wine tools in $wine_cv_toolsdir" "$LINENO" 5
fi
@@ -16578,7 +16581,7 @@ CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[ch] *.yy.c
.MAKEFILEDEPS:
all: Makefile
Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status \$(MAKEDEP)
- @./config.status Make.tmp Makefile && \$(MAKEDEP) ."
+ @./config.status Make.tmp Makefile"
test "$srcdir" = . && wine_fn_append_rule "all: .gitignore
.gitignore: config.status
@@ -18236,7 +18239,7 @@ wine_fn_output_makedep ()
}
wine_fn_output_makefile ()
{
- cat Make.tmp - <<\_WINE_EOF >\$tmp/makefile && mv -f \$tmp/makefile \$1 && rm -f Make.tmp && return
+ cat Make.tmp - <<\_WINE_EOF >\$tmp/makefile && mv -f \$tmp/makefile \$1 && rm -f Make.tmp && "$wine_makedep" . && return
`cat $wine_rules_file`
_WINE_EOF
as_fn_error $? "could not create Makefile" "$LINENO" 5
diff --git a/configure.ac b/configure.ac
index ee8cd1a..a7b90ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -215,13 +215,16 @@ AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir,
fi
fi
if test -z "$wine_cv_toolsdir"; then
+ wine_makedep=tools/makedep
wine_cv_toolsdir="\$(top_builddir)"
elif test -d "$wine_cv_toolsdir/tools/winebuild"; then
+ wine_makedep=$wine_cv_toolsdir/tools/makedep
case "$wine_cv_toolsdir" in
/*) ;;
*) wine_cv_toolsdir="\$(top_builddir)/$wine_cv_toolsdir" ;;
esac
enable_tools=${enable_tools:-no}
+ test -f "$wine_makedep" || AC_MSG_ERROR([the Wine tools have not yet been built in $wine_cv_toolsdir])
else
AC_MSG_ERROR([could not find Wine tools in $wine_cv_toolsdir])
fi])
@@ -2593,7 +2596,7 @@ CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[[ch]] *.yy.c
.MAKEFILEDEPS:
all: Makefile
Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status \$(MAKEDEP)
- @./config.status Make.tmp Makefile && \$(MAKEDEP) .])
+ @./config.status Make.tmp Makefile])
test "$srcdir" = . && WINE_APPEND_RULE(
[all: .gitignore
@@ -3461,7 +3464,7 @@ fi
AC_CONFIG_COMMANDS([Makefile], [wine_fn_output_makefile Makefile],
[wine_fn_output_makefile ()
{
- cat Make.tmp - <<\_WINE_EOF >\$tmp/makefile && mv -f \$tmp/makefile \$[]1 && rm -f Make.tmp && return
+ cat Make.tmp - <<\_WINE_EOF >\$tmp/makefile && mv -f \$tmp/makefile \$[]1 && rm -f Make.tmp && "$wine_makedep" . && return
`cat $wine_rules_file`
_WINE_EOF
AS_ERROR([could not create Makefile])
More information about the wine-cvs
mailing list