diff options
| author | Andrea Canciani <ranma42@gmail.com> | 2011-06-18 17:07:17 +0200 |
|---|---|---|
| committer | Andrea Canciani <ranma42@gmail.com> | 2011-06-20 10:24:21 +0200 |
| commit | f9b50cec2b05a9371c90a1e6996af927e47b1d34 (patch) | |
| tree | 6b79bf9024fcc84a1de7c0b07decf731fcb47b51 /Makefile.win32 | |
| parent | c7c3475cdb429a996190c2c95c20a60984a1bba9 (diff) | |
build: Improve dependencies in win32 Makefiles
Test targets now explicitly depend on the cairo library and build it
appropriately.
Phony targets depend on inform, so that they print a warning if the
environment is not set up appropriately.
Diffstat (limited to 'Makefile.win32')
| -rw-r--r-- | Makefile.win32 | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/Makefile.win32 b/Makefile.win32 index 7da22228..770df70f 100644 --- a/Makefile.win32 +++ b/Makefile.win32 @@ -4,23 +4,10 @@ top_srcdir = . include $(top_srcdir)/build/Makefile.win32.common -SUBDIRS = src -TEST_SUBDIRS = boilerplate test +all: cairo -all: inform cairo +cairo: inform + @$(MAKE) -C src -f Makefile.win32 -cairo: src/cairo-features.h - @list='$(SUBDIRS)'; for f in $$list ; do \ - echo making all in $$f... ; \ - ($(MAKE) -C $$f -f Makefile.win32) || exit 1 ; \ - done - -test: cairo - @list='$(TEST_SUBDIRS)'; for f in $$list ; do \ - echo making all in $$f... ; \ - ($(MAKE) -C $$f -f Makefile.win32) || exit 1 ; \ - done - @(cd test ; make -f Makefile.win32 test) - -html: - @(cd test ; make -f Makefile.win32 html) +test: inform + @$(MAKE) -C test -f Makefile.win32 test |