[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 769d0cd 1/2: ; Fix out-of-tree build for mod-test
From: |
Noam Postavsky |
Subject: |
[Emacs-diffs] emacs-26 769d0cd 1/2: ; Fix out-of-tree build for mod-test.so |
Date: |
Sat, 25 Aug 2018 19:01:36 -0400 (EDT) |
branch: emacs-26
commit 769d0cdaa9a986b74e30dfc589e1fa8115e1d401
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>
; Fix out-of-tree build for mod-test.so
* test/Makefile.in: Don't look for emacs-module.h in $(srcdir), since
it is generated.
---
test/Makefile.in | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/test/Makefile.in b/test/Makefile.in
index 597ef91..c0a0733 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -231,12 +231,14 @@ else
FPIC_CFLAGS = -fPIC
endif
-MODULE_CFLAGS = -I$(srcdir)/../src $(FPIC_CFLAGS) $(PROFILING_CFLAGS) \
+# Note: emacs-module.h is generated from emacs-module.h.in, hence we
+# look in ../src, not $(srcdir)/../src.
+MODULE_CFLAGS = -I../src $(FPIC_CFLAGS) $(PROFILING_CFLAGS) \
$(WARN_CFLAGS) $(WERROR_CFLAGS) $(CFLAGS)
test_module = $(test_module_dir)/mod-test${SO}
src/emacs-module-tests.log: $(test_module)
-$(test_module): $(test_module:${SO}=.c) $(srcdir)/../src/emacs-module.h
+$(test_module): $(test_module:${SO}=.c) ../src/emacs-module.h
$(AM_V_CCLD)$(CC) -shared $(CPPFLAGS) $(MODULE_CFLAGS) $(LDFLAGS) \
-o $@ $<
endif