summaryrefslogtreecommitdiff
path: root/lib-src
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2019-04-09 15:42:10 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2019-04-09 15:43:35 -0700
commitd82603747564063f908c9c877449c827a9808528 (patch)
treeb74dae7a9ab4d8b441141725f3455679d14f14aa /lib-src
parente44ff2de819ead77b00c7fb4ede75ada685ff099 (diff)
downloademacs-d82603747564063f908c9c877449c827a9808528.tar.gz
Remove the need for temacs.in
Instead of building a file temacs.in used only to compute a fingerprint, compute the fingerprint directly from the .o and .a files that go into temacs.in. This speeds up the build by avoiding the need to link temacs twice, once with a dummy fingerprint. * lib-src/make-fingerprint.c (main): No need to generate a fingerprint file that includes config.h, now that fingerprint.c depends on all the .o files. * src/Makefile.in ($(libsrc)/make-fingerprint$(EXEEXT)): Use the same rule as $(libsrc)/make-docfile$(EXEEXT). * src/fingerprint-dummy.c: Remove. * src/Makefile.in (${charsets}, $(libsrc)/make-docfile$(EXEEXT)) ($(LIBEGNU_ARCHIVE), $(lwlibdir)/liblw.a, $(oldXMenudir)/libXMenu11.a) (../config.status, ${ETAGS}, ../lisp/TAGS, $(lwlibdir)/TAGS) ($(lispsource)/loaddefs.el): Prefer ‘$(MAKE) -C $(dir $@)’ to ‘${MAKE} -C SOMESTRING’ when either will do, as the former is more regular and lets us coalesce rules better. (EMACS_DEPS_PRE, EMACS_DEPS_POST, BUILD_EMACS_PRE) (BUILD_EMACS_POST, temacs.in$(EXEEXT)): Remove. (FINGERPRINTED): New macro. (fingerprint.c): Use it instead of temacs.in$(EXEEXT), to avoid the need to build temacs.in at all. (temacs$(EXEEXT)): No need to depend on other .o files now; fingerprint.o is enough, since it depends on the rest. Spell out what used to be in BUILD_EMACS_PRE and BUILD_EMACS_POST. (mostlyclean): No need to remove temacs.in.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/make-fingerprint.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib-src/make-fingerprint.c b/lib-src/make-fingerprint.c
index 4bfeaa0742c..35bb8b98a00 100644
--- a/lib-src/make-fingerprint.c
+++ b/lib-src/make-fingerprint.c
@@ -99,9 +99,9 @@ main (int argc, char **argv)
}
else
{
- puts ("#include <config.h>\n"
- "#include \"fingerprint.h\"\n"
- "unsigned char const fingerprint[] = {");
+ puts ("#include \"fingerprint.h\"\n"
+ "unsigned char const fingerprint[] =\n"
+ "{");
for (int i = 0; i < 32; ++i)
printf ("\t0x%02X,\n", digest[i]);
puts ("};");