Skip to content

W
wine-winehq
Commit 25084233 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

configure: Always run makedep on the top-level makefile.

parent 1e46f605
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 4 deletions
configure
View file @ 25084233
...@@ -4846,13 +4846,16 @@ else ...@@ -4846,13 +4846,16 @@ else
fi fi
fi fi
if test -z "$wine_cv_toolsdir"; then if test -z "$wine_cv_toolsdir"; then
wine_makedep=tools/makedep
wine_cv_toolsdir="\$(top_builddir)" wine_cv_toolsdir="\$(top_builddir)"
elif test -d "$wine_cv_toolsdir/tools/winebuild"; then elif test -d "$wine_cv_toolsdir/tools/winebuild"; then
wine_makedep=$wine_cv_toolsdir/tools/makedep
case "$wine_cv_toolsdir" in case "$wine_cv_toolsdir" in
/*) ;; /*) ;;
*) wine_cv_toolsdir="\$(top_builddir)/$wine_cv_toolsdir" ;; *) wine_cv_toolsdir="\$(top_builddir)/$wine_cv_toolsdir" ;;
esac esac
enable_tools=${enable_tools:-no} 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 else
as_fn_error $? "could not find Wine tools in $wine_cv_toolsdir" "$LINENO" 5 as_fn_error $? "could not find Wine tools in $wine_cv_toolsdir" "$LINENO" 5
fi fi
...@@ -16578,7 +16581,7 @@ CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[ch] *.yy.c ...@@ -16578,7 +16581,7 @@ CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[ch] *.yy.c
.MAKEFILEDEPS: .MAKEFILEDEPS:
all: Makefile all: Makefile
Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status \$(MAKEDEP) 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 test "$srcdir" = . && wine_fn_append_rule "all: .gitignore
.gitignore: config.status .gitignore: config.status
...@@ -18236,7 +18239,7 @@ wine_fn_output_makedep () ...@@ -18236,7 +18239,7 @@ wine_fn_output_makedep ()
} }
wine_fn_output_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` `cat $wine_rules_file`
_WINE_EOF _WINE_EOF
as_fn_error $? "could not create Makefile" "$LINENO" 5 as_fn_error $? "could not create Makefile" "$LINENO" 5
......
configure.ac
View file @ 25084233
...@@ -215,13 +215,16 @@ AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir, ...@@ -215,13 +215,16 @@ AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir,
fi fi
fi fi
if test -z "$wine_cv_toolsdir"; then if test -z "$wine_cv_toolsdir"; then
wine_makedep=tools/makedep
wine_cv_toolsdir="\$(top_builddir)" wine_cv_toolsdir="\$(top_builddir)"
elif test -d "$wine_cv_toolsdir/tools/winebuild"; then elif test -d "$wine_cv_toolsdir/tools/winebuild"; then
wine_makedep=$wine_cv_toolsdir/tools/makedep
case "$wine_cv_toolsdir" in case "$wine_cv_toolsdir" in
/*) ;; /*) ;;
*) wine_cv_toolsdir="\$(top_builddir)/$wine_cv_toolsdir" ;; *) wine_cv_toolsdir="\$(top_builddir)/$wine_cv_toolsdir" ;;
esac esac
enable_tools=${enable_tools:-no} 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 else
AC_MSG_ERROR([could not find Wine tools in $wine_cv_toolsdir]) AC_MSG_ERROR([could not find Wine tools in $wine_cv_toolsdir])
fi]) fi])
...@@ -2593,7 +2596,7 @@ CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[[ch]] *.yy.c ...@@ -2593,7 +2596,7 @@ CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[[ch]] *.yy.c
.MAKEFILEDEPS: .MAKEFILEDEPS:
all: Makefile all: Makefile
Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status \$(MAKEDEP) 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( test "$srcdir" = . && WINE_APPEND_RULE(
[all: .gitignore [all: .gitignore
...@@ -3461,7 +3464,7 @@ fi ...@@ -3461,7 +3464,7 @@ fi
AC_CONFIG_COMMANDS([Makefile], [wine_fn_output_makefile Makefile], AC_CONFIG_COMMANDS([Makefile], [wine_fn_output_makefile Makefile],
[wine_fn_output_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` `cat $wine_rules_file`
_WINE_EOF _WINE_EOF
AS_ERROR([could not create Makefile]) AS_ERROR([could not create Makefile])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment