diff options
| author | Gustav Eek <gustav@fripost.org> | 2015-03-02 20:28:05 +0100 |
|---|---|---|
| committer | Gustav Eek <gustav@fripost.org> | 2015-03-02 20:28:05 +0100 |
| commit | 8c9f57713b34a6a1e9e8a2c67aa17c43e644ad2e (patch) | |
| tree | 44a638f050c69b61b5c5d536664a72e4bc5e64a6 /2014/Makefile | |
| parent | fe12842374a257c03c7210ae9fddfdafe5cb79d7 (diff) | |
| parent | 4b3b4a69975aa2c8fb50173b76b0c7797e4ca5fb (diff) | |
Merge branch 'may-19', containing minutes from May 19 and June 16
Conflict for '2014/Makefile' was solved
Diffstat (limited to '2014/Makefile')
| -rw-r--r-- | 2014/Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/2014/Makefile b/2014/Makefile index 675f15d..7dec96e 100644 --- a/2014/Makefile +++ b/2014/Makefile @@ -1,8 +1,12 @@ # Makefile for minutes of 2014 -MINUTES = 2014-02-11-board \ +MINUTES = \ +2014-02-11-board \ 2014-02-24-board \ -2014-03-29-annual +2014-03-29-annual \ +2014-05-19-board \ +2014-05-19-board-excerpt \ +2014-06-16-board common-makefile = ../resources/Makefile-common @@ -11,8 +15,8 @@ help: all: $(MINUTES) -%: - make -f $(common-makefile) compile FILE=$* +$(MINUTES): + make -f $(common-makefile) compile FILE=$@ send: make -f $(common-makefile) send SEND_FILES="$(MINUTES)" clean: |