git.iko.soy/typeable/pandoc
on master help sign in
Add pandoc executable to process rules as a dependency. Make osx_dest,
0bd395croktas
Makefile+12−12
compare with master
unifiedsplit
@@ -55,21 +55,21 @@ GHC_PKG := ghc-pkg
55.PHONY: all
55.PHONY: all
56all: $(BINS)
56all: $(BINS)
57
57
58+# Document process rules.
59+%.html: % $(THIS)
60+ ./$(THIS) -s $< >$@ || rm -f $@
61+%.tex: % $(THIS)
62+ ./$(THIS) -s -w latex $< >$@ || rm -f $@
63+%.rtf: % $(THIS)
64+ ./$(THIS) -s -w rtf $< >$@ || rm -f $@
65+%.pdf: % $(THIS)
66+ sh ./markdown2pdf $< || rm -f $@
67+
58.PHONY: templates
68.PHONY: templates
59templates: $(SRCDIR)/templates
69templates: $(SRCDIR)/templates
60$(SRCDIR)/templates:
70$(SRCDIR)/templates:
61 $(MAKE) -C $(SRCDIR)/templates
71 $(MAKE) -C $(SRCDIR)/templates
62
72
63−# Document process rules.
64−%.html: %
65− ./$(THIS) -s $^ >$@ || rm -f $@
66−%.tex: %
67− $(THIS) -s -w latex $^ >$@ || rm -f $@
68−%.rtf: %
69− $(THIS) -s -w rtf $^ >$@ || rm -f $@
70−%.pdf: %
71− sh ./markdown2pdf $^ || rm -f $@
72−
73cleanup_files+=$(CABAL)
73cleanup_files+=$(CABAL)
74$(CABAL): cabalize $(CABAL).in
74$(CABAL): cabalize $(CABAL).in
75 ./cabalize <$(CABAL).in >$(CABAL)
75 ./cabalize <$(CABAL).in >$(CABAL)
@@ -168,7 +168,8 @@ uninstall: uninstall-program
168osx_dest:=osx-pkg
168osx_dest:=osx-pkg
169doc_more:=README.rtf LICENSE.rtf
169doc_more:=README.rtf LICENSE.rtf
170cleanup_files+=$(osx_dest) $(doc_more)
170cleanup_files+=$(osx_dest) $(doc_more)
171+osx-pkg: $(osx_dest)
171−osx-pkg: $(doc_more)
172+$(osx_dest): $(doc_more)
172 -rm -rf $(osx_dest)
173 -rm -rf $(osx_dest)
173 $(INSTALL) -d $(osx_dest)
174 $(INSTALL) -d $(osx_dest)
174 DESTDIR=$(osx_dest) $(MAKE) install-program
175 DESTDIR=$(osx_dest) $(MAKE) install-program
@@ -219,4 +220,3 @@ distclean: clean
219clean:
220clean:
220 -if [ -f $(BUILDCONF) ]; then $(BUILDCMD) clean; fi
221 -if [ -f $(BUILDCONF) ]; then $(BUILDCMD) clean; fi
221 -rm -rf $(cleanup_files)
222 -rm -rf $(cleanup_files)
222−