diff options
| author | Andrea Canciani <ranma42@gmail.com> | 2011-06-21 18:11:38 +0200 |
|---|---|---|
| committer | Andrea Canciani <ranma42@gmail.com> | 2011-06-24 11:57:28 +0200 |
| commit | 3a5c8b2c74e73c8a35e80b369f043e62dc2ad26c (patch) | |
| tree | 62930c9f3ee3744f00cbb3f176617985d02d56e1 /test | |
| parent | f21ac5b13b4a2a5455349da29529692a02c2a5e0 (diff) | |
test: Cleanup build on Win32
Put cairo-test-suite.exe in a $(CFG)-dependent folder and link to
libraries from $(top_builddir).
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.win32 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/Makefile.win32 b/test/Makefile.win32 index cd08db86..52357696 100644 --- a/test/Makefile.win32 +++ b/test/Makefile.win32 @@ -4,9 +4,9 @@ include $(top_srcdir)/test/Makefile.sources CFLAGS += -I$(top_srcdir)/boilerplate -I./pdiff -TEST_LIBS = ./pdiff/$(CFG)/pdiff.lib $(top_srcdir)/src/$(CFG)/cairo-static.lib $(top_srcdir)/boilerplate/$(CFG)/boiler.lib +TEST_LIBS = ./pdiff/$(CFG)/pdiff.lib $(top_builddir)/src/$(CFG)/cairo-static.lib $(top_builddir)/boilerplate/$(CFG)/boiler.lib -all: inform cairo-test-suite.exe +all: inform $(CFG)/cairo-test-suite.exe cairo-test-constructors.c: Makefile.sources Makefile.win32 $(test_sources) make-cairo-test-constructors.sh sh ./make-cairo-test-constructors.sh $(test_sources) > $@ @@ -15,21 +15,21 @@ SOURCES = $(cairo_test_suite_sources) $(test_sources) cairo-test-constructors.c OBJECTS = $(patsubst %.c, $(CFG)/%-static.obj, $(SOURCES)) -cairo-test-suite.exe: $(OBJECTS) $(TEST_LIBS) +$(CFG)/cairo-test-suite.exe: $(OBJECTS) $(TEST_LIBS) @$(LD) $(CAIRO_LDFLAGS) -OUT:$@ $(OBJECTS) $(TEST_LIBS) $(CAIRO_LIBS) ./pdiff/$(CFG)/pdiff.lib: $(MAKE) -C pdiff -f Makefile.win32 -$(top_srcdir)/src/$(CFG)/cairo-static.lib: +$(top_builddir)/src/$(CFG)/cairo-static.lib: $(MAKE) -C $(top_srcdir)/src -f Makefile.win32 -$(top_srcdir)/boilerplate/$(CFG)/boiler.lib: +$(top_builddir)/boilerplate/$(CFG)/boiler.lib: $(MAKE) -C $(top_srcdir)/boilerplate -f Makefile.win32 .PHONY: check test -check: inform cairo-test-suite.exe - ./cairo-test-suite.exe +check: inform $(CFG)/cairo-test-suite.exe + ./$(CFG)/cairo-test-suite.exe test: inform check |