procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/Makefile.in (MH_E_SRC, TRAMP_SRC, CAL_SRC):

Browse source 
Replace hard-coded lists with wildcard + filter-out.
This commit is contained in:
Glenn Morris 2015-06-30 15:23:07 -04:00
parent 9ae0d76c3b
commit 290acafd7e
1 changed files with 7 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
lisp/Makefile.in
View file

@ -368,20 +368,8 @@ compile-one-process: $(LOADDEFS) compile-first
# Update MH-E internal autoloads. These are not to be confused with
# the autoloads for the MH-E entry points, which are already in loaddefs.el.
MH_E_DIR = $(lisp)/mh-e
## MH_E_SRC avoids a circular dependency warning for mh-loaddefs.el.
MH_E_SRC = $(MH_E_DIR)/mh-acros.el $(MH_E_DIR)/mh-alias.el \
$(MH_E_DIR)/mh-buffers.el $(MH_E_DIR)/mh-compat.el \
$(MH_E_DIR)/mh-comp.el $(MH_E_DIR)/mh-e.el \
$(MH_E_DIR)/mh-folder.el $(MH_E_DIR)/mh-funcs.el \
$(MH_E_DIR)/mh-gnus.el $(MH_E_DIR)/mh-identity.el \
$(MH_E_DIR)/mh-inc.el $(MH_E_DIR)/mh-junk.el \
$(MH_E_DIR)/mh-letter.el $(MH_E_DIR)/mh-limit.el \
$(MH_E_DIR)/mh-mime.el $(MH_E_DIR)/mh-print.el \
$(MH_E_DIR)/mh-scan.el $(MH_E_DIR)/mh-search.el \
$(MH_E_DIR)/mh-seq.el $(MH_E_DIR)/mh-show.el \
$(MH_E_DIR)/mh-speed.el $(MH_E_DIR)/mh-thread.el \
$(MH_E_DIR)/mh-tool-bar.el $(MH_E_DIR)/mh-utils.el \
$(MH_E_DIR)/mh-xface.el
MH_E_SRC = $(sort $(wildcard ${MH_E_DIR}/mh*.el))
MH_E_SRC := $(filter-out ${MH_E_DIR}/mh-loaddefs.el,${MH_E_SRC})
.PHONY: mh-autoloads
mh-autoloads: $(MH_E_DIR)/mh-loaddefs.el
@ -395,12 +383,8 @@ $(MH_E_DIR)/mh-loaddefs.el: $(MH_E_SRC)
# an own subdirectory. OTOH, it does not hurt to keep them in
# lisp/net.
TRAMP_DIR = $(lisp)/net
TRAMP_SRC = $(TRAMP_DIR)/tramp.el $(TRAMP_DIR)/tramp-adb.el \
$(TRAMP_DIR)/tramp-cache.el $(TRAMP_DIR)/tramp-cmds.el \
$(TRAMP_DIR)/tramp-compat.el $(TRAMP_DIR)/tramp-ftp.el \
$(TRAMP_DIR)/tramp-gvfs.el $(TRAMP_DIR)/tramp-gw.el \
$(TRAMP_DIR)/tramp-sh.el $(TRAMP_DIR)/tramp-smb.el \
$(TRAMP_DIR)/tramp-uu.el $(TRAMP_DIR)/trampver.el
TRAMP_SRC = $(sort $(wildcard ${TRAMP_DIR}/tramp*.el))
TRAMP_SRC := $(filter-out ${TRAMP_DIR}/tramp-loaddefs.el,${TRAMP_SRC})
$(TRAMP_DIR)/tramp-loaddefs.el: $(TRAMP_SRC)
$(AM_V_GEN)$(emacs) -l autoload \
@ -410,18 +394,9 @@ $(TRAMP_DIR)/tramp-loaddefs.el: $(TRAMP_SRC)
CAL_DIR = $(lisp)/calendar
## Those files that may contain internal calendar autoload cookies.
## Avoids circular dependency warning for *-loaddefs.el.
CAL_SRC = $(CAL_DIR)/cal-bahai.el $(CAL_DIR)/cal-china.el \
$(CAL_DIR)/cal-coptic.el $(CAL_DIR)/cal-dst.el \
$(CAL_DIR)/cal-french.el $(CAL_DIR)/cal-hebrew.el \
$(CAL_DIR)/cal-html.el $(CAL_DIR)/cal-islam.el \
$(CAL_DIR)/cal-iso.el $(CAL_DIR)/cal-julian.el \
$(CAL_DIR)/cal-mayan.el $(CAL_DIR)/cal-menu.el \
$(CAL_DIR)/cal-move.el $(CAL_DIR)/cal-persia.el \
$(CAL_DIR)/cal-tex.el $(CAL_DIR)/cal-x.el \
$(CAL_DIR)/calendar.el $(CAL_DIR)/diary-lib.el \
$(CAL_DIR)/holidays.el $(CAL_DIR)/lunar.el \
$(CAL_DIR)/solar.el
CAL_SRC = $(addprefix ${CAL_DIR}/,diary-lib.el holidays.el lunar.el solar.el)
CAL_SRC := $(sort ${CAL_SRC} $(wildcard ${CAL_DIR}/cal*.el))
CAL_SRC := $(filter-out ${CAL_DIR}/cal-loaddefs.el,${CAL_SRC})
$(CAL_DIR)/cal-loaddefs.el: $(CAL_SRC)
$(AM_V_GEN)$(emacs) -l autoload \