Fossil SCM
The "tags" Makefile target added in [ebb67be4] relied on GNU make conditionals, which causes BSD make to choke. Reworked the feature to do the conditional work entirely on the Autosetup side instead.
Commit
42111658ca8d2ca418cc427e4038452bebe046409533a035913d97324862bbb6
Parent
33bec291b02fed8…
2 files changed
+1
-3
+5
-1
+1
-3
| --- Makefile.in | ||
| +++ Makefile.in | ||
| @@ -61,13 +61,11 @@ | ||
| 61 | 61 | reconfig: |
| 62 | 62 | @AUTOREMAKE@ |
| 63 | 63 | |
| 64 | 64 | tags: |
| 65 | 65 | ctags -R @srcdir@/src |
| 66 | -ifeq (@HAVE_PROG_CSCOPE@, 1) | |
| 67 | - cscope -bR -s@srcdir@/src | |
| 68 | -endif | |
| 66 | + @COLLECT_CSCOPE_DATA@ | |
| 69 | 67 | |
| 70 | 68 | # Automatically reconfigure whenever an autosetup file or one of the |
| 71 | 69 | # make source files change. |
| 72 | 70 | # |
| 73 | 71 | # The "touch" is necessary to avoid a make loop due to a new upstream |
| 74 | 72 |
| --- Makefile.in | |
| +++ Makefile.in | |
| @@ -61,13 +61,11 @@ | |
| 61 | reconfig: |
| 62 | @AUTOREMAKE@ |
| 63 | |
| 64 | tags: |
| 65 | ctags -R @srcdir@/src |
| 66 | ifeq (@HAVE_PROG_CSCOPE@, 1) |
| 67 | cscope -bR -s@srcdir@/src |
| 68 | endif |
| 69 | |
| 70 | # Automatically reconfigure whenever an autosetup file or one of the |
| 71 | # make source files change. |
| 72 | # |
| 73 | # The "touch" is necessary to avoid a make loop due to a new upstream |
| 74 |
| --- Makefile.in | |
| +++ Makefile.in | |
| @@ -61,13 +61,11 @@ | |
| 61 | reconfig: |
| 62 | @AUTOREMAKE@ |
| 63 | |
| 64 | tags: |
| 65 | ctags -R @srcdir@/src |
| 66 | @COLLECT_CSCOPE_DATA@ |
| 67 | |
| 68 | # Automatically reconfigure whenever an autosetup file or one of the |
| 69 | # make source files change. |
| 70 | # |
| 71 | # The "touch" is necessary to avoid a make loop due to a new upstream |
| 72 |
M
auto.def
+5
-1
| --- auto.def | ||
| +++ auto.def | ||
| @@ -35,11 +35,15 @@ | ||
| 35 | 35 | |
| 36 | 36 | # Use pread/pwrite system calls in place of seek + read/write if possible |
| 37 | 37 | define USE_PREAD [cc-check-functions pread] |
| 38 | 38 | |
| 39 | 39 | # If we have cscope here, we'll use it in the "tags" target |
| 40 | -define HAVE_PROG_CSCOPE [cc-check-progs cscope] | |
| 40 | +if {[cc-check-progs cscope]} { | |
| 41 | + define COLLECT_CSCOPE_DATA "cscope -bR -s$::autosetup(srcdir)/src" | |
| 42 | +} else { | |
| 43 | + define COLLECT_CSCOPE_DATA "" | |
| 44 | +} | |
| 41 | 45 | |
| 42 | 46 | # Find tclsh for the test suite. |
| 43 | 47 | # |
| 44 | 48 | # We can't use jimsh for this: the test suite uses features of Tcl that |
| 45 | 49 | # Jim doesn't support, either statically or due to the way it's built by |
| 46 | 50 |
| --- auto.def | |
| +++ auto.def | |
| @@ -35,11 +35,15 @@ | |
| 35 | |
| 36 | # Use pread/pwrite system calls in place of seek + read/write if possible |
| 37 | define USE_PREAD [cc-check-functions pread] |
| 38 | |
| 39 | # If we have cscope here, we'll use it in the "tags" target |
| 40 | define HAVE_PROG_CSCOPE [cc-check-progs cscope] |
| 41 | |
| 42 | # Find tclsh for the test suite. |
| 43 | # |
| 44 | # We can't use jimsh for this: the test suite uses features of Tcl that |
| 45 | # Jim doesn't support, either statically or due to the way it's built by |
| 46 |
| --- auto.def | |
| +++ auto.def | |
| @@ -35,11 +35,15 @@ | |
| 35 | |
| 36 | # Use pread/pwrite system calls in place of seek + read/write if possible |
| 37 | define USE_PREAD [cc-check-functions pread] |
| 38 | |
| 39 | # If we have cscope here, we'll use it in the "tags" target |
| 40 | if {[cc-check-progs cscope]} { |
| 41 | define COLLECT_CSCOPE_DATA "cscope -bR -s$::autosetup(srcdir)/src" |
| 42 | } else { |
| 43 | define COLLECT_CSCOPE_DATA "" |
| 44 | } |
| 45 | |
| 46 | # Find tclsh for the test suite. |
| 47 | # |
| 48 | # We can't use jimsh for this: the test suite uses features of Tcl that |
| 49 | # Jim doesn't support, either statically or due to the way it's built by |
| 50 |