From 446a964a190edf094871cd4bb4b045e469446223 Mon Sep 17 00:00:00 2001 From: fiddlosopher Date: Sat, 9 Feb 2008 03:20:42 +0000 Subject: 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 --- Makefile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index dc8e62c19..6b50546c2 100644 --- a/Makefile +++ b/Makefile @@ -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) -- cgit v1.2.3