Skip to content
Snippets Groups Projects
Commit eab7efd1 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files

makefiles: Fix test rules to allow parallel makes again.

parent f7cc8f69
No related branches found
No related tags found
No related merge requests found
...@@ -127,7 +127,7 @@ uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__) dummy ...@@ -127,7 +127,7 @@ uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__) dummy
# dependencies needed to build any dll or program # dependencies needed to build any dll or program
__tooldeps__: libs/port libs/wine libs/wpp __tooldeps__: libs/port libs/wine libs/wpp
__builddeps__ __buildcrossdeps__: __tooldeps__ include __builddeps__ __buildcrossdeps__: __tooldeps__ include
.PHONY: __tooldeps__ __builddeps__ __buildcrossdeps__ .PHONY: test crosstest __tooldeps__ __builddeps__ __buildcrossdeps__
loader server: libs/port libs/wine tools loader server: libs/port libs/wine tools
fonts: tools fonts: tools
......
...@@ -41,13 +41,13 @@ testlist.o: testlist.c $(TOPSRCDIR)/include/wine/test.h ...@@ -41,13 +41,13 @@ testlist.o: testlist.c $(TOPSRCDIR)/include/wine/test.h
# Rules for testing # Rules for testing
check test:: $(TESTRESULTS) check test: $(TESTRESULTS)
$(TESTRESULTS): $(MODULE)$(DLLEXT) ../$(TESTDLL)$(DLLEXT) $(TESTRESULTS): $(MODULE)$(DLLEXT) ../$(TESTDLL)$(DLLEXT)
# Rules for cross-compiling tests # Rules for cross-compiling tests
crosstest:: @CROSSTEST@ crosstest: @CROSSTEST@
$(CROSSTEST): $(CROSSOBJS) Makefile.in $(CROSSTEST): $(CROSSOBJS) Makefile.in
$(CROSSWINEGCC) $(CROSSOBJS) -o $@ $(ALL_LIBS) $(CROSSWINEGCC) $(CROSSOBJS) -o $@ $(ALL_LIBS)
......
...@@ -306,9 +306,11 @@ $ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status Maketest. ...@@ -306,9 +306,11 @@ $ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status Maketest.
AS_VAR_IF([enable_tests],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ AS_VAR_IF([enable_tests],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"all programs/winetest: $ac_dir "all programs/winetest: $ac_dir
$ac_dir: $ac_dir/Makefile __builddeps__ $ac_dir: $ac_dir/Makefile __builddeps__
crosstest:: $ac_dir/Makefile __buildcrossdeps__ crosstest .PHONY: $ac_dir/__crosstest__
$ac_dir/__crosstest__: $ac_dir/Makefile __buildcrossdeps__ dummy
@cd $ac_dir && \$(MAKE) crosstest @cd $ac_dir && \$(MAKE) crosstest
test:: test .PHONY: $ac_dir/__test__
$ac_dir/__test__: dummy
@cd $ac_dir && \$(MAKE) test @cd $ac_dir && \$(MAKE) test
testclean:: testclean::
\$(RM) $ac_dir/*.ok"]) \$(RM) $ac_dir/*.ok"])
......
...@@ -14035,9 +14035,11 @@ else ...@@ -14035,9 +14035,11 @@ else
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"all programs/winetest: $ac_dir "all programs/winetest: $ac_dir
$ac_dir: $ac_dir/Makefile __builddeps__ $ac_dir: $ac_dir/Makefile __builddeps__
crosstest:: $ac_dir/Makefile __buildcrossdeps__ crosstest .PHONY: $ac_dir/__crosstest__
$ac_dir/__crosstest__: $ac_dir/Makefile __buildcrossdeps__ dummy
@cd $ac_dir && \$(MAKE) crosstest @cd $ac_dir && \$(MAKE) crosstest
test:: test .PHONY: $ac_dir/__test__
$ac_dir/__test__: dummy
@cd $ac_dir && \$(MAKE) test @cd $ac_dir && \$(MAKE) test
testclean:: testclean::
\$(RM) $ac_dir/*.ok" \$(RM) $ac_dir/*.ok"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment