configure: Build makedep at configure time.
This commit is contained in:
parent
dc24a92f5b
commit
5114deda9c
|
@ -16471,8 +16471,8 @@ CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[ch] *.yy.c
|
|||
.INIT: Makefile
|
||||
.MAKEFILEDEPS:
|
||||
all: Makefile
|
||||
Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status
|
||||
@./config.status Make.tmp Makefile"
|
||||
Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status \$(MAKEDEP)
|
||||
@./config.status Make.tmp Makefile && \$(MAKEDEP) ."
|
||||
|
||||
test "$srcdir" = . && wine_fn_append_rule "all: .gitignore
|
||||
.gitignore: config.status
|
||||
|
@ -17296,6 +17296,13 @@ wine_fn_ignore_file "include/config.h"
|
|||
wine_fn_ignore_file "include/stamp-h"
|
||||
test "$wine_binary" = wine || wine_fn_ignore_file "loader/wine"
|
||||
|
||||
if test "x$enable_tools" != xno
|
||||
then
|
||||
wine_fn_ignore_file "tools/makedep$ac_exeext"
|
||||
ac_config_commands="$ac_config_commands tools/makedep"
|
||||
|
||||
fi
|
||||
|
||||
ac_config_commands="$ac_config_commands Makefile"
|
||||
|
||||
|
||||
|
@ -17343,12 +17350,10 @@ fi
|
|||
|
||||
if test "x$enable_tools" != xno
|
||||
then
|
||||
ac_config_commands="$ac_config_commands tools"
|
||||
|
||||
wine_fn_ignore_file "tools/makedep$ac_exeext"
|
||||
wine_fn_append_rule "tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h
|
||||
\$(CC) -Iinclude -I$srcdir/include -D__WINESRC__ \$(EXTRACFLAGS) \$(CPPFLAGS) \$(CFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS)
|
||||
clean:: __clean__
|
||||
wine_fn_append_rule "tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h config.status
|
||||
@./config.status tools/makedep
|
||||
Makefile: tools/makedep$ac_exeext
|
||||
distclean:: clean
|
||||
\$(RM) tools/makedep$ac_exeext"
|
||||
else
|
||||
wine_fn_append_rule "\$(MAKEDEP):
|
||||
|
@ -18079,6 +18084,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|||
#
|
||||
# INIT-COMMANDS
|
||||
#
|
||||
wine_fn_output_makedep ()
|
||||
{
|
||||
as_dir=tools; as_fn_mkdir_p
|
||||
$CC -Iinclude -I$srcdir/include -D__WINESRC__ $EXTRACFLAGS $CPPFLAGS $CFLAGS -o tools/makedep$ac_exeext $srcdir/tools/makedep.c $LDFLAGS
|
||||
}
|
||||
wine_fn_output_makefile ()
|
||||
{
|
||||
cat Make.tmp - <<\_WINE_EOF >\$tmp/makefile && mv -f \$tmp/makefile \$1 && rm -f Make.tmp && return
|
||||
|
@ -18112,9 +18122,9 @@ do
|
|||
"po/LINGUAS") CONFIG_LINKS="$CONFIG_LINKS po/LINGUAS:po/LINGUAS" ;;
|
||||
"wine") CONFIG_LINKS="$CONFIG_LINKS wine:tools/winewrapper" ;;
|
||||
"wine64") CONFIG_LINKS="$CONFIG_LINKS wine64:tools/winewrapper" ;;
|
||||
"tools/makedep") CONFIG_COMMANDS="$CONFIG_COMMANDS tools/makedep" ;;
|
||||
"Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;;
|
||||
"Make.tmp") CONFIG_FILES="$CONFIG_FILES Make.tmp:Make.vars.in:Makefile.in" ;;
|
||||
"tools") CONFIG_COMMANDS="$CONFIG_COMMANDS tools" ;;
|
||||
".gitignore") CONFIG_COMMANDS="$CONFIG_COMMANDS .gitignore" ;;
|
||||
|
||||
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
|
||||
|
@ -18699,8 +18709,8 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
|
|||
|
||||
case $ac_file$ac_mode in
|
||||
"include/stamp-h":C) echo timestamp > include/stamp-h ;;
|
||||
"tools/makedep":C) wine_fn_output_makedep || as_fn_exit $? ;;
|
||||
"Makefile":C) wine_fn_output_makefile Makefile ;;
|
||||
"tools":C) as_dir=tools; as_fn_mkdir_p ;;
|
||||
".gitignore":C) wine_fn_output_gitignore .gitignore ;;
|
||||
|
||||
esac
|
||||
|
|
24
configure.ac
24
configure.ac
|
@ -2603,8 +2603,8 @@ CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[[ch]] *.yy.c
|
|||
.INIT: Makefile
|
||||
.MAKEFILEDEPS:
|
||||
all: Makefile
|
||||
Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status
|
||||
@./config.status Make.tmp Makefile])
|
||||
Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status \$(MAKEDEP)
|
||||
@./config.status Make.tmp Makefile && \$(MAKEDEP) .])
|
||||
|
||||
test "$srcdir" = . && WINE_APPEND_RULE(
|
||||
[all: .gitignore
|
||||
|
@ -3419,6 +3419,17 @@ WINE_IGNORE_FILE("include/config.h")
|
|||
WINE_IGNORE_FILE("include/stamp-h")
|
||||
test "$wine_binary" = wine || WINE_IGNORE_FILE("loader/wine")
|
||||
|
||||
if test "x$enable_tools" != xno
|
||||
then
|
||||
WINE_IGNORE_FILE("tools/makedep$ac_exeext")
|
||||
AC_CONFIG_COMMANDS([tools/makedep],[wine_fn_output_makedep || AS_EXIT],
|
||||
[wine_fn_output_makedep ()
|
||||
{
|
||||
AS_MKDIR_P(tools)
|
||||
$CC -Iinclude -I$srcdir/include -D__WINESRC__ $EXTRACFLAGS $CPPFLAGS $CFLAGS -o tools/makedep$ac_exeext $srcdir/tools/makedep.c $LDFLAGS
|
||||
}])
|
||||
fi
|
||||
|
||||
AC_CONFIG_COMMANDS([Makefile], [wine_fn_output_makefile Makefile],
|
||||
[wine_fn_output_makefile ()
|
||||
{
|
||||
|
@ -3476,12 +3487,11 @@ fi
|
|||
|
||||
if test "x$enable_tools" != xno
|
||||
then
|
||||
AC_CONFIG_COMMANDS([tools],[AS_MKDIR_P(tools)])
|
||||
WINE_IGNORE_FILE("tools/makedep$ac_exeext")
|
||||
WINE_APPEND_RULE(
|
||||
[tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h
|
||||
\$(CC) -Iinclude -I$srcdir/include -D__WINESRC__ \$(EXTRACFLAGS) \$(CPPFLAGS) \$(CFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS)
|
||||
clean:: __clean__
|
||||
[tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h config.status
|
||||
@./config.status tools/makedep
|
||||
Makefile: tools/makedep$ac_exeext
|
||||
distclean:: clean
|
||||
\$(RM) tools/makedep$ac_exeext])
|
||||
else
|
||||
WINE_APPEND_RULE(
|
||||
|
|
Loading…
Reference in New Issue