diff options
| author | roktas <roktas@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2006-11-07 10:37:18 +0000 |
|---|---|---|
| committer | roktas <roktas@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2006-11-07 10:37:18 +0000 |
| commit | 2b40ef5d03ad67cf637769a3fb6fdb1b74350c3f (patch) | |
| tree | a973927e588124209273f829ca990c6cf396f0ff | |
| parent | 9159ebd3c124bd1d5f6cea5a26bbada577ca8d41 (diff) | |
| download | pandoc-2b40ef5d03ad67cf637769a3fb6fdb1b74350c3f.tar.gz | |
Fixes from last review:
+ Add markdown2pdf to %.pdf dependencies.
+ Make build-all target explicitly depend on build-program, instead of
'all' which might be changed in future.
+ Add build-program to osx-pkg-prep for the sake of explicitness.
+ Generate INSTALL.html in build-doc.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@77 788f1e2b-df1e-0410-8736-df70ead52e1b
| -rw-r--r-- | Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -80,7 +80,7 @@ all: build-program ./$(MAIN) -s -w latex $< >$@ || rm -f $@ %.rtf: % $(MAIN) ./$(MAIN) -s -w rtf $< >$@ || rm -f $@ -%.pdf: % $(MAIN) +%.pdf: % $(MAIN) markdown2pdf sh ./markdown2pdf $< || rm -f $@ .PHONY: templates @@ -115,8 +115,8 @@ $(EXECS): $(BUILDDIR) done .PHONY: build-doc -cleanup_files+=README.html -build-doc: $(DOCS) +cleanup_files+=README.html INSTALL.html +build-doc: $(DOCS) INSTALL.html .PHONY: build-program build-program: build-exec build-doc @@ -130,7 +130,7 @@ html/: configure $(BUILDCMD) haddock && mv $(BUILDDIR)/doc/html . .PHONY: build-all -build-all: all build-lib-doc +build-all: build-program build-lib-doc # User documents installation. .PHONY: install-doc uninstall-doc @@ -201,7 +201,7 @@ osx_src:=osx doc_more:=README.rtf LICENSE.rtf $(osx_src)/Welcome.rtf osx_pkg_name:=Pandoc_$(VERSION).pkg cleanup_files+=$(osx_dest) $(doc_more) $(osx_pkg_name) -osx-pkg-prep: $(osx_dest) +osx-pkg-prep: build-program $(osx_dest) $(osx_dest)/: $(doc_more) -rm -rf $(osx_dest) $(INSTALL) -d $(osx_dest) |