Module: wine Branch: master Commit: 7d2e7726e744ba3141fec697ba065a3c2864834b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d2e7726e744ba3141fec697ba...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Jul 26 12:13:47 2010 +0200
makefiles: Always build the static cross libraries if crosstest is supported.
---
Maketest.rules.in | 2 +- aclocal.m4 | 6 +----- configure | 15 ++++++--------- configure.ac | 5 +++-- dlls/Makeimplib.rules.in | 2 +- 5 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/Maketest.rules.in b/Maketest.rules.in index f04dc24..c7d0df0 100644 --- a/Maketest.rules.in +++ b/Maketest.rules.in @@ -47,7 +47,7 @@ $(TESTRESULTS): $(MODULE)$(DLLEXT) ../$(TESTDLL)$(DLLEXT)
# Rules for cross-compiling tests
-crosstest: @CROSSTEST@ +crosstest: @CROSSTEST_DISABLE@ $(CROSSTEST)
$(CROSSTEST): $(CROSSOBJS) Makefile.in $(CROSSWINEGCC) $(CROSSOBJS) -o $@ $(ALL_LIBS) diff --git a/aclocal.m4 b/aclocal.m4 index a77f15e..085b703 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -208,12 +208,8 @@ wine_fn_config_lib () wine_fn_all_dir_rules $ac_dir "dlls/Makeimplib.rules $(MAKEDEP)" wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all __builddeps__: $ac_dir -__buildcrossdeps__: $ac_dir/lib$ac_name.cross.a -$ac_dir $ac_dir/lib$ac_name.cross.a: $ac_dir/Makefile tools/widl tools/winebuild tools/winegcc include -$ac_dir: dummy +$ac_dir: $ac_dir/Makefile tools/widl tools/winebuild tools/winegcc include dummy @cd $ac_dir && $(MAKE) -$ac_dir/lib$ac_name.cross.a: dummy - @cd $ac_dir && $(MAKE) lib$ac_name.cross.a install install-dev:: $ac_dir @cd $ac_dir && $(MAKE) install uninstall:: $ac_dir/Makefile diff --git a/configure b/configure index 437fb20..4e20726 100755 --- a/configure +++ b/configure @@ -646,8 +646,8 @@ X_CFLAGS XMKMF LIBPTHREAD CROSSTARGET -CROSSTEST CROSSCC +CROSSTEST_DISABLE CARBONLIB FRAMEWORK_OPENAL COREAUDIO @@ -6997,7 +6997,9 @@ If you are using Linux, you will need a newer binutils. " "$LINENO" 5 fi
-if test "$cross_compiling" = "no" -a "$LIBEXT" != "dll" +CROSSTEST_DISABLE=# + +if test "$cross_compiling" = "no" -a "x$enable_tests" != xno -a "$LIBEXT" != "dll" then case "$host_cpu" in i[3456789]86*) @@ -7052,8 +7054,7 @@ test -n "$CROSSCC" || CROSSCC="false"
if test "$CROSSCC" != "false" then - CROSSTEST="$(CROSSTEST)" - + CROSSTEST_DISABLE="" set x $CROSSCC shift target="" @@ -14074,12 +14075,8 @@ wine_fn_config_lib () wine_fn_all_dir_rules $ac_dir "dlls/Makeimplib.rules $(MAKEDEP)" wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all __builddeps__: $ac_dir -__buildcrossdeps__: $ac_dir/lib$ac_name.cross.a -$ac_dir $ac_dir/lib$ac_name.cross.a: $ac_dir/Makefile tools/widl tools/winebuild tools/winegcc include -$ac_dir: dummy +$ac_dir: $ac_dir/Makefile tools/widl tools/winebuild tools/winegcc include dummy @cd $ac_dir && $(MAKE) -$ac_dir/lib$ac_name.cross.a: dummy - @cd $ac_dir && $(MAKE) lib$ac_name.cross.a install install-dev:: $ac_dir @cd $ac_dir && $(MAKE) install uninstall:: $ac_dir/Makefile diff --git a/configure.ac b/configure.ac index 0c3a212..68c151f 100644 --- a/configure.ac +++ b/configure.ac @@ -832,12 +832,13 @@ If you are using Linux, you will need a newer binutils.] fi
dnl Check for cross compiler to build test programs -if test "$cross_compiling" = "no" -a "$LIBEXT" != "dll" +AC_SUBST([CROSSTEST_DISABLE],[#]) +if test "$cross_compiling" = "no" -a "x$enable_tests" != xno -a "$LIBEXT" != "dll" then WINE_CHECK_MINGW_PROG(CROSSCC,gcc,false) if test "$CROSSCC" != "false" then - AC_SUBST(CROSSTEST,"$(CROSSTEST)") + CROSSTEST_DISABLE="" set x $CROSSCC shift target="" diff --git a/dlls/Makeimplib.rules.in b/dlls/Makeimplib.rules.in index da36eee..1f9287d 100644 --- a/dlls/Makeimplib.rules.in +++ b/dlls/Makeimplib.rules.in @@ -12,7 +12,7 @@ INSTALLDIRS = $(DESTDIR)$(dlldir)
@MAKE_RULES@
-all: $(MODULE:%=lib%.a) +all: $(MODULE:%=lib%.a) @CROSSTEST_DISABLE@ $(MODULE:%=lib%.cross.a)
# Rules for .a library