aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorroktas <roktas@788f1e2b-df1e-0410-8736-df70ead52e1b>2006-10-30 08:04:30 +0000
committerroktas <roktas@788f1e2b-df1e-0410-8736-df70ead52e1b>2006-10-30 08:04:30 +0000
commit0bd395c5c86f19c1b0f657d0dc4b6663e7b0a280 (patch)
tree9ae16ad6fcdeed7e918d6790c599fa536309b8e9 /Makefile
parentf081f5ee268ad3c5b7251ea9ae06baf6bbe3ee8d (diff)
downloadpandoc-0bd395c5c86f19c1b0f657d0dc4b6663e7b0a280.tar.gz
Add pandoc executable to process rules as a dependency. Make osx_dest,
osx-pkg distinction more clear. git-svn-id: https://pandoc.googlecode.com/svn/trunk@42 788f1e2b-df1e-0410-8736-df70ead52e1b
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile24
1 files changed, 12 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 3fc83a059..a3b576f9d 100644
--- a/Makefile
+++ b/Makefile
@@ -55,21 +55,21 @@ GHC_PKG := ghc-pkg
.PHONY: all
all: $(BINS)
+# Document process rules.
+%.html: % $(THIS)
+ ./$(THIS) -s $< >$@ || rm -f $@
+%.tex: % $(THIS)
+ ./$(THIS) -s -w latex $< >$@ || rm -f $@
+%.rtf: % $(THIS)
+ ./$(THIS) -s -w rtf $< >$@ || rm -f $@
+%.pdf: % $(THIS)
+ sh ./markdown2pdf $< || rm -f $@
+
.PHONY: templates
templates: $(SRCDIR)/templates
$(SRCDIR)/templates:
$(MAKE) -C $(SRCDIR)/templates
-# Document process rules.
-%.html: %
- ./$(THIS) -s $^ >$@ || rm -f $@
-%.tex: %
- $(THIS) -s -w latex $^ >$@ || rm -f $@
-%.rtf: %
- $(THIS) -s -w rtf $^ >$@ || rm -f $@
-%.pdf: %
- sh ./markdown2pdf $^ || rm -f $@
-
cleanup_files+=$(CABAL)
$(CABAL): cabalize $(CABAL).in
./cabalize <$(CABAL).in >$(CABAL)
@@ -168,7 +168,8 @@ uninstall: uninstall-program
osx_dest:=osx-pkg
doc_more:=README.rtf LICENSE.rtf
cleanup_files+=$(osx_dest) $(doc_more)
-osx-pkg: $(doc_more)
+osx-pkg: $(osx_dest)
+$(osx_dest): $(doc_more)
-rm -rf $(osx_dest)
$(INSTALL) -d $(osx_dest)
DESTDIR=$(osx_dest) $(MAKE) install-program
@@ -219,4 +220,3 @@ distclean: clean
clean:
-if [ -f $(BUILDCONF) ]; then $(BUILDCMD) clean; fi
-rm -rf $(cleanup_files)
-