aboutsummaryrefslogtreecommitdiff
path: root/Makefile
AgeCommit message (Collapse)AuthorFilesLines
2008-08-09Moved more of the build process from Makefile to Setup.hs:fiddlosopher1-12/+2
+ tarball target now calls 'sdist' + Added to "Extra-source-files" and "Extra-tmp-files" in pandoc.cabal, so 'sdist' and 'clean' will work properly. + Makefile no longer generates man pages or reference.odt. + Setup.hs now generates man pages in a postbuild hook. + Added dependency-checking to Setup.hs, so it only rebuilds things that need rebuilding. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1389 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-09Removed layout-cache and Configurations2 from odt-styles directory.fiddlosopher1-2/+2
They don't seem to be needed. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1388 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-09Include shell scripts themselves in repo, rather than generating from wrappers.fiddlosopher1-21/+0
+ Removed wrappers directory + Removed wrappers Makefile target + Added hsmarkdown, html2markdown, and markdown2pdf git-svn-id: https://pandoc.googlecode.com/svn/trunk@1387 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-09Rewrote test suite so it doesn't depend on perl or unix tools.fiddlosopher1-1/+1
+ Replaced old runtests.pl with a Haskell script RunTests.hs. + Added Diff.hs module to be used by RunTests.hs instead of unix 'diff'. + Added test hook to Setup.hs, so tests may be run from cabal. + Changed Makefile's 'test' target to run tests via cabal. + Removed old generate.sh. + Since we no longer have 'sed' to filter out raw HTML sections from the docbook writer test, or raw LaTeX sections from the context writer test, we now just include these sections. They can be taken out if it is necessary to process the files. + Updated latex and context writer tests to remove extra spaces after '\\item' + Added a markdown table reader test. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1385 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-08Added Text.Pandoc.UTF8 as a backup for when utf8-string is not present.fiddlosopher1-7/+0
+ Added Text.Pandoc.UTF8 + Changed flag name from utf8 to utf8-string + Changed CPP MACRO from _UTF8 to _UTF8STRING + Import IO functions from Text.Pandoc.UTF8 when utf8-string not available. + Removed utf8-string dependency from debian/control. + Removed pandoc.cabal.ghc66; we no longer support GHC 6.6 + Modified INSTALL instructions git-svn-id: https://pandoc.googlecode.com/svn/trunk@1383 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01Simplified build process using template haskell.fiddlosopher1-10/+2
+ Text/Pandoc/ASCIIMathML.hs, Text/Pandoc/DefaultHeaders.hs, and Text/Pandoc/Writers/S5.hs are no longer built in Setup.hs from templates in the templates/ directory. + Instead, they use template haskell to read data at compile time from the relevant files in data/. + Setup.hs is back to the default simple configuration. + Removed old templates and Extra-Tmp-Files field from pandoc.cabal. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1357 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01Makefile: build reference.odt before configure.fiddlosopher1-3/+3
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1354 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-31Added 'odt' output option to pandoc:fiddlosopher1-6/+1
Not a writer, but a module that inserts the output of the OpenDocument writer into an ODT archive. This replaces markdown2odt. + Added odt output option to Main.hs. + Added default for .odt output file. + Changed defaults so that .xml and .sgml aren't automatically DocBook. + Added odt writer to Text.Pandoc exports. + Added Text.Pandoc.ODT and included in pandoc.cabal. + Added reference.odt as data-file in pandoc.cabal. + Handle picture links in OpenDocument files using xml library. + Removed markdown2odt and references from Makefile, README, man. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1345 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-23Fixed REFERENCEODT in markdown2odt to point to the right place in debian builds.fiddlosopher1-1/+1
Resolves Issue #79. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1332 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-03-19Added preliminary version of markdown2odt wrapper.fiddlosopher1-5/+26
Added man page. Modified Makefile to create markdown2odt from template. Modified Makefile to create reference.odt file from files in odt-styles. Modified Makefile to install reference.odt into PACKAGEDATAPATH. Modified macports Portfile. Modified freebsd Makefile. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1259 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-10Makefile: Add files in templates directory as dependencies for $(BUILDCONF).fiddlosopher1-1/+2
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1234 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-09CABALOPTS may now be specified with 'make'.fiddlosopher1-1/+1
For example: CABALOPTS=-fhighlighting make git-svn-id: https://pandoc.googlecode.com/svn/trunk@1222 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-09Makefile: only use --with-hc-pkg if GHC_PKG is defined.fiddlosopher1-2/+6
Note that Cabal will automatically choose the ghc-pkg appropriate for the compiler selected, so normally specifying GHC by itself is sufficient. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1217 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-09Incorporated templates phase into Setup.hs and improved templates.fiddlosopher1-7/+1
+ 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
2008-01-23Changed names of HTML man pages to *.1.html on website.fiddlosopher1-2/+2
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1192 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-08Use \{0,1\} instead of \? in sed, so it works on BSD/Mac OSX too.fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1144 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-08Makefile website target: create changelog.txt, not changelog.fiddlosopher1-2/+2
This ensures that browsers will treat it as text. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1142 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29Makefile changes: BUILDCONF and CABAL_BKP.fiddlosopher1-2/+1
+ Changed BUILDCONF to point to dist/setup-config, not .setup-config. This is where current versions of Cabal put it. 'make clean' works again! + Do not clean up CABAL_BKP, because it might need to be recovered for a new build with a different GHC version. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1108 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29Small improvements in Makefile:fiddlosopher1-3/+4
+ Added $(BUILDCMD) target, so setup doesn't get compiled every time. + Removed (now circular) dependency of templates on ./templates. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1107 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29Changed references to source directory in Makefile and pandoc.cabal.*.fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1105 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-26Makefile: Add .exe extension to BUILDCMD if building on Windows.fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1096 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-25+ Makefile now checks GHC version. If GHC is 6.6, pandoc.cabal.ghc66fiddlosopher1-2/+11
is copied to pandoc.cabal, and the old pandoc.cabal is copied to pandoc.cabal.orig. Otherwise, pandoc.cabal is copied to pandoc.cabal.orig but otherwise unmodified. This way, the Makefile will work properly with either GHC 6.6 or 6.8. + The changes in debian/rules from r1066 have been reverted, since they are no longer needed. Also, debian/rules has been converted to UTF-8. + INSTALL instructions have been updated accordingly. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1095 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-17Use $(GHC) instead of ghc and make them user configurable through environmentroktas1-3/+3
to support unusual ghc installations, for example: GHC=/opt/ghc/bin/ghc GHC_PKG=/opt/ghc/bin/ghc-pkg make git-svn-id: https://pandoc.googlecode.com/svn/trunk@1081 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-06Modified build procedure to allow compilation with GHC 6.8:fiddlosopher1-1/+1
+ pandoc.cabal now uses Cabal configurations and requires Cabal >=1.2. + An alternative pandoc.cabal.ghc66 is provided for those who have older versions of Cabal. + Debian build process has been modified to use pandoc.cabal.ghc66, as a temporary measure until GHC 6.8 gets into debian unstable. + INSTALL instructions have been updated. + Makefile has been updated to accommodate changes in pandoc.cabal. + pandoc.cabal.ghc68 has been removed, since the default version now works with GHC 6.8. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1066 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-03Reverted back to state as of r1062. The template haskell changesfiddlosopher1-2/+8
are more trouble than they're worth. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1064 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-03Use template haskell to avoid the need for templates:fiddlosopher1-8/+2
+ 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
2007-10-07Makefile:roktas1-3/+5
- New variables to make use in debian/rules: DATADIR, DOCDIR. Cabal uses $prefix/pandoc-$VERSION/doc for the documentation files, where as the Debian package uses $prefix/doc/pandoc. We need these variables to resolve the conflict. debian/rules: - Set and export DATADIR, DOCDIR which controls the installation of document files at install-program target. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1045 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-07Changes in Makefile:roktas1-79/+63
- For generic installations, use $prefix/share/pandoc-$VERSION/doc directory to put all the documentation files. This fixes the issue of having two copies of the library documentation (one in $prefix/share/pandoc-doc, the other is in $prefix/share/pandoc-$VERSION). - Remove uninstall-lib-doc target and move the relevant code to uninstall-all target. Add extra code to remove the html directory. These changes fix the issue of leaving the library documentation in $prefix/share/pandoc-$VERSION uninstalled. - Remove the confusing NAME and THIS variables and create new variables: PKG (same as THIS), and PKGID ($PKG-$VERSION = $THIS-$VERSION). Remove RELNAME (which is equal to PKGID). All these changes simplified things a bit in "Cabal constants" section and uninstall-all target. - Remove some Cabal constants for the sake of simplicity and add a few new ones: PKGDATAPATH and PKGDOCPATH. We at least need a PKGDOCPATH variable to install DOCS, as Cabal doesn't provide a command for this target (hence, install-doc). I wish to set this variable by using ghc-pkg (just like libdir in install-all), but this seems a bit difficult to me, as there is no docdir variable in .installed-pkg-config and we would have to resort to an unclean hack which extracts docdir from haddock-dir. - Keep all non-critical steps (i.e. rmdir) quiet to reduce noise. - Ensure to use stderr for all messages. - Avoid forking a subshell in $(web_dest). - A few unrelated cosmetic changes. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1043 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-03No need to add $(BUILDDIR) and $(BUILDCONF) to cleanup_files,fiddlosopher1-1/+1
because they are removed automatically by '$(BUILDCMD) clean'. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1006 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-03* The previous fix was wrong. Apply a proper fix and cross the fingers. :-)roktas1-2/+3
+ On configure, compile 'Setup.hs' to 'setup' and use 'setup' as the build command instead of 'runhaskell', which, on some platforms (such as s390, alpha, m68k), throws the following error: runhaskell Setup.hs configure --prefix=/usr ghc-6.6.1: not built for interactive use This causes a serious FTBFS bug. Closes: #440668 (from Debian BTS). + Setup.hs: revert changes. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1005 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-03* Urgent fix to address the following issue:roktas1-1/+1
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440668 The below link of a similar bug explains things a bit more: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=431843#22 git-svn-id: https://pandoc.googlecode.com/svn/trunk@1004 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-31Makefile: Get VERSION from cabal file, not Main.hs.fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@973 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-27Removed local references to Portfile, since pandoc is now in thefiddlosopher1-2/+0
MacPorts repository. Updated INSTALL instructions and website. git-svn-id: https://pandoc.googlecode.com/svn/trunk@919 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-26Don't try to generate distinfo in Makefile. Make this usingfiddlosopher1-7/+2
'make makesum' in freebsd instead. git-svn-id: https://pandoc.googlecode.com/svn/trunk@915 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-26Make freeebsd and macports targets depend on tarball.fiddlosopher1-2/+2
git-svn-id: https://pandoc.googlecode.com/svn/trunk@911 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-26Removed osx-package specific files, and references to themfiddlosopher1-3/+1
in Makefiles. git-svn-id: https://pandoc.googlecode.com/svn/trunk@906 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-26Removed osx package targets in Makefile, and documentation forfiddlosopher1-54/+0
them in INSTALL. osx packaging was not working well, because of the binary's dependency on a dynamic library GMP. A MacPorts port will be provided instead. git-svn-id: https://pandoc.googlecode.com/svn/trunk@905 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-26Changes to website for new installation instructions.fiddlosopher1-0/+2
Removed OSX package. git-svn-id: https://pandoc.googlecode.com/svn/trunk@904 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25Changed macport target to use 'openssl md5' instead offiddlosopher1-1/+1
'md5sum', which isn't found on OSX. git-svn-id: https://pandoc.googlecode.com/svn/trunk@899 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25Separated $(web_dest) and website targets.fiddlosopher1-4/+6
Fixed a bug in index.txt.in. git-svn-id: https://pandoc.googlecode.com/svn/trunk@898 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25Build web index from a template (including version number).fiddlosopher1-0/+2
git-svn-id: https://pandoc.googlecode.com/svn/trunk@896 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25Updated Makefile for macports instead of macport.fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@892 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25Removed macports (renamed as macport).fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@888 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25Modifications in freebsd packaging:fiddlosopher1-7/+23
+ Added freebsd target to Makefile, which creates Makefile from Makefile.in and creates distinfo. + Removed Makefile and distinfo from the repository. git-svn-id: https://pandoc.googlecode.com/svn/trunk@887 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25Added macport target to Makefile; Portfile is now built fromfiddlosopher1-0/+11
a template. git-svn-id: https://pandoc.googlecode.com/svn/trunk@886 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-15Simplified Makefile install-all and uninstall-all targets.fiddlosopher1-4/+4
git-svn-id: https://pandoc.googlecode.com/svn/trunk@853 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-15Fixed bug in tarball target in Makefile (should be RELNAME insteadfiddlosopher1-1/+1
of fullname). git-svn-id: https://pandoc.googlecode.com/svn/trunk@850 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-28Makefile: instead of testing for existence of pandocfiddlosopher1-4/+2
symlink in build-exec, use the -f option in ln. git-svn-id: https://pandoc.googlecode.com/svn/trunk@814 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-27Use HTML version of README in OSX installer, insteadfiddlosopher1-1/+1
of plain text or RTF (since RTF tables don't work well in OSX Preview). git-svn-id: https://pandoc.googlecode.com/svn/trunk@805 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-23Use README instead of README.rtf in Welcome page offiddlosopher1-2/+2
Mac OSX package, because the RTF tables don't render right in Mac's preview app. git-svn-id: https://pandoc.googlecode.com/svn/trunk@790 788f1e2b-df1e-0410-8736-df70ead52e1b
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-15 07:45:09 +0000