diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2008-09-22 19:43:08 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2008-09-22 20:11:38 -0400 |
| commit | 0ac7a242f829bd31fd7fe12e886fba687ea6dc5e (patch) | |
| tree | 42f3a2521d4c2ada6d5bf5677534cd334b553838 /test | |
| parent | 984320dff11d42d698ff5355c6befe0c5d32df59 (diff) | |
[build] Add Makefile.win32.common
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.win32 | 22 | ||||
| -rw-r--r-- | test/pdiff/Makefile.win32 | 6 |
2 files changed, 4 insertions, 24 deletions
diff --git a/test/Makefile.win32 b/test/Makefile.win32 index e8fea2880..003d96a23 100644 --- a/test/Makefile.win32 +++ b/test/Makefile.win32 @@ -1,7 +1,5 @@ - -SUBMAKEFILE = 1 - -include ../Makefile.win32 +top_srcdir = .. +include $(top_srcdir)/build/Makefile.win32.common CFLAGS += -I../src -I../boilerplate -I./pdiff @@ -121,19 +119,3 @@ test: $(TEST_EXE) html: @echo Creating index.html... @perl make-html.pl > index.html - -clean: - @rm -f $(CFG)/*.obj $(CFG)/*.dll $(CFG)/*.lib $(CFG)/*.pdb $(CFG)/*.ilk $(CFG)/*.exe || exit 0 - -inform: -ifneq ($(CFG),release) -ifneq ($(CFG),debug) - @echo "Invalid configuration "$(CFG)" specified." - @echo -n "You must specify a configuration when " - @echo "running make, e.g. make CFG=debug" - @echo - @echo -n "Possible choices for configuration are " - @echo "'release' and 'debug'" - @exit 1 -endif -endif diff --git a/test/pdiff/Makefile.win32 b/test/pdiff/Makefile.win32 index fccd7e944..5e6680dd5 100644 --- a/test/pdiff/Makefile.win32 +++ b/test/pdiff/Makefile.win32 @@ -1,7 +1,5 @@ - -SUBMAKEFILE = 1 - -include ../../Makefile.win32 +top_srcdir = ../.. +include $(top_srcdir)/build/Makefile.win32.common CFLAGS += -I../../src |