aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2019-02-25 17:44:46 -0800
committerPaul Eggert2019-02-25 17:45:10 -0800
commit2f7885a4b3609dec19e4595c6c24f3a21f33c5d6 (patch)
tree4f3ab404aed0b10940d6cf7f06383e94ccca71bb
parente0668e6871006a4ce8cbd769b67b2603b99336a2 (diff)
downloademacs-2f7885a4b3609dec19e4595c6c24f3a21f33c5d6.tar.gz
emacs-2f7885a4b3609dec19e4595c6c24f3a21f33c5d6.zip
Fix mod-test build failure
Problem reported by Glenn Morris in: https://lists.gnu.org/r/emacs-devel/2019-02/msg00739.html * test/Makefile.in (HYBRID_MALLOC, LIBEGNU_ARCHIVE): New macros, taken from ../src/Makefile.in. (MODULE_CFLAGS): Add -I$(srcdir)/../lib. ($(test_module)): Link $(LIBEGNU_ARCHIVE) too.
-rw-r--r--test/Makefile.in10
1 files changed, 7 insertions, 3 deletions
diff --git a/test/Makefile.in b/test/Makefile.in
index 4eddb676d4f..ce6ce04b8be 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -254,17 +254,21 @@ else
254FPIC_CFLAGS = -fPIC 254FPIC_CFLAGS = -fPIC
255endif 255endif
256 256
257HYBRID_MALLOC = @HYBRID_MALLOC@
258LIBEGNU_ARCHIVE = ../lib/lib$(if $(HYBRID_MALLOC),e)gnu.a
259
257# Note: emacs-module.h is generated from emacs-module.h.in, hence we 260# Note: emacs-module.h is generated from emacs-module.h.in, hence we
258# look in ../src, not $(srcdir)/../src. 261# look in ../src, not $(srcdir)/../src.
259MODULE_CFLAGS = -I../src $(FPIC_CFLAGS) $(PROFILING_CFLAGS) \ 262MODULE_CFLAGS = -I../src -I$(srcdir)/../lib \
263 $(FPIC_CFLAGS) $(PROFILING_CFLAGS) \
260 $(WARN_CFLAGS) $(WERROR_CFLAGS) $(CFLAGS) 264 $(WARN_CFLAGS) $(WERROR_CFLAGS) $(CFLAGS)
261 265
262test_module = $(test_module_dir)/mod-test${SO} 266test_module = $(test_module_dir)/mod-test${SO}
263src/emacs-module-tests.log: $(test_module) 267src/emacs-module-tests.log: $(test_module)
264$(test_module): $(test_module:${SO}=.c) ../src/emacs-module.h 268$(test_module): $(test_module:${SO}=.c) ../src/emacs-module.h $(LIBEGNU_ARCHIVE)
265 $(AM_V_at)${MKDIR_P} $(dir $@) 269 $(AM_V_at)${MKDIR_P} $(dir $@)
266 $(AM_V_CCLD)$(CC) -shared $(CPPFLAGS) $(MODULE_CFLAGS) $(LDFLAGS) \ 270 $(AM_V_CCLD)$(CC) -shared $(CPPFLAGS) $(MODULE_CFLAGS) $(LDFLAGS) \
267 -o $@ $< 271 -o $@ $< $(LIBEGNU_ARCHIVE)
268endif 272endif
269 273
270## Check that there is no 'automated' subdirectory, which would 274## Check that there is no 'automated' subdirectory, which would