aboutsummaryrefslogtreecommitdiff
path: root/Makefile
AgeCommit message (Collapse)AuthorFilesLines
2007-02-27Strip executable binaries before installing.fiddlosopher1-0/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@551 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-02-23'cp -a' does not work in BSD. Replace with 'cp -R'.fiddlosopher1-1/+1
Note that we don't want user and group to be preserved, anyway. git-svn-id: https://pandoc.googlecode.com/svn/trunk@547 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-10More website tweaks. Added demo of extra xsl configurationfiddlosopher1-1/+2
and CSS in chunked xhtml produced from docbook. git-svn-id: https://pandoc.googlecode.com/svn/trunk@489 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-10Minor changes to Makefile required by changes to websitefiddlosopher1-1/+2
build system. git-svn-id: https://pandoc.googlecode.com/svn/trunk@488 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-09Reorganized Makefile target - now uses a subsidiary Makefilefiddlosopher1-12/+12
that can be run from the website directory for small changes. git-svn-id: https://pandoc.googlecode.com/svn/trunk@485 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-09Change to Makefile to add features page to website.fiddlosopher1-3/+3
git-svn-id: https://pandoc.googlecode.com/svn/trunk@467 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-05Fix the bug in 'install-all' target which does not install the wrappers.roktas1-7/+16
(This target is somewhat special as it should handle installing and _registering_ the library in generic installations.) We can't rely on 'install-exec' to fix this bug (but we should depend on 'build-exec' nevertheless), since the 'install-all' target already installs pandoc along with the library files. Therefore we should install wrappers separately by using a helper function which was specifically created to avoid code duplication ('install-exec' target was also updated so as to use this function). git-svn-id: https://pandoc.googlecode.com/svn/trunk@426 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-05Nicer informational message in test-markdown target.fiddlosopher1-1/+2
git-svn-id: https://pandoc.googlecode.com/svn/trunk@420 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-04Changed test-markdown target in Makefile: Now it will find anyfiddlosopher1-3/+9
markdown test suites in the 'test' directory (subdirectories beginning with 'MarkdownTest_') and run them all. This allows us to have multiple test suites, e.g. for 1.0 and for a beta version. git-svn-id: https://pandoc.googlecode.com/svn/trunk@414 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-03Cleaned up and improved Makefile target for wrappers.fiddlosopher1-3/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@408 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-03Improved Makefile 'wrappers' target. (Previously, it would buildfiddlosopher1-1/+2
all wrappers corresponding to src/wrappers/*.in. Now, it will only build wrappers in WRAPPERS. This might be useful if we decide to have 'hsmarkdown' be a wrapper on Windows and a symlink on unix.) git-svn-id: https://pandoc.googlecode.com/svn/trunk@407 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-02Improved test-markdown target in Makefile:fiddlosopher1-7/+5
+ Use 'hsmarkdown' instead of building 'pandoc-strict' (which was a hack, and didn't work on Windows machines, anyway, due to the line ending problem) + Put top-level directory in path before running the test script, so that hsmarkdown can find 'pandoc' even if it hasn't been installed. git-svn-id: https://pandoc.googlecode.com/svn/trunk@406 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-02Fixed a bug in website generation, which only worked if 'pandoc'fiddlosopher1-1/+1
and the wrappers had been installed. git-svn-id: https://pandoc.googlecode.com/svn/trunk@402 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-02Added 'hsmarkdown' wrapper, designed to be used as a drop-infiddlosopher1-1/+1
replacement for Markdown.pl. It calls pandoc with the options '--from markdown --to html --strict' and disallows other options. (Any command-line options will be interpreted as arguments.) git-svn-id: https://pandoc.googlecode.com/svn/trunk@399 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-01Inserted a needed slash in the Makefile, after $(osx_pkg_name),fiddlosopher1-1/+1
which is the name of a directory! git-svn-id: https://pandoc.googlecode.com/svn/trunk@391 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-30Merged 'strict' branch from r324. This adds a '--strict'fiddlosopher1-2/+7
option to pandoc, which forces it to stay as close as possible to official Markdown syntax. git-svn-id: https://pandoc.googlecode.com/svn/trunk@347 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-29Slight changes in website target:fiddlosopher1-4/+3
+ history.html -> changelog.html + demo.html -> examples.html + Added title to changelog.html + Removed header div on html pages + Changed widths in css git-svn-id: https://pandoc.googlecode.com/svn/trunk@319 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-29Make wrappers executable in the top-level directory, in case peoplefiddlosopher1-0/+1
want to try them in place without installing. git-svn-id: https://pandoc.googlecode.com/svn/trunk@316 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-29+ Renamed web/demos.sh to mkdemos.shfiddlosopher1-2/+2
+ Added parameter for directory containing executables + Changed arithmetic statement for portability. + Modified Makefile accordingly. git-svn-id: https://pandoc.googlecode.com/svn/trunk@315 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-29+ Changed 'web2markdown' to 'html2markdown'.fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@309 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-28Added two more demo cases to website. Put a footnote infiddlosopher1-0/+1
README for demonstration purposes. git-svn-id: https://pandoc.googlecode.com/svn/trunk@302 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-28Added a latex -> markdown case to demos.fiddlosopher1-0/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@301 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-28Added another demo case, with header and footer and css.fiddlosopher1-2/+4
git-svn-id: https://pandoc.googlecode.com/svn/trunk@299 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-28Added "Demos" page to the website. fiddlosopher1-1/+5
git-svn-id: https://pandoc.googlecode.com/svn/trunk@298 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-28+ Removed the convenience symlinks (which don't work on Windows underfiddlosopher1-16/+3
Cygwin, due to Windows' lack of true symbolic links). + Modified the wrappers to use 'pandoc' instead of the symlinks. + Modified the Makefile to remove all references to the symlinks. + Removed code from Main.hs that made pandoc's behavior depend on the name of the calling program. + Added code to Main.hs that sets default reader and writer based on extensions of input and output filenames (if provided). (Thanks to roktas for the idea.) + Modified README and man pages accordingly. + Removed WINDOWS-README target from Makefile. It is no longer needed now that we don't have the symlinks. git-svn-id: https://pandoc.googlecode.com/svn/trunk@295 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-24Added README-WINDOWS.html to windows package documentation.fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@291 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-24+ Updates to Makefile:fiddlosopher1-34/+35
- New win-pkg target to build Windows binary package. - Changed name on OSX package. - New RELNAME global variable contains release name, e.g. pandoc-0.3 - Mac dmg is now created in top-level directory, not .. + Updates to website: - Changed download links to point to Google Code downloads area. - Added section on Windows binary package. git-svn-id: https://pandoc.googlecode.com/svn/trunk@286 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-23Pandoc package didn't contain 'pandoc' executable. This is because we're roktas1-2/+2
using "Simply expanded variables" and PROGS expands before EXECS. Put PROGS after EXECS to fix this bug. As an alternative solution, we could make PROGS -and possibly others- "recursively expanded" variables, but I tend to avoid using that flavour of variables. git-svn-id: https://pandoc.googlecode.com/svn/trunk@283 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-22Changed osx-pkg target in Makefile to refer to COPYRIGHTfiddlosopher1-2/+2
instead of (obsolete) LICENSE. git-svn-id: https://pandoc.googlecode.com/svn/trunk@280 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-22Merged changes from branches/wrappers since r177.fiddlosopher1-10/+14
Summary of main changes: + Added -o/--output and -d/--debug options to pandoc. + Modified pandoc to behave differently depending on the name of the program. For example, if the program name is 'html2latex', the default reader will be html and the default writer latex. + Removed most of the old wrappers, replacing them with symlinks to pandoc. + Rewrote markdown2pdf and created a new wrapper web2markdown, with the functionality of the old html2markdown script. These new scripts exploit pandoc's -d option to avoid having to do complex command-line parsing. + Revised man pages and documentation appropriately. git-svn-id: https://pandoc.googlecode.com/svn/trunk@279 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-21Removed TODO. ToDo list now maintained on the Wiki at pandoc'sfiddlosopher1-1/+1
Google Code site. (Also in the repository: wiki/ToDo.wiki.) git-svn-id: https://pandoc.googlecode.com/svn/trunk@266 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-19Added 'clean' target to src/templates/Makefile, mainfiddlosopher1-0/+1
Makefile's 'clean' calls it to clean out template-generated files. git-svn-id: https://pandoc.googlecode.com/svn/trunk@237 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-19Changes to build process relating to r234.fiddlosopher1-3/+2
+ Corrected dependencies in Makefiles to ensure that templates get filled when the relevant files are modified. + Changed template placeholders to @xxx@ instead of <xxx>, for consistency with our practice with the Cabal template. + Changed default font for RTF writer (this had been changed earlier, but in the target rather than the template!) git-svn-id: https://pandoc.googlecode.com/svn/trunk@235 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-16+ Small changes to Makefile for better handling of Windows executable.fiddlosopher1-6/+16
+ Added windows executable to the website target. git-svn-id: https://pandoc.googlecode.com/svn/trunk@210 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-13Makefile now checks to see if we're running Cygwin/Windows; if we are,fiddlosopher1-1/+4
'.exe' extension is added to each executable in EXECS. git-svn-id: https://pandoc.googlecode.com/svn/trunk@192 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-12Extract version number from src/Main.hs in cabalize and Makefile.fiddlosopher1-2/+2
The authoritative version number is now in src/Main.hs, with no duplication. (This seems a better solution than building Main.hs from a template.) git-svn-id: https://pandoc.googlecode.com/svn/trunk@182 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-12Merge changes in branches/wrappers into trunk.roktas1-5/+32
[in trunk] svn merge -r105:HEAD \ https://pandoc.googlecode.com/svn/branches/wrappers git-svn-id: https://pandoc.googlecode.com/svn/trunk@177 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-16Using hardcoded executable paths in Makefile doesn't work. While GHC roktas1-5/+15
6.6 Cabal builds executables in dist/build/$executable, older Cabal versions use dist/build/src. To cope with this situation: + Revert to old code which determines executable paths dynamically. + Create symlinks to the compiled executables in top directory. Make sure to not touch symlinks once they've been created. + As PROGS variable can now contain symlinks, determine the actual file during installation. + Replace EXECNAMES with EXECS, as the former became a redundant name due to these changes. git-svn-id: https://pandoc.googlecode.com/svn/trunk@104 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-12Fix a bug in 'uninstall-exec' target.roktas1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@93 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-12Changes to OSX packaging:fiddlosopher1-11/+11
+ Use $(NAME) instead of hard-coded 'Pandoc' for package and dmg names + Create dmg in .. (like debs) + Modified website target to get dmg from .. git-svn-id: https://pandoc.googlecode.com/svn/trunk@90 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-11Use compiled executables directly from their build directory, without roktas1-19/+15
copying them to the top directory. git-svn-id: https://pandoc.googlecode.com/svn/trunk@89 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-10Fix a serious bug in Makefile. 'make' should recompile when a source file roktas1-4/+3
has been modified. git-svn-id: https://pandoc.googlecode.com/svn/trunk@88 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-08Remove signatures (and emails!) from changelog on web page.fiddlosopher1-1/+3
git-svn-id: https://pandoc.googlecode.com/svn/trunk@85 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-08+ Changes to osx/Welcome:fiddlosopher1-1/+2
- removed hardcoded references to /usr/local - added title + Minor changes to website build process. git-svn-id: https://pandoc.googlecode.com/svn/trunk@84 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-08Revisions to website target:fiddlosopher1-1/+4
+ added link for OSX package + minor fixes git-svn-id: https://pandoc.googlecode.com/svn/trunk@83 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-08Put all website commands into a subshell jail. If any command failed, we roktas1-12/+14
would end up with web_dest directory which would have to be removed manually for further attempts. If this looked ugly; as an alternative solution we could change 'website' target as follows: website: $(web_dest)/index.html $(web_dest)/index.html: ... git-svn-id: https://pandoc.googlecode.com/svn/trunk@82 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-08Changes for 'website':roktas1-24/+34
+ Execute $(MAIN) in './' otherwise this would fail if $(MAIN) is not available in PATH. + Make echo off during file checking. + Copy $(deb_main) from parent directory. Changes for 'deb': + Calculate $(deb_main) the essential Debian package to install. + Place this target before website target. + 'deb' should be a PHONY target. + Make echo off during tool checking. Changes for 'tarball': + Use all-lowercase $(THIS) instead of $(MAIN). git-svn-id: https://pandoc.googlecode.com/svn/trunk@81 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-08Changed install.html to INSTALL.html in website; replaced a referencefiddlosopher1-1/+1
to README.html to INSTALL.html. git-svn-id: https://pandoc.googlecode.com/svn/trunk@80 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-08Added target for creation of website. 'web' directory containsfiddlosopher1-0/+36
source files for website, which is created in 'web/pandoc'. git-svn-id: https://pandoc.googlecode.com/svn/trunk@79 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-07Removed INSTALL.html from build-doc target. fiddlosopher1-2/+2
git-svn-id: https://pandoc.googlecode.com/svn/trunk@78 788f1e2b-df1e-0410-8736-df70ead52e1b