Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Tayshawnna Jackson
wine
Commits
49645b6f
Commit
49645b6f
authored
11 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
configure: Build the makefile data into a temporary file instead of a shell variable.
parent
12586f76
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
aclocal.m4
+42
-50
42 additions, 50 deletions
aclocal.m4
configure
+56
-55
56 additions, 55 deletions
configure
configure.ac
+17
-8
17 additions, 8 deletions
configure.ac
with
115 additions
and
113 deletions
aclocal.m4
+
42
−
50
View file @
49645b6f
...
...
@@ -193,15 +193,8 @@ dnl
dnl Usage: AC_REQUIRE([WINE_CONFIG_HELPERS])
dnl
AC_DEFUN([WINE_CONFIG_HELPERS],
[ALL_MAKEFILE_DEPENDS="
# 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_rules_file=conf$$rules.make
rm -f $wine_rules_file
ALL_POT_FILES=""
AC_SUBST(ALL_TEST_RESOURCES,"")
...
...
@@ -212,7 +205,7 @@ wine_fn_append_file ()
wine_fn_append_rule ()
{
AS_
VAR_APPEND($[1],"$as_nl$[2]")
AS_
ECHO("$[1]") >>$wine_rules_file
}
wine_fn_has_flag ()
...
...
@@ -238,8 +231,7 @@ wine_fn_all_dir_rules ()
*) ac_makedep="$[2] $ac_makedep" ;;
esac
wine_fn_append_file ALL_DIRS $ac_dir
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
wine_fn_append_rule \
"__clean__: $ac_dir/__clean__
.PHONY: $ac_dir/__clean__
$ac_dir/__clean__: $ac_dir/Makefile
...
...
@@ -263,7 +255,7 @@ wine_fn_pot_rules ()
if wine_fn_has_flag mc $ac_flags
then
wine_fn_append_file ALL_POT_FILES $ac_dir/msg.pot
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"$ac_dir/msg.pot: $ac_dir/Makefile dummy
@cd $ac_dir && \$(MAKE) msg.pot
$ac_dir/msg.pot: tools/wmc include"
...
...
@@ -271,7 +263,7 @@ $ac_dir/msg.pot: tools/wmc include"
if wine_fn_has_flag po $ac_flags
then
wine_fn_append_file ALL_POT_FILES $ac_dir/rsrc.pot
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"$ac_dir/rsrc.pot: $ac_dir/Makefile dummy
@cd $ac_dir && \$(MAKE) rsrc.pot
$ac_dir/rsrc.pot: tools/wrc include"
...
...
@@ -287,7 +279,7 @@ wine_fn_config_makefile ()
AS_VAR_IF([$ac_enable],[no],[return 0])
wine_fn_all_dir_rules $ac_dir ${ac_rules:-Make.rules}
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"all: $ac_dir
.PHONY: $ac_dir
$ac_dir: $ac_dir/Makefile dummy
...
...
@@ -295,7 +287,7 @@ $ac_dir: $ac_dir/Makefile dummy
wine_fn_has_flag install-lib $ac_flags || wine_fn_has_flag install-dev $ac_flags || return
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
".PHONY: $ac_dir/__install__ $ac_dir/__uninstall__
$ac_dir/__install__:: $ac_dir
@cd $ac_dir && \$(MAKE) install
...
...
@@ -306,7 +298,7 @@ __uninstall__: $ac_dir/__uninstall__"
if wine_fn_has_flag install-lib $ac_flags
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
".PHONY: $ac_dir/__install-lib__
$ac_dir/__install-lib__:: $ac_dir
@cd $ac_dir && \$(MAKE) install-lib
...
...
@@ -315,7 +307,7 @@ install-lib:: $ac_dir/__install-lib__"
if wine_fn_has_flag install-dev $ac_flags
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
".PHONY: $ac_dir/__install-dev
$ac_dir/__install-dev__:: $ac_dir
@cd $ac_dir && \$(MAKE) install-dev
...
...
@@ -333,7 +325,7 @@ wine_fn_config_lib ()
if wine_fn_has_flag install-dev $ac_flags
then :
else
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
".PHONY: $ac_dir/__install__ $ac_dir/__uninstall__
$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(dlldir)
\$(INSTALL_DATA) $ac_dir/lib$ac_name.a \$(DESTDIR)\$(dlldir)/lib$ac_name.a
...
...
@@ -343,8 +335,9 @@ install install-dev:: $ac_dir/__install__
__uninstall__: $ac_dir/__uninstall__"
fi
wine_fn_append_rule ALL_MAKEFILE_DEPENDS "__builddeps__: $ac_dir"
wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$ac_dir: tools/widl tools/winebuild tools/winegcc include"
wine_fn_append_rule \
"__builddeps__: $ac_dir
$ac_dir: tools/widl tools/winebuild tools/winegcc include"
}
wine_fn_config_dll ()
...
...
@@ -372,7 +365,7 @@ wine_fn_config_dll ()
[test "$ac_enable" != enable_win16 || return 0
wine_fn_has_flag implib $ac_flags && wine_fn_all_dir_rules $ac_dir dlls/Makedll.rules],
[wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
[wine_fn_append_rule \
"$ac_dir: __builddeps__
manpages htmlpages sgmlpages xmlpages:: $ac_dir/Makefile
@cd $ac_dir && \$(MAKE) \$[@]"
...
...
@@ -380,20 +373,20 @@ manpages htmlpages sgmlpages xmlpages:: $ac_dir/Makefile
if wine_fn_has_flag install-lib $ac_flags
then :
else
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
".PHONY: $ac_dir/__install-lib__ $ac_dir/__uninstall__
install install-lib:: $ac_dir/__install-lib__
__uninstall__: $ac_dir/__uninstall__"
if test -n "$DLLEXT"
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) \$(DESTDIR)\$(fakedlldir)
\$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT
\$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(fakedlldir)/$ac_dll
$ac_dir/__uninstall__::
\$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll"
else
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir)
\$(INSTALL_PROGRAM) $ac_dir/$ac_dll \$(DESTDIR)\$(dlldir)/$ac_dll
$ac_dir/__uninstall__::
...
...
@@ -405,7 +398,7 @@ $ac_dir/__uninstall__::
if wine_fn_has_flag staticimplib $ac_flags
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"__builddeps__: $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT
$ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps
$ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile
...
...
@@ -422,7 +415,7 @@ __uninstall__: $ac_dir/__uninstall__"
if test "$IMPLIBEXT" != "$STATIC_IMPLIBEXT"
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"$ac_dir/__install-dev__:: $ac_file.$STATIC_IMPLIBEXT \$(DESTDIR)\$(dlldir) __builddeps__
\$(INSTALL_DATA) $ac_file.$STATIC_IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT
$ac_dir/__uninstall__::
...
...
@@ -431,7 +424,7 @@ $ac_dir/__uninstall__::
if test "x$CROSSTEST_DISABLE" = x
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"__builddeps__: $ac_file.cross.a
$ac_file.cross.a: $ac_dir/Makefile dummy
@cd $ac_dir && \$(MAKE) lib$ac_implib.cross.a"
...
...
@@ -439,7 +432,7 @@ $ac_file.cross.a: $ac_dir/Makefile dummy
elif wine_fn_has_flag implib $ac_flags
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"__builddeps__: $ac_file.$IMPLIBEXT
$ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD)
\$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$[@] --export \$(srcdir)/$ac_dir/$ac_name.spec
...
...
@@ -454,7 +447,7 @@ install install-dev:: $ac_dir/__install-dev__
__uninstall__: $ac_dir/__uninstall__"
if test "x$CROSSTEST_DISABLE" = x
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"__builddeps__: $ac_file.cross.a
$ac_file.cross.a: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD)
\$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$[@] --export \$(srcdir)/$ac_dir/$ac_name.spec"
...
...
@@ -462,7 +455,7 @@ $ac_file.cross.a: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD)
if test "$ac_name" != "$ac_implib"
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"__builddeps__: dlls/lib$ac_implib.$IMPLIBEXT
dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT
\$(RM) \$[@] && \$(LN_S) $ac_name/lib$ac_implib.$IMPLIBEXT \$[@]
...
...
@@ -470,7 +463,7 @@ clean::
\$(RM) dlls/lib$ac_implib.$IMPLIBEXT"
if test "x$CROSSTEST_DISABLE" = x
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"__builddeps__: dlls/lib$ac_implib.cross.a
dlls/lib$ac_implib.cross.a: $ac_file.cross.a
\$(RM) \$[@] && \$(LN_S) $ac_name/lib$ac_implib.cross.a \$[@]"
...
...
@@ -494,20 +487,19 @@ wine_fn_config_program ()
wine_fn_config_makefile $ac_dir $ac_enable "$ac_flags" programs/Makeprog.rules
AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"$ac_dir: __builddeps__"
AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_rule "$ac_dir: __builddeps__"
wine_fn_pot_rules $ac_dir $ac_flags
wine_fn_has_flag install $ac_flags || return
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
".PHONY: $ac_dir/__install__ $ac_dir/__uninstall__
install install-lib:: $ac_dir/__install__
__uninstall__: $ac_dir/__uninstall__"
if test -n "$DLLEXT"
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(dlldir) \$(DESTDIR)\$(fakedlldir)
\$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT
\$(INSTALL_DATA) $ac_dir/$ac_program.fake \$(DESTDIR)\$(fakedlldir)/$ac_program
...
...
@@ -516,14 +508,14 @@ $ac_dir/__uninstall__::
if test "x$enable_tools" != xno && wine_fn_has_flag installbin $ac_flags
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"$ac_dir/__install__:: tools \$(DESTDIR)\$(bindir)
\$(INSTALL_SCRIPT) tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name
$ac_dir/__uninstall__::
\$(RM) \$(DESTDIR)\$(bindir)/$ac_name"
fi
else
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir)
\$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(dlldir)/$ac_program
$ac_dir/__uninstall__::
...
...
@@ -532,7 +524,7 @@ $ac_dir/__uninstall__::
if test "x$enable_tools" != xno && wine_fn_has_flag manpage $ac_flags
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(mandir)/man\$(prog_manext)
\$(INSTALL_DATA) $ac_dir/$ac_name.man \$(DESTDIR)\$(mandir)/man\$(prog_manext)/$ac_name.\$(prog_manext)
$ac_dir/__uninstall__::
...
...
@@ -548,7 +540,7 @@ wine_fn_config_test ()
wine_fn_append_file ALL_TEST_RESOURCES $ac_name.res
wine_fn_all_dir_rules $ac_dir Maketest.rules
AS_VAR_IF([enable_tests],[no],,[wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
AS_VAR_IF([enable_tests],[no],,[wine_fn_append_rule \
"all: $ac_dir
.PHONY: $ac_dir
$ac_dir: $ac_dir/Makefile programs/winetest/Makefile __builddeps__ dummy
...
...
@@ -563,7 +555,7 @@ testclean::
if test "x$CROSSTEST_DISABLE" = x
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"crosstest: $ac_dir/__crosstest__
.PHONY: $ac_dir/__crosstest__
$ac_dir/__crosstest__: $ac_dir/Makefile __builddeps__ dummy
...
...
@@ -579,10 +571,10 @@ wine_fn_config_tool ()
wine_fn_config_makefile $ac_dir enable_tools $ac_flags
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
"__tooldeps__: $ac_dir"
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
"$ac_dir: libs/port"
wine_fn_append_rule "__tooldeps__: $ac_dir"
wine_fn_append_rule "$ac_dir: libs/port"
case $ac_dir in
tools/winebuild) wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
"\$(WINEBUILD): $ac_dir" ;;
tools/winebuild) wine_fn_append_rule "\$(WINEBUILD): $ac_dir" ;;
esac
}
...
...
@@ -590,7 +582,7 @@ wine_fn_config_makerules ()
{
ac_rules=$[1]
ac_deps=$[2]
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"$ac_rules: $ac_rules.in $ac_deps config.status
@./config.status $ac_rules
distclean::
...
...
@@ -606,18 +598,18 @@ wine_fn_config_symlink ()
shift; shift
fi
ac_links=$[@]
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"$ac_links:
@./config.status \$[@]
distclean::
\$(RM) $ac_links"
test -n "$ac_linkdir" || return
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
"$ac_linkdir/Makefile $ac_linkdir/__depend__: $ac_links"
wine_fn_append_rule "$ac_linkdir/Makefile $ac_linkdir/__depend__: $ac_links"
}
if test "x$CROSSTEST_DISABLE" != x
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"crosstest:
@echo \"crosstest is not supported (mingw not installed?)\" && false"
fi])
...
...
@@ -630,9 +622,9 @@ AC_DEFUN([WINE_APPEND_FILE],[AC_REQUIRE([WINE_CONFIG_HELPERS])wine_fn_append_fil
dnl **** Define helper function to append a rule to a makefile command list ****
dnl
dnl Usage: WINE_APPEND_RULE(
var,
rule)
dnl Usage: WINE_APPEND_RULE(rule)
dnl
AC_DEFUN([WINE_APPEND_RULE],[AC_REQUIRE([WINE_CONFIG_HELPERS])wine_fn_append_rule $1
"$2
"])
AC_DEFUN([WINE_APPEND_RULE],[AC_REQUIRE([WINE_CONFIG_HELPERS])wine_fn_append_rule
"
$1"])
dnl **** Create nonexistent directories from config.status ****
dnl
...
...
This diff is collapsed.
Click to expand it.
configure
+
56
−
55
View file @
49645b6f
...
...
@@ -15444,15 +15444,8 @@ esac
ac_config_commands="$ac_config_commands include/stamp-h"
ALL_MAKEFILE_DEPENDS="
# 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_rules_file=conf$$rules.make
rm -f $wine_rules_file
ALL_POT_FILES=""
ALL_TEST_RESOURCES=""
...
...
@@ -15464,7 +15457,7 @@ wine_fn_append_file ()
wine_fn_append_rule ()
{
as_
fn_append $1 "$as_nl$2"
$
as_
echo "$1" >>$wine_rules_file
}
wine_fn_has_flag ()
...
...
@@ -15489,8 +15482,7 @@ wine_fn_all_dir_rules ()
*) ac_makedep="$2 $ac_makedep" ;;
esac
wine_fn_append_file ALL_DIRS $ac_dir
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
wine_fn_append_rule \
"__clean__: $ac_dir/__clean__
.PHONY: $ac_dir/__clean__
$ac_dir/__clean__: $ac_dir/Makefile
...
...
@@ -15514,7 +15506,7 @@ wine_fn_pot_rules ()
if wine_fn_has_flag mc $ac_flags
then
wine_fn_append_file ALL_POT_FILES $ac_dir/msg.pot
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"$ac_dir/msg.pot: $ac_dir/Makefile dummy
@cd $ac_dir && \$(MAKE) msg.pot
$ac_dir/msg.pot: tools/wmc include"
...
...
@@ -15522,7 +15514,7 @@ $ac_dir/msg.pot: tools/wmc include"
if wine_fn_has_flag po $ac_flags
then
wine_fn_append_file ALL_POT_FILES $ac_dir/rsrc.pot
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"$ac_dir/rsrc.pot: $ac_dir/Makefile dummy
@cd $ac_dir && \$(MAKE) rsrc.pot
$ac_dir/rsrc.pot: tools/wrc include"
...
...
@@ -15540,7 +15532,7 @@ wine_fn_config_makefile ()
fi
wine_fn_all_dir_rules $ac_dir ${ac_rules:-Make.rules}
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"all: $ac_dir
.PHONY: $ac_dir
$ac_dir: $ac_dir/Makefile dummy
...
...
@@ -15548,7 +15540,7 @@ $ac_dir: $ac_dir/Makefile dummy
wine_fn_has_flag install-lib $ac_flags || wine_fn_has_flag install-dev $ac_flags || return
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
".PHONY: $ac_dir/__install__ $ac_dir/__uninstall__
$ac_dir/__install__:: $ac_dir
@cd $ac_dir && \$(MAKE) install
...
...
@@ -15559,7 +15551,7 @@ __uninstall__: $ac_dir/__uninstall__"
if wine_fn_has_flag install-lib $ac_flags
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
".PHONY: $ac_dir/__install-lib__
$ac_dir/__install-lib__:: $ac_dir
@cd $ac_dir && \$(MAKE) install-lib
...
...
@@ -15568,7 +15560,7 @@ install-lib:: $ac_dir/__install-lib__"
if wine_fn_has_flag install-dev $ac_flags
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
".PHONY: $ac_dir/__install-dev
$ac_dir/__install-dev__:: $ac_dir
@cd $ac_dir && \$(MAKE) install-dev
...
...
@@ -15586,7 +15578,7 @@ wine_fn_config_lib ()
if wine_fn_has_flag install-dev $ac_flags
then :
else
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
".PHONY: $ac_dir/__install__ $ac_dir/__uninstall__
$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(dlldir)
\$(INSTALL_DATA) $ac_dir/lib$ac_name.a \$(DESTDIR)\$(dlldir)/lib$ac_name.a
...
...
@@ -15596,8 +15588,9 @@ install install-dev:: $ac_dir/__install__
__uninstall__: $ac_dir/__uninstall__"
fi
wine_fn_append_rule ALL_MAKEFILE_DEPENDS "__builddeps__: $ac_dir"
wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$ac_dir: tools/widl tools/winebuild tools/winegcc include"
wine_fn_append_rule \
"__builddeps__: $ac_dir
$ac_dir: tools/widl tools/winebuild tools/winegcc include"
}
wine_fn_config_dll ()
...
...
@@ -15624,7 +15617,7 @@ wine_fn_config_dll ()
test "$ac_enable" != enable_win16 || return 0
wine_fn_has_flag implib $ac_flags && wine_fn_all_dir_rules $ac_dir dlls/Makedll.rules
else
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"$ac_dir: __builddeps__
manpages htmlpages sgmlpages xmlpages:: $ac_dir/Makefile
@cd $ac_dir && \$(MAKE) \$@"
...
...
@@ -15632,20 +15625,20 @@ manpages htmlpages sgmlpages xmlpages:: $ac_dir/Makefile
if wine_fn_has_flag install-lib $ac_flags
then :
else
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
".PHONY: $ac_dir/__install-lib__ $ac_dir/__uninstall__
install install-lib:: $ac_dir/__install-lib__
__uninstall__: $ac_dir/__uninstall__"
if test -n "$DLLEXT"
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) \$(DESTDIR)\$(fakedlldir)
\$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT
\$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(fakedlldir)/$ac_dll
$ac_dir/__uninstall__::
\$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll"
else
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir)
\$(INSTALL_PROGRAM) $ac_dir/$ac_dll \$(DESTDIR)\$(dlldir)/$ac_dll
$ac_dir/__uninstall__::
...
...
@@ -15658,7 +15651,7 @@ fi
if wine_fn_has_flag staticimplib $ac_flags
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"__builddeps__: $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT
$ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps
$ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile
...
...
@@ -15675,7 +15668,7 @@ __uninstall__: $ac_dir/__uninstall__"
if test "$IMPLIBEXT" != "$STATIC_IMPLIBEXT"
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"$ac_dir/__install-dev__:: $ac_file.$STATIC_IMPLIBEXT \$(DESTDIR)\$(dlldir) __builddeps__
\$(INSTALL_DATA) $ac_file.$STATIC_IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT
$ac_dir/__uninstall__::
...
...
@@ -15684,7 +15677,7 @@ $ac_dir/__uninstall__::
if test "x$CROSSTEST_DISABLE" = x
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"__builddeps__: $ac_file.cross.a
$ac_file.cross.a: $ac_dir/Makefile dummy
@cd $ac_dir && \$(MAKE) lib$ac_implib.cross.a"
...
...
@@ -15692,7 +15685,7 @@ $ac_file.cross.a: $ac_dir/Makefile dummy
elif wine_fn_has_flag implib $ac_flags
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"__builddeps__: $ac_file.$IMPLIBEXT
$ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD)
\$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export \$(srcdir)/$ac_dir/$ac_name.spec
...
...
@@ -15707,7 +15700,7 @@ install install-dev:: $ac_dir/__install-dev__
__uninstall__: $ac_dir/__uninstall__"
if test "x$CROSSTEST_DISABLE" = x
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"__builddeps__: $ac_file.cross.a
$ac_file.cross.a: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD)
\$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$@ --export \$(srcdir)/$ac_dir/$ac_name.spec"
...
...
@@ -15715,7 +15708,7 @@ $ac_file.cross.a: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD)
if test "$ac_name" != "$ac_implib"
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"__builddeps__: dlls/lib$ac_implib.$IMPLIBEXT
dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT
\$(RM) \$@ && \$(LN_S) $ac_name/lib$ac_implib.$IMPLIBEXT \$@
...
...
@@ -15723,7 +15716,7 @@ clean::
\$(RM) dlls/lib$ac_implib.$IMPLIBEXT"
if test "x$CROSSTEST_DISABLE" = x
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"__builddeps__: dlls/lib$ac_implib.cross.a
dlls/lib$ac_implib.cross.a: $ac_file.cross.a
\$(RM) \$@ && \$(LN_S) $ac_name/lib$ac_implib.cross.a \$@"
...
...
@@ -15750,20 +15743,19 @@ wine_fn_config_program ()
if eval test \"x\$"$ac_enable"\" = x"no"; then :
else
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"$ac_dir: __builddeps__"
wine_fn_append_rule "$ac_dir: __builddeps__"
wine_fn_pot_rules $ac_dir $ac_flags
wine_fn_has_flag install $ac_flags || return
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
".PHONY: $ac_dir/__install__ $ac_dir/__uninstall__
install install-lib:: $ac_dir/__install__
__uninstall__: $ac_dir/__uninstall__"
if test -n "$DLLEXT"
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(dlldir) \$(DESTDIR)\$(fakedlldir)
\$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT
\$(INSTALL_DATA) $ac_dir/$ac_program.fake \$(DESTDIR)\$(fakedlldir)/$ac_program
...
...
@@ -15772,14 +15764,14 @@ $ac_dir/__uninstall__::
if test "x$enable_tools" != xno && wine_fn_has_flag installbin $ac_flags
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"$ac_dir/__install__:: tools \$(DESTDIR)\$(bindir)
\$(INSTALL_SCRIPT) tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name
$ac_dir/__uninstall__::
\$(RM) \$(DESTDIR)\$(bindir)/$ac_name"
fi
else
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir)
\$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(dlldir)/$ac_program
$ac_dir/__uninstall__::
...
...
@@ -15788,7 +15780,7 @@ $ac_dir/__uninstall__::
if test "x$enable_tools" != xno && wine_fn_has_flag manpage $ac_flags
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(mandir)/man\$(prog_manext)
\$(INSTALL_DATA) $ac_dir/$ac_name.man \$(DESTDIR)\$(mandir)/man\$(prog_manext)/$ac_name.\$(prog_manext)
$ac_dir/__uninstall__::
...
...
@@ -15808,7 +15800,7 @@ wine_fn_config_test ()
if test "x$enable_tests" = xno; then :
else
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"all: $ac_dir
.PHONY: $ac_dir
$ac_dir: $ac_dir/Makefile programs/winetest/Makefile __builddeps__ dummy
...
...
@@ -15823,7 +15815,7 @@ testclean::
if test "x$CROSSTEST_DISABLE" = x
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"crosstest: $ac_dir/__crosstest__
.PHONY: $ac_dir/__crosstest__
$ac_dir/__crosstest__: $ac_dir/Makefile __builddeps__ dummy
...
...
@@ -15842,10 +15834,10 @@ fi
wine_fn_config_makefile $ac_dir enable_tools $ac_flags
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
"__tooldeps__: $ac_dir"
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
"$ac_dir: libs/port"
wine_fn_append_rule "__tooldeps__: $ac_dir"
wine_fn_append_rule "$ac_dir: libs/port"
case $ac_dir in
tools/winebuild) wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
"\$(WINEBUILD): $ac_dir" ;;
tools/winebuild) wine_fn_append_rule "\$(WINEBUILD): $ac_dir" ;;
esac
}
...
...
@@ -15853,7 +15845,7 @@ wine_fn_config_makerules ()
{
ac_rules=$1
ac_deps=$2
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"$ac_rules: $ac_rules.in $ac_deps config.status
@./config.status $ac_rules
distclean::
...
...
@@ -15869,21 +15861,30 @@ wine_fn_config_symlink ()
shift; shift
fi
ac_links=$@
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"$ac_links:
@./config.status \$@
distclean::
\$(RM) $ac_links"
test -n "$ac_linkdir" || return
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
"$ac_linkdir/Makefile $ac_linkdir/__depend__: $ac_links"
wine_fn_append_rule "$ac_linkdir/Makefile $ac_linkdir/__depend__: $ac_links"
}
if test "x$CROSSTEST_DISABLE" != x
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule \
"crosstest:
@echo \"crosstest is not supported (mingw not installed?)\" && false"
fi
wine_fn_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"
ac_config_links="$ac_config_links dlls/shell32/AUTHORS:AUTHORS"
wine_fn_config_symlink -d dlls/shell32 dlls/shell32/AUTHORS
ac_config_links="$ac_config_links dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd"
...
...
@@ -16717,7 +16718,7 @@ ac_config_files="$ac_config_files Make.tmp:Make.vars.in:Makefile.in"
if test "x$enable_maintainer_mode" = xyes
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
"\$(srcdir)/configure: configure.ac aclocal.m4
wine_fn_append_rule "\$(srcdir)/configure: configure.ac aclocal.m4
cd \$(srcdir) && autoconf --warnings=all
\$(srcdir)/include/config.h.in: include/stamp-h.in
\$(srcdir)/include/stamp-h.in: configure.ac aclocal.m4
...
...
@@ -16728,7 +16729,7 @@ fi
if test "x$with_gettextpo" = xyes
then
test "$srcdir" = . || as_fn_error $? "Rebuilding po files is not supported for out of tree builds." "$LINENO" 5
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
"ALL_POT_FILES =$ALL_POT_FILES
wine_fn_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 \$@
\$(srcdir)/po/wine.pot: \$(ALL_POT_FILES)
...
...
@@ -16739,21 +16740,21 @@ if test "$MSGFMT" != false
then
PORCFLAGS="--po-dir=\$(top_builddir)/po"
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
"__builddeps__: \$(ALL_MO_FILES)"
wine_fn_append_rule "__builddeps__: \$(ALL_MO_FILES)"
else
LINGUAS=
fi
if test "x$enable_tools" != xno
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
"\$(MAKEDEP): tools/Makefile
wine_fn_append_rule "\$(MAKEDEP): tools/Makefile
clean:: __clean__
\$(RM) tools/makedep\$(EXEEXT)"
fi
if test -n "$with_wine64"
then
wine_fn_append_rule
ALL_MAKEFILE_DEPENDS
"all: fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader
wine_fn_append_rule "all: fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader
fonts server tools:
\$(RM) \$@ && \$(LN_S) $with_wine64/\$@ \$@
$with_wine64/loader/wine:
...
...
@@ -17461,7 +17462,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
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_fn_error $? "could not create Makefile" "$LINENO" 5
}
...
...
@@ -18209,7 +18210,7 @@ $as_echo "$as_me: WARNING: $msg" >&2;}
done
IFS="$ac_save_IFS"
echo "
$as_
echo "
$as_me: Finished. Do '${ac_make}' to compile Wine.
" >&6
This diff is collapsed.
Click to expand it.
configure.ac
+
17
−
8
View file @
49645b6f
...
...
@@ -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 "
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment