Commit 49645b6f authored by Alexandre Julliard's avatar Alexandre Julliard

configure: Build the makefile data into a temporary file instead of a shell variable.

parent 12586f76
......@@ -2562,6 +2562,15 @@ AH_BOTTOM([#endif /* WINE_CROSSTEST */
AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h])
WINE_APPEND_RULE([
# Rules automatically generated by configure
.INIT: Makefile
.MAKEFILEDEPS:
all: Makefile
Makefile: Makefile.in Make.vars.in Make.rules config.status
@./config.status Make.tmp Makefile])
WINE_CONFIG_SYMLINK(dlls/shell32,,[AUTHORS])
WINE_CONFIG_SYMLINK(dlls/wineps.drv,dlls/wineps.drv,[generic.ppd])
WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf],enable_fonts)
......@@ -3352,7 +3361,7 @@ 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
$ALL_MAKEFILE_DEPENDS
`cat $wine_rules_file`
_WINE_EOF
AS_ERROR([could not create Makefile])
}])
......@@ -3363,7 +3372,7 @@ dnl Some final makefile rules
if test "x$enable_maintainer_mode" = xyes
then
WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],
WINE_APPEND_RULE(
[\$(srcdir)/configure: configure.ac aclocal.m4
cd \$(srcdir) && autoconf --warnings=all
\$(srcdir)/include/config.h.in: include/stamp-h.in
......@@ -3375,7 +3384,7 @@ fi
if test "x$with_gettextpo" = xyes
then
test "$srcdir" = . || AC_MSG_ERROR([Rebuilding po files is not supported for out of tree builds.])
WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],
WINE_APPEND_RULE(
[ALL_POT_FILES =$ALL_POT_FILES
\$(LINGUAS:%=po/%.po): \$(srcdir)/po/wine.pot
msgmerge --previous -q \$[@] \$(srcdir)/po/wine.pot | msgattrib --no-obsolete -o \$[@].new && mv \$[@].new \$[@]
......@@ -3386,14 +3395,14 @@ fi
if test "$MSGFMT" != false
then
AC_SUBST([PORCFLAGS],["--po-dir=\$(top_builddir)/po"])
WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],[__builddeps__: \$(ALL_MO_FILES)])
WINE_APPEND_RULE([__builddeps__: \$(ALL_MO_FILES)])
else
LINGUAS=
fi
if test "x$enable_tools" != xno
then
WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],
WINE_APPEND_RULE(
[\$(MAKEDEP): tools/Makefile
clean:: __clean__
\$(RM) tools/makedep\$(EXEEXT)])
......@@ -3401,7 +3410,7 @@ fi
if test -n "$with_wine64"
then
WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],
WINE_APPEND_RULE(
[all: fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader
fonts server tools:
\$(RM) \$[@] && \$(LN_S) $with_wine64/\$[@] \$[@]
......@@ -3422,9 +3431,9 @@ fi
WINE_PRINT_MESSAGES
echo "
AS_ECHO("
$as_me: Finished. Do '${ac_make}' to compile Wine.
" >&AS_MESSAGE_FD
") >&AS_MESSAGE_FD
dnl Local Variables:
dnl comment-start: "dnl "
......
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