diff options
| author | Morgan Deters <mdeters@gmail.com> | 2011-06-18 02:44:41 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2011-06-18 02:44:41 +0000 |
| commit | d5d73d514946ea4a7f5691f46c4d6b9c2776f59d (patch) | |
| tree | 68654da6eedf2c05681a5f8df1553fd88d179271 /Makefile.subdir | |
| parent | 0555d96193b6d9c39c26a04941c6087e4465adf0 (diff) | |
Some fixes inspired by Fedora 15:
* compilation fixes for GCC 4.6.x
+ ptrdiff_t is now in std::
* fix some make rules that are ok in Make 3.81 but broke in Make 3.82
* look for cxxtestgen.py as well as cxxtestgen.pl, and look for cxxtest headers in /usr/include
Diffstat (limited to 'Makefile.subdir')
| -rw-r--r-- | Makefile.subdir | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Makefile.subdir b/Makefile.subdir index 7b7c90561..4bafe4684 100644 --- a/Makefile.subdir +++ b/Makefile.subdir @@ -10,9 +10,8 @@ builddir = $(topdir)/builds/$(CURRENT_BUILD)/$(srcdir) unittestdir = $(topdir)/builds/$(CURRENT_BUILD)/test/unit unittestprefix = $(srcdir:src/%=%) -.PHONY: _default_build_ all -_default_build_: all -all %: +.PHONY: all +all .DEFAULT: @if test -e $(builddir); then \ echo cd $(builddir); \ cd $(builddir); \ @@ -27,8 +26,8 @@ all %: .PHONY: check units ifeq ($(srcdir:test/%=test),test) # under the test/ directory, additional subtargets -.PHONY: regress regress0 regress1 regress2 regress3 -check units regress regress0 regress1 regress2 regress3: +.PHONY: systemtests regress regress0 regress1 regress2 regress3 +check units systemtests regress regress0 regress1 regress2 regress3: @if test -e $(builddir); then \ echo cd $(builddir); \ cd $(builddir); \ |