Use template haskell to avoid the need for templates:

+ Added library Text.Pandoc.Include, with a template haskell
  function $(includeStrFrom fname) to include a file as a string
  constant at compile time.
+ This removes the need for the 'templates' directory or Makefile
  target.  These have been removed.
+ The base source directory has been changed from src to .
+ A new 'data' directory has been added, containing the ASCIIMathML.js
  script, writer headers, and S5 files.
+ The src/wrappers directory has been moved to 'wrappers'.
+ The Text.Pandoc.ASCIIMathML library is no longer needed, since
  Text.Pandoc.Writers.HTML can use includeStrFrom to include the
  ASCIIMathML.js code directly.  It has been removed.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1063 788f1e2b-df1e-0410-8736-df70ead52e1b

1 files changed, 2 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index e3129aa39..9ff3f3036 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # Constant names and commands in source tree
 #-------------------------------------------------------------------------------
 CABAL     := pandoc.cabal
-SRCDIR    := src
+SRCDIR    := .
 MANDIR    := man
 TESTDIR   := tests
 BUILDDIR  := dist
@@ -91,10 +91,6 @@ all: build-program
 %.1: %.1.md $(MAIN)
 	./$(MAIN) -s -S -w man $< >$@ || rm -f $@
 
-.PHONY: templates
-templates: $(SRCDIR)/templates
-	$(MAKE) -C $(SRCDIR)/templates
-
 define generate-shell-script
 echo >&2 "Generating $@...";                             \
 awk '                                                    \
@@ -118,7 +114,7 @@ $(WRAPPERS): %: $(SRCDIR)/wrappers/%.in $(SRCDIR)/wrappers/*.sh
 
 .PHONY: configure
 cleanup_files+=Setup.hi Setup.o $(BUILDCMD) $(BUILDVARS)
-configure: $(BUILDCONF) templates
+configure: $(BUILDCONF) 
 $(BUILDCONF): $(CABAL)
 	ghc -package Cabal Setup.hs -o $(BUILDCMD)
 	$(BUILDCMD) configure --prefix=$(PREFIX)
@@ -283,7 +279,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)
@@ -343,6 +338,5 @@ distclean: clean
 	fi
 
 clean:
-	make -C $(SRCDIR)/templates clean
 	-if [ -f $(BUILDCONF) ]; then $(BUILDCMD) clean; fi
 	-rm -rf $(cleanup_files)