various updates

[~bandali/bndl.org] / Makefile

diff --git a/Makefile b/Makefile
index a7071a1..38db53a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,6 @@
-SRC := $(filter-out $(wildcard meta_*), \
-$(wildcard *.m4 fsf-internship/*.m4))
+SRC := $(filter-out $(wildcard meta_*), $(wildcard *.m4 fsf-internship/*.m4))

 OUTPUTS := $(patsubst %.m4,out/%.html, $(SRC))
 OUTPUTS := $(patsubst %.m4,out/%.html, $(SRC))

-STATIC := $(patsubst static/%,out/%, \
-$(filter-out static/publications.html, \
-$(wildcard static/* static/.*)))
+STATIC := $(patsubst static/%,out/%, $(wildcard static/* static/.*))

 
 all: $(OUTPUTS) out/notes.atom out/notes.rss out/style.css $(STATIC)
 
 
 all: $(OUTPUTS) out/notes.atom out/notes.rss out/style.css $(STATIC)
 


@@ -15,11 +12,12 @@ out/notes.rss: meta_feed_rss.m4 ; m4 $< > $@
 $(STATIC): ; ln -s $(PWD)/static/$(@F) $@
 
 # publications bibliography
 $(STATIC): ; ln -s $(PWD)/static/$(@F) $@
 
 # publications bibliography

-static/publications.html: static/bandali.bib static/bandali-bib-*.txt
-static/publications.html: static/publications-sed.txt
-static/publications.html:
+static/publications-partial.html: static/bandali.bib static/bandali-bib-*
+static/publications-partial.html: $(filter-out static/publications-partial.html, $(wildcard static/publications-*))
+static/publications-partial.html:

        $(MAKE) -C $(@D) $(@F)
        $(MAKE) -C $(@D) $(@F)

-out/publications.html: static/publications.html
+out/publications.html: static/publications-partial.html
+out/bandali-bib.html: static/bandali-bib-partial.html

 
 clean:
        rm -rf out/
 
 clean:
        rm -rf out/


@@ -31,8 +29,7 @@ deploy:
 watch:
        while true; do \
        echo $(SRC) header.html footer.html \
 watch:
        while true; do \
        echo $(SRC) header.html footer.html \

-       static/bandali.bib static/bandali-bib-*.txt \
-       static/publications-sed.txt \
+       static/bandali.bib static/bandali-bib-* static/publications-* \

        Makefile static/Makefile | \
        tr " " "\n" | entr -d make; done
 
        Makefile static/Makefile | \
        tr " " "\n" | entr -d make; done