Skip to content

Use pattern substitution to derive the elc files #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matsl merged 1 commit into from
Dec 18, 2022
Merged

Use pattern substitution to derive the elc files #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2022-12-18 Mats Lidell <matsl@gnu.org>

* Makefile (ELC_COMPILE, ELC_KOTL): Use function to derive elc files.

2022-12-03 Bob Weiner <rsw@gnu.org>

* hpath.el (hpath:expand-with-variable): Fix to expand from local dir first
Expand Down
19 changes: 4 additions & 15 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Author: Bob Weiner
#
# Orig-Date: 15-Jun-94 at 03:42:38
# Last-Mod: 11-Oct-22 at 22:22:16 by Mats Lidell
# Last-Mod: 18-Dec-22 at 00:29:07 by Mats Lidell
#
# Copyright (C) 1994-2022 Free Software Foundation, Inc.
# See the file HY-COPY for license information.
Expand Down Expand Up @@ -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)
Copy link
Copy Markdown
Owner

@rswgnu rswgnu Dec 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are missing the kotl/ prefix here.

Copy link
Copy Markdown
Collaborator Author

@matsl matsl Dec 18, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I don't think so. This should be a pattern substitution, so for all words in the string ET_KOTL a matching end is replaced.
See https://github.com/rswgnu/hyperbole/actions/runs/3722317980/jobs/6313030557#step:4:29
and https://www.gnu.org/software/make/manual/html_node/Substitution-Refs.html


HY-TALK = HY-TALK/.hypb HY-TALK/HYPB HY-TALK/HY-TALK.org

Expand Down