Alexandre Julliard : configure: Make the tools directory a symlink in the wow64 build tree.
Alexandre Julliard
julliard at winehq.org
Tue May 10 13:33:39 CDT 2011
Module: wine
Branch: master
Commit: 84fd1f58497fd721ac2d2b18785cebefe216bc1d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=84fd1f58497fd721ac2d2b18785cebefe216bc1d
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue May 10 11:59:43 2011 +0200
configure: Make the tools directory a symlink in the wow64 build tree.
---
Makefile.in | 4 +---
aclocal.m4 | 14 ++++++++------
configure | 35 ++++++++++++++++++++++-------------
configure.ac | 16 ++++++++++++----
4 files changed, 43 insertions(+), 26 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index ed218fa..b8cd6af 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -48,8 +48,6 @@ include/stamp-h: include/config.h.in config.status
.PHONY: __clean__
clean:: __clean__
- $(RM) tools/makedep$(EXEEXT)
-
distclean:: clean
$(RM) config.* configure.lineno TAGS tags include/config.h include/stamp-h Makefile Make.tmp
$(RM) -r autom4te.cache
@@ -71,7 +69,7 @@ tools/widl tools/wmc tools/wrc: libs/wpp
dlls/shell32/Makefile dlls/shell32/__depend__: dlls/shell32/AUTHORS
-$(MAKEDEP): include/config.h tools/Makefile
+$(MAKEDEP): include/config.h
@cd $(TOOLSDIR)/tools && $(MAKE) makedep$(TOOLSEXT)
# Misc rules
diff --git a/aclocal.m4 b/aclocal.m4
index 3db9cda..6b7788d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -425,9 +425,11 @@ $ac_dir/__crosstest__: $ac_dir/Makefile __builddeps__ dummy
wine_fn_config_tool ()
{
ac_dir=$[1]
+ AS_VAR_IF([enable_tools],[no],[return 0])
+
wine_fn_all_dir_rules $ac_dir Make.rules
- AS_VAR_IF([enable_tools],[no],,[case $ac_dir in
+ case $ac_dir in
dnl tools directory has both install-lib and install-dev
tools) wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"install:: $ac_dir
@@ -439,17 +441,17 @@ install-dev:: $ac_dir
*) wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"install install-dev:: $ac_dir
@cd $ac_dir && \$(MAKE) install" ;;
- esac
- wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
+ esac
+ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"uninstall:: $ac_dir/Makefile
@cd $ac_dir && \$(MAKE) uninstall
all __tooldeps__: $ac_dir
.PHONY: $ac_dir
$ac_dir: $ac_dir/Makefile libs/port dummy
@cd $ac_dir && \$(MAKE)"
- case $ac_dir in
- tools/winebuild) wine_fn_append_rule ALL_MAKEFILE_DEPENDS "\$(WINEBUILD): $ac_dir" ;;
- esac])
+ case $ac_dir in
+ tools/winebuild) wine_fn_append_rule ALL_MAKEFILE_DEPENDS "\$(WINEBUILD): $ac_dir" ;;
+ esac
}
wine_fn_config_makerules ()
diff --git a/configure b/configure
index 2d6df8c..0d82519 100755
--- a/configure
+++ b/configure
@@ -14894,12 +14894,13 @@ fi
wine_fn_config_tool ()
{
ac_dir=$1
- wine_fn_all_dir_rules $ac_dir Make.rules
-
if test "x$enable_tools" = xno; then :
+ return 0
+fi
-else
- case $ac_dir in
+ wine_fn_all_dir_rules $ac_dir Make.rules
+
+ case $ac_dir in
tools) wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"install:: $ac_dir
@cd $ac_dir && \$(MAKE) install
@@ -14910,18 +14911,17 @@ install-dev:: $ac_dir
*) wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"install install-dev:: $ac_dir
@cd $ac_dir && \$(MAKE) install" ;;
- esac
- wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
+ esac
+ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"uninstall:: $ac_dir/Makefile
@cd $ac_dir && \$(MAKE) uninstall
all __tooldeps__: $ac_dir
.PHONY: $ac_dir
$ac_dir: $ac_dir/Makefile libs/port dummy
@cd $ac_dir && \$(MAKE)"
- case $ac_dir in
- tools/winebuild) wine_fn_append_rule ALL_MAKEFILE_DEPENDS "\$(WINEBUILD): $ac_dir" ;;
- esac
-fi
+ case $ac_dir in
+ tools/winebuild) wine_fn_append_rule ALL_MAKEFILE_DEPENDS "\$(WINEBUILD): $ac_dir" ;;
+ esac
}
wine_fn_config_makerules ()
@@ -14971,8 +14971,10 @@ if test "x$enable_fonts" != xno; then
ac_config_links="$ac_config_links fonts/tahomabd.ttf:fonts/tahomabd.ttf"
test "$srcdir" = "." || wine_fn_config_symlink fonts/tahomabd.ttf
fi
+if test "x$enable_tools" != xno; then
ac_config_links="$ac_config_links tools/l_intl.nls:tools/l_intl.nls"
test "$srcdir" = "." || wine_fn_config_symlink tools/l_intl.nls
+fi
ac_config_links="$ac_config_links wine:tools/winewrapper"
wine_fn_config_symlink wine
@@ -15711,17 +15713,24 @@ all: \$(ALL_PO_FILES)
msgcat -o \$@ \$(ALL_POT_FILES)"
fi
+if test "x$enable_tools" != xno
+then
+ wine_fn_append_rule ALL_MAKEFILE_DEPENDS "\$(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 $with_wine64/loader/wine $with_wine64/loader/wine-preloader
-fonts server:
+wine_fn_append_rule ALL_MAKEFILE_DEPENDS "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:
\$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine \$@
$with_wine64/loader/wine-preloader:
\$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine-preloader \$@
clean::
- \$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader"
+ \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader"
fi
wine_fn_append_rule ALL_MAKEFILE_DEPENDS "uninstall::
diff --git a/configure.ac b/configure.ac
index eff1550..a5c5baa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2369,7 +2369,7 @@ WINE_CONFIG_SYMLINK(fonts/marlett.ttf,,enable_fonts)
WINE_CONFIG_SYMLINK(fonts/symbol.ttf,,enable_fonts)
WINE_CONFIG_SYMLINK(fonts/tahoma.ttf,,enable_fonts)
WINE_CONFIG_SYMLINK(fonts/tahomabd.ttf,,enable_fonts)
-WINE_CONFIG_SYMLINK(tools/l_intl.nls)
+WINE_CONFIG_SYMLINK(tools/l_intl.nls,,enable_tools)
WINE_CONFIG_SYMLINK(wine,tools/winewrapper)
WINE_CONFIG_EXTRA_DIR(dlls/gdi32/dibdrv)
@@ -3092,18 +3092,26 @@ all: \$(ALL_PO_FILES)
msgcat -o \$[@] \$(ALL_POT_FILES)])
fi
+if test "x$enable_tools" != xno
+then
+ WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],
+[\$(MAKEDEP): tools/Makefile
+clean:: __clean__
+ \$(RM) tools/makedep\$(EXEEXT)])
+fi
+
if test -n "$with_wine64"
then
WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],
-[all: fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader
-fonts server:
+[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:
\$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine \$[@]
$with_wine64/loader/wine-preloader:
\$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine-preloader \$[@]
clean::
- \$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader])
+ \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader])
fi
WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],
More information about the wine-cvs
mailing list