diff options
| author | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2008-02-09 03:20:42 +0000 |
|---|---|---|
| committer | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2008-02-09 03:20:42 +0000 |
| commit | 446a964a190edf094871cd4bb4b045e469446223 (patch) | |
| tree | 106c01a40bfe59056306e4a0d7fcbd1912f6ce07 /Makefile | |
| parent | c150e84d3c74555d7024c9b0c23a76ef13e73335 (diff) | |
| download | pandoc-446a964a190edf094871cd4bb4b045e469446223.tar.gz | |
Incorporated templates phase into Setup.hs and improved templates.
+ Removed templates/Makefile and fillTemplates.pl.
+ Removed 'templates' Makefile target.
+ Added postConf hook to Setup.hs that fills the templates.
+ Use compressed javascripts for S5 and ASCIIMathML templates.
+ Revised test suite.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1216 788f1e2b-df1e-0410-8736-df70ead52e1b
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 1 insertions, 7 deletions
@@ -92,10 +92,6 @@ all: build-program %.1: %.1.md $(MAIN) ./$(MAIN) -s -S -w man $< >$@ || rm -f $@ -.PHONY: templates -templates: - $(MAKE) -C $(SRCDIR)/templates - define generate-shell-script echo >&2 "Generating $@..."; \ awk ' \ @@ -126,7 +122,7 @@ $(CABAL_BACKUP): .PHONY: configure cleanup_files+=Setup.hi Setup.o $(BUILDCMD) $(BUILDVARS) -configure: $(BUILDCONF) templates +configure: $(BUILDCONF) $(BUILDCMD): Setup.hs $(GHC) -package Cabal Setup.hs -o $(BUILDCMD) $(BUILDCONF): $(CABAL) $(CABAL_BACKUP) $(BUILDCMD) @@ -292,7 +288,6 @@ cleanup_files+=$(tarball) tarball: $(tarball) $(tarball): svn export . $(PKGID) - $(MAKE) -C $(PKGID) templates $(MAKE) -C $(PKGID) wrappers tar cvzf $(tarball) $(PKGID) -rm -rf $(PKGID) @@ -352,6 +347,5 @@ distclean: clean fi clean: - make -C $(SRCDIR)/templates clean -if [ -f $(BUILDCONF) ]; then $(BUILDCMD) clean; fi -rm -rf $(cleanup_files) |