branch: externals/hyperbole
commit adc9306f9a23345db3b28b4012e80b4bf4da73c1
Merge: 72b89f8ea0 796b38eecc
Author: Bob Weiner <r...@gnu.org>
Commit: Bob Weiner <r...@gnu.org>
Merge branch 'master' of hyperbole
---
ChangeLog | 5 +++++
Makefile | 19 ++++---------------
2 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d6f137a909..44dfe4e2a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,11 @@
* hui.el (hui:actype): Limit action type completions to Hyperbole actypes and
interactive commands. Resolve Emacs bug#60469.
+2022-12-18 Mats Lidell <ma...@gnu.org>
+
+* Makefile (ELC_COMPILE, ELC_KOTL): Use function to derive elc files.
+
+
2022-12-11 Bob Weiner <r...@gnu.org>
* hyperbole.el (hkey-initialize): Fix Emacs bug#59903: handle when C-h is
diff --git a/Makefile b/Makefile
index 9f55bac912..f5f7d04b91 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
# Author: Bob Weiner
#
# Orig-Date: 15-Jun-94 at 03:42:38
-# Last-Mod: 7-Jan-23 at 20:37:56 by Bob Weiner
+# Last-Mod: 7-Jan-23 at 20:45:26 by Bob Weiner
#
# Copyright (C) 1994-2022 Free Software Foundation, Inc.
# See the file HY-COPY for license information.
@@ -191,20 +191,9 @@ EL_KOTL = kotl/kexport.el kotl/kfile.el kotl/kfill.el
kotl/kimport.el kotl/klabe
kotl/klink.el kotl/kmenu.el kotl/kotl-mode.el kotl/kotl-orgtbl.el \
kotl/kcell.el kotl/kproperty.el kotl/kview.el kotl/kvspec.el
-ELC_COMPILE = hactypes.elc hibtypes.elc hib-debbugs.elc hib-doc-id.elc
hib-kbd.elc \
- hib-social.elc hact.elc \
- hargs.elc hbdata.elc hbmap.elc hbut.elc hgnus.elc hhist.elc \
- hinit.elc hload-path.elc hmail.elc hmh.elc hmoccur.elc
hmouse-info.elc \
- hmouse-drv.elc hmouse-key.elc hmouse-mod.elc hmouse-sh.elc
hmouse-tag.elc \
- hpath.elc hrmail.elc hsettings.elc hsmail.elc hsys-org.elc
hsys-www.elc hsys-youtube.elc htz.elc \
- hycontrol.elc hui-jmenu.elc hui-menu.elc hui-mini.elc
hui-mouse.elc hui-select.elc \
- hui-treemacs.elc hui-window.elc hui.elc hvar.elc hversion.elc
hvm.elc hypb.elc hyperbole.elc \
- hyrolo-demo.elc hyrolo-logic.elc hyrolo-menu.elc hyrolo.elc
hywconfig.elc \
- set.elc hypb-ert.elc hui-dired-sidebar.elc hypb-maintenance.elc
hui-register.elc
-
-ELC_KOTL = kotl/kexport.elc kotl/kfile.elc kotl/kfill.elc kotl/kimport.elc
kotl/klabel.elc \
- kotl/klink.elc kotl/kmenu.elc kotl/kotl-mode.elc
kotl/kotl-orgtbl.elc \
- kotl/kcell.elc kotl/kproperty.elc kotl/kview.elc kotl/kvspec.elc
+ELC_COMPILE = $(EL_COMPILE:.el=.elc)
+
+ELC_KOTL = $(EL_KOTL:.el=.elc)
HY-TALK = HY-TALK/.hypb HY-TALK/HYPB HY-TALK/HY-TALK.org
