From cc35d01980df2e2d686568ef7f1216bcc809b5aa Mon Sep 17 00:00:00 2001 From: Andrea Canciani Date: Wed, 23 Dec 2015 11:15:59 +0100 Subject: [PATCH] build: Avoid phony `pixman` target in test/Makefile.win32 Instead of explicitly depending on "pixman" for the "all" and "check" targets, rely on the dependency to the .lib file Signed-off-by: Andrea Canciani Reviewed-by: Oded Gabbay --- test/Makefile.win32 | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/test/Makefile.win32 b/test/Makefile.win32 index 6cfb4a7..bdd9b7f 100644 --- a/test/Makefile.win32 +++ b/test/Makefile.win32 @@ -16,9 +16,9 @@ OBJECTS = $(patsubst %.c, $(CFG_VAR)/%.obj, $(SOURCES)) TESTS = $(patsubst %, $(CFG_VAR)/%.exe, $(TESTPROGRAMS)) OTHERS = $(patsubst %, $(CFG_VAR)/%.exe, $(OTHERPROGRAMS)) -all: pixman inform $(TESTS) $(OTHERS) +all: inform $(TESTS) $(OTHERS) -check: pixman inform $(TESTS) +check: inform $(TESTS) @failures=0 ; \ total=0 ; \ for test in $(TESTS) ; \ @@ -46,9 +46,7 @@ $(CFG_VAR)/libutils.lib: $(libutils_OBJECTS) $(CFG_VAR)/%.exe: $(CFG_VAR)/%.obj $(TEST_LDADD) @$(LD) $(PIXMAN_LDFLAGS) -OUT:$@ $^ -$(top_builddir)/pixman/$(CFG_VAR)/$(LIBRARY).lib: pixman - -pixman: +$(top_builddir)/pixman/$(CFG_VAR)/$(LIBRARY).lib: @$(MAKE) -C $(top_builddir)/pixman -f Makefile.win32 -.PHONY: all check pixman +.PHONY: all check -- 2.34.1