Reviewers: lemzwerg,
Message:
commit 7894ae1dcaffe8f741407e962cf57e4481e93085
Author: Han-Wen Nienhuys <han...@lilypond.org>
Date: Sat Mar 21 23:30:38 2020 +0100
Inline elisp templates.
https://sourceforge.net/p/testlilyissues/issues/5857
http://codereview.appspot.com/563780044
Description:
Inline elisp stepmake templates.
Please review this at https://codereview.appspot.com/563780044/
Affected files (+5, -6 lines):
M elisp/GNUmakefile
D stepmake/stepmake/elisp-rules.make
D stepmake/stepmake/elisp-targets.make
D stepmake/stepmake/elisp-vars.make
Index: stepmake/stepmake/elisp-rules.make
diff --git a/stepmake/stepmake/elisp-rules.make
b/stepmake/stepmake/elisp-rules.make
deleted file mode 100644
index
1bb8bf6d7fd4c8d09aea89b47de20fb8bbb61626..0000000000000000000000000000000000000000
--- a/stepmake/stepmake/elisp-rules.make
+++ /dev/null
@@ -1 +0,0 @@
-# empty
Index: stepmake/stepmake/elisp-targets.make
diff --git a/stepmake/stepmake/elisp-targets.make
b/stepmake/stepmake/elisp-targets.make
deleted file mode 100644
index
1bb8bf6d7fd4c8d09aea89b47de20fb8bbb61626..0000000000000000000000000000000000000000
--- a/stepmake/stepmake/elisp-targets.make
+++ /dev/null
@@ -1 +0,0 @@
-# empty
Index: stepmake/stepmake/elisp-vars.make
diff --git a/stepmake/stepmake/elisp-vars.make
b/stepmake/stepmake/elisp-vars.make
deleted file mode 100644
index
5461eaaa3a8a2b7f6b467efe02511072b6c3aa28..0000000000000000000000000000000000000000
--- a/stepmake/stepmake/elisp-vars.make
+++ /dev/null
@@ -1,3 +0,0 @@
-
-EL_FILES := $(call src-wildcard,*.el)
-SOURCE_FILES += $(EL_FILES)
Index: elisp/GNUmakefile
diff --git a/elisp/GNUmakefile b/elisp/GNUmakefile
index
4ad7f87a5d7de92238a800883cb9aa38a645f335..0e5737e10c79754359f988827b3af4d5904cab59
100644
--- a/elisp/GNUmakefile
+++ b/elisp/GNUmakefile
@@ -8,10 +8,14 @@ INSTALLATION_FILES=$(EL_FILES)
INSTALLATION_OUT_DIR=$(elispdir)
INSTALLATION_OUT_FILES=$(outdir)/lilypond-words.el
-STEPMAKE_TEMPLATES=elisp install install-out
+
+STEPMAKE_TEMPLATES= install install-out
include $(depth)/make/stepmake.make
+EL_FILES := $(call src-wildcard,*.el)
+SOURCE_FILES += $(EL_FILES)
+
LILYPOND_WORDS = $(outdir)/lilypond-words.el
LILYPOND_WORDS_DEPENDS =\
$(top-src-dir)/lily/lily-lexer.cc \
