mirror/emacs.g
1
0
Fork 0
mirror of https://github.com/emacscollective/emacs.g.git synced 2025-06-07 08:14:16 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into magit-directors-cut

Browse Source
This commit is contained in:
Jonas Bernoulli 2017-04-19 00:43:41 +02:00
commit a59d51cd92
7 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -1,4 +1,4 @@
# Copyright (C) 2016 Jonas Bernoulli
# Copyright (C) 2016-2017 Jonas Bernoulli
#
# Author: Jonas Bernoulli <jonas@bernoul.li>
# License: GPL v3 <https://www.gnu.org/licenses/gpl-3.0.txt>
@ -6,10 +6,6 @@
.PHONY: all help build build-init quick bootstrap
.FORCE:
SUPPRESS_WARNINGS = 2>&1 | grep -v
SUPPRESS_WARNINGS += -e "‘defgeneric’ is an obsolete macro"
SUPPRESS_WARNINGS += -e "‘defmethod’ is an obsolete macro"
all: build
help:
@ -25,7 +21,7 @@ build:
@rm -f init.elc
@emacs -Q --batch -L lib/borg --load borg \
--funcall borg-initialize \
--funcall borg-batch-rebuild $(SUPPRESS_WARNINGS)
--funcall borg-batch-rebuild 2>&1
build-init:
@rm -f init.elc
@ -37,12 +33,12 @@ quick:
@rm -f init.elc
@emacs -Q --batch -L lib/borg --load borg \
--funcall borg-initialize \
--eval '(borg-batch-rebuild t)' $(SUPPRESS_WARNINGS)
--eval '(borg-batch-rebuild t)' 2>&1
lib/%: .FORCE
@emacs -Q --batch -L lib/borg --load borg \
--funcall borg-initialize \
--eval '(borg-build "$(@F)")' $(SUPPRESS_WARNINGS)
--eval '(borg-build "$(@F)")' 2>&1
bootstrap:
@printf "\n=== Running 'git submodule init' ===\n\n"

2
lib/borg

@ -1 +1 @@
Subproject commit 8d65370094fc439fed3a52d81ca24afd76ff5a55
Subproject commit 3780c8810cda069f88af7f771af03ae47253c923

2
lib/emacsql

@ -1 +1 @@
Subproject commit 327b09b4b99ccb6b5605b804027a42fd73589929
Subproject commit 1b37570bf5813e160fa18a766e20dfa690910519

2
lib/finalize

@ -1 +1 @@
Subproject commit 9ac589cf487f5d37163dc9e7ca8c52800710805e
Subproject commit deb9e8f4be1ed65a3933e117ef2210148cede75d

2
lib/magit

@ -1 +1 @@
Subproject commit ff4c52b31c814f0cc89f33d25fb9813bac21598e
Subproject commit 1e54f3ee49f762d9f83043be4bb7d41736c336ae

2
lib/use-package

@ -1 +1 @@
Subproject commit a354568ec2af8444b741f595a3a7183e3f67ad58
Subproject commit 0139f85595a10b9e50e38f3d8d59f70cf4f3a2a2

2
lib/with-editor

@ -1 +1 @@
Subproject commit 8ae3c7aed92842f5988671c1b3350c65c58857e0
Subproject commit eb0083125eb69033d53374742fd4af7a850a97fb