mirror/emacs.g
1
0
Fork 0
mirror of https://github.com/emacscollective/emacs.g.git synced 2025-11-23 11:41:18 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into cosmetics

Browse Source
This commit is contained in:
Jonas Bernoulli
2017-04-19 00:45:05 +02:00
parent 7affb401a1 3c540ed05e
commit be2ee8e361
7 changed files with 10 additions and 14 deletions
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> # Author: Jonas Bernoulli <jonas@bernoul.li>
# License: GPL v3 <https://www.gnu.org/licenses/gpl-3.0.txt> # License: GPL v3 <https://www.gnu.org/licenses/gpl-3.0.txt>
@@ -6,10 +6,6 @@
.PHONY: all help build build-init quick bootstrap .PHONY: all help build build-init quick bootstrap
.FORCE: .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 all: build
help: help:
@@ -25,7 +21,7 @@ build:
@rm -f init.elc @rm -f init.elc
@emacs -Q --batch -L lib/borg --load borg \ @emacs -Q --batch -L lib/borg --load borg \
--funcall borg-initialize \ --funcall borg-initialize \
--funcall borg-batch-rebuild $(SUPPRESS_WARNINGS) --funcall borg-batch-rebuild 2>&1
build-init: build-init:
@rm -f init.elc @rm -f init.elc
@@ -37,12 +33,12 @@ quick:
@rm -f init.elc @rm -f init.elc
@emacs -Q --batch -L lib/borg --load borg \ @emacs -Q --batch -L lib/borg --load borg \
--funcall borg-initialize \ --funcall borg-initialize \
--eval '(borg-batch-rebuild t)' $(SUPPRESS_WARNINGS) --eval '(borg-batch-rebuild t)' 2>&1
lib/%: .FORCE lib/%: .FORCE
@emacs -Q --batch -L lib/borg --load borg \ @emacs -Q --batch -L lib/borg --load borg \
--funcall borg-initialize \ --funcall borg-initialize \
--eval '(borg-build "$(@F)")' $(SUPPRESS_WARNINGS) --eval '(borg-build "$(@F)")' 2>&1
bootstrap: bootstrap:
@printf "\n=== Running 'git submodule init' ===\n\n" @printf "\n=== Running 'git submodule init' ===\n\n"

2
lib/borg

Submodule lib/borg updated: 8d65370094...3780c8810c

2
lib/emacsql

Submodule lib/emacsql updated: 327b09b4b9...1b37570bf5

2
lib/finalize

Submodule lib/finalize updated: 9ac589cf48...deb9e8f4be

2
lib/magit

Submodule lib/magit updated: ff4c52b31c...1e54f3ee49

2
lib/use-package

Submodule lib/use-package updated: a354568ec2...0139f85595

2
lib/with-editor

Submodule lib/with-editor updated: 8ae3c7aed9...eb0083125e