summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Canciani <ranma42@gmail.com>2015-12-23 11:15:59 +0100
committerAndrea Canciani <ranma42@gmail.com>2015-12-23 21:23:57 +0100
commitcc35d01980df2e2d686568ef7f1216bcc809b5aa (patch)
tree8ab8ad717c82e51d2bd61255f236515c373cd7ff
parentceb49cbda93a59bf41a5a9908114534208f8250c (diff)
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 <ranma42@gmail.com> Reviewed-by: Oded Gabbay <oded.gabbay@gmail.com>
-rw-r--r--test/Makefile.win3210
1 files changed, 4 insertions, 6 deletions
diff --git a/test/Makefile.win32 b/test/Makefile.win32
index 6cfb4a78..bdd9b7f7 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