diff options
| author | Morgan Deters <mdeters@gmail.com> | 2011-09-28 19:46:53 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2011-09-28 19:46:53 +0000 |
| commit | 2f15e89145ad68f1809dd15abb6b659a3817b260 (patch) | |
| tree | 3ebf28421e2d9d9dbb5b8c91c0ac1351081d8603 /src/util | |
| parent | 623e4c71b3ec579a5933b3c65dd1da67b007f6c9 (diff) | |
better fix for #281, also fix issue with command line options not existing on older g++en, like Apple's 4.2 on Snow Leopard.
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/Makefile.am | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am index f5a3b7d00..ed6881994 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -112,11 +112,14 @@ endif diff -q "$^" "$@" &>/dev/null || mv "$^" "$@" || true # .PHONY ensures the .tmp version is always rebuilt (to check for any changes) .PHONY: Debug_tags.tmp Trace_tags.tmp +# The "sed" invocation below is particularly obnoxious, but it works around +# inconsistencies in REs on different platforms, using only a basic regular +# expression (no |, no \<, ...). Debug_tags.tmp Trace_tags.tmp: $(AM_V_GEN)\ - grep '[^a-zA-Z0-9_]$(@:_tags.tmp=) *( *\".*\" *)' \ + grep '\<$(@:_tags.tmp=) *( *\".*\" *)' \ `find @srcdir@/../ -name "*.cpp" -or -name "*.h" -or -name "*.cc" -or -name "*.g"` | \ - sed 's/.*[^a-zA-Z0-9_]$(@:_tags.tmp=) *( *\"\([^"]*\)\".*/\1/g' | sort | uniq >"$@" + sed 's/^$(@:_tags.tmp=) *( *\"\([^"]*\)\".*/\1/;s/.*[^a-zA-Z0-9_]$(@:_tags.tmp=) *( *\"\([^"]*\)\".*/\1/' | sort | uniq >"$@" if CVC4_CLN_IMP libutil_la_SOURCES += \ |