diff options
| author | Stefan Monnier | 2019-01-23 16:02:11 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2019-01-23 16:02:11 -0500 |
| commit | dbc48d758ac90748df4befc677b2d21c5cd06d3b (patch) | |
| tree | eb57b8ec0c5ef3ef9ac216b4f8821aa48e1246f4 | |
| parent | 191394276a4c455edd65e7f827fe8bc8317e8348 (diff) | |
| download | emacs-dbc48d758ac90748df4befc677b2d21c5cd06d3b.tar.gz emacs-dbc48d758ac90748df4befc677b2d21c5cd06d3b.zip | |
Avoid having to build src/emacs when we just want to `make tags`
* Makefile.in (TAGS tags): Remove `src` from the dependencies.
* src/Makefile.in (ctagsfiles1): Strip macuvs.h and fingerprint.c.
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index b6cd04d1f3d..53703638c42 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -944,7 +944,9 @@ extraclean: $(extraclean_dirs:=_extraclean) | |||
| 944 | # The src subdir knows how to do the right thing | 944 | # The src subdir knows how to do the right thing |
| 945 | # even when the build directory and source dir are different. | 945 | # even when the build directory and source dir are different. |
| 946 | .PHONY: TAGS tags | 946 | .PHONY: TAGS tags |
| 947 | TAGS tags: lib lib-src src | 947 | # FIXME: We used to include `src` in the dependencies, not sure why. |
| 948 | # I removed it because it causes `make tags` to build Emacs. | ||
| 949 | TAGS tags: lib lib-src # src | ||
| 948 | $(MAKE) -C src tags | 950 | $(MAKE) -C src tags |
| 949 | 951 | ||
| 950 | .PHONY: have-tests | 952 | .PHONY: have-tests |
diff --git a/src/Makefile.in b/src/Makefile.in index 7eb58732672..5890eac8c63 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -720,7 +720,10 @@ ETAGS = ../lib-src/etags${EXEEXT} | |||
| 720 | ${ETAGS}: FORCE | 720 | ${ETAGS}: FORCE |
| 721 | ${MAKE} -C ../lib-src $(notdir $@) | 721 | ${MAKE} -C ../lib-src $(notdir $@) |
| 722 | 722 | ||
| 723 | ctagsfiles1 = $(wildcard ${srcdir}/*.[hc]) | 723 | # Remove macuvs.h and fingerprint.c since they'd cause `src/emacs` |
| 724 | # to be built before we can get TAGS. | ||
| 725 | ctagsfiles1 = $(filter-out ${srcdir}/macuvs.h ${srcdir}/fingerprint.c, \ | ||
| 726 | $(wildcard ${srcdir}/*.[hc])) | ||
| 724 | ctagsfiles2 = $(wildcard ${srcdir}/*.m) | 727 | ctagsfiles2 = $(wildcard ${srcdir}/*.m) |
| 725 | 728 | ||
| 726 | ## In out-of-tree builds, TAGS are generated in the build dir, like | 729 | ## In out-of-tree builds, TAGS are generated in the build dir, like |