aboutsummaryrefslogtreecommitdiff
path: root/Makefile
AgeCommit message (Collapse)AuthorFilesLines
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
2006-11-07Fixes from last review:roktas1-5/+5
+ Add markdown2pdf to %.pdf dependencies. + Make build-all target explicitly depend on build-program, instead of 'all' which might be changed in future. + Add build-program to osx-pkg-prep for the sake of explicitness. + Generate INSTALL.html in build-doc. git-svn-id: https://pandoc.googlecode.com/svn/trunk@77 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-03Attempt to fix a (long-standing) Makefile drawback which is documented in roktas1-11/+18
previous revisions as follows: # XXX: Note that we don't handle PREFIX correctly at the install-* # stages, i.e. any PREFIX given at the configuration time is lost, # unless it is also supplied (via environment) at these stages. With this (optional and experimental) hack, config time settings will become persistent. Such persistency allows one to specify PREFIX and/or DESTDIR only once (at the first run). That is, the below actions should work fine now: DESTDIR=/tmp/foo make make install In previous code these variables need to be specified at each run. For example: DESTDIR=/tmp/foo make DESTDIR=/tmp/foo make install This change (as an ugly hack) is optional (and might be removed) as the user could always work around that issue with 'DESTDIR=/tmp/foo make install'. git-svn-id: https://pandoc.googlecode.com/svn/trunk@75 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-03Fix a bug in variable substitution.roktas1-2/+2
git-svn-id: https://pandoc.googlecode.com/svn/trunk@73 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-03Older Cabal versions have no '--destdir' option. Detect the availability roktas1-1/+7
of this option and fallback to '--copy-prefix' (which is now deprecated, as of GHC 6.6). Add a short comment to cabalize. git-svn-id: https://pandoc.googlecode.com/svn/trunk@72 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-03Remove some code comments from previous commit.roktas1-2/+4
git-svn-id: https://pandoc.googlecode.com/svn/trunk@71 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-02More sanitizations in Makefile (needs testing):roktas1-31/+31
+ Remove a bogus DOCS assignment line. + Cabal recreates pandoc executable by unnecessarily linking Main.o with library (it skips compiling *.hs files though). Since pandoc's time stamp is modified, it is copied from buildir to top directory, and also README.html is regenerated, each time a target which has a 'build' prerequisite is invoked. As a solution, now PHONY 'build' target depends on BUILDDIR/. + "THIS" variable has a confusing semantics and it is abusingly used in various targets. We in fact need it to specify package sub directories created during installation. Clarify this meaning by moving it to path variables section. + Create a new variable as MAIN which holds the main executable name. Sorry for my obsession to avoid simply using a magic "pandoc" name. :-) Modify all targets which (abusingly) refers to THIS and replace THIS with MAIN. Note that MAIN is derived from EXECS which in turn collects all executable names from Executable stanzas in cabal file. + As EXECS may hold more than one executable name, update EXECS target to reflect this semantic. + Rename BINS variable as PROGS and modify it so as to hold the names of all executables required to be installed. Remove bin_all local variable as PROGS can be used for the same purpose instead. + Modify DOCS variable so as to hold the names of all documents required to be installed. Remove doc_all local variable as DOCS can be used for the same purpose instead. + Remove DOCS target. README.html is already generated when needed. + Remove build-exec redundant prerequisite from osx_dest target. Make can find its way. + Set MAIN as the prerequisite of 'test' and 'test-markdown' to make things more clear. git-svn-id: https://pandoc.googlecode.com/svn/trunk@70 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-02Sanitize Makefile:roktas1-14/+31
+ Move $(BINS) target to a new PHONY 'build-exec' target. This should be used in all (non-build type) targets which refer BINS. Also, create a new 'build-program' target for user's convenience. + Update all targets so as to use build-exec (instead of BINS). + Use an explicit global DOCS variable which lists buildable documents; this makes our intention more clear. Also, for the sake of consistency, move BINS variable (which lists buildable executables) to a new section and create a redundant (for the moment, at least) EXECS variable. + Move all buildable target files in install-* targets to the related build-* targets. This mostly involves document files (e.g. README.hmtl). As a result, we now have a new build target 'build-doc' which builds main documents. This modification provides a clean separation between build and install type targets. git-svn-id: https://pandoc.googlecode.com/svn/trunk@69 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-02Make osx-dmg target depend on $(osx_dmg_name), so that if thefiddlosopher1-1/+2
dmg file has already been built, it does not build it again. git-svn-id: https://pandoc.googlecode.com/svn/trunk@68 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-02Changes related to osx packaging:fiddlosopher1-13/+7
+ Simplified osx-dmg target, which need not be built as root. + Made osx-pkg and osx-pkg-prep non-.PHONY, plus a few other minor changes to make the dependencies work correctly. + Removed \< from the sed regex in cabalize; this is not support in BSD sed. + Changed path information in osx/Welcome and message in uninstall-pandoc. git-svn-id: https://pandoc.googlecode.com/svn/trunk@67 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01Various changes in osx-* targets.roktas1-13/+13
+ Exit 1 if permissions are not satisfied. + Make all targets PHONY. + Minor cosmetic fixes. git-svn-id: https://pandoc.googlecode.com/svn/trunk@63 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01Added uninstall-pandoc script to Mac OS X package.fiddlosopher1-0/+1
Added information about uninstalling to Welcome message. git-svn-id: https://pandoc.googlecode.com/svn/trunk@62 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01Changes to osx-pkg and osx-dmg targets.fiddlosopher1-8/+19
git-svn-id: https://pandoc.googlecode.com/svn/trunk@60 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01Improved osx-dmg and osx-pkg targets in Makefile. fiddlosopher1-11/+29
git-svn-id: https://pandoc.googlecode.com/svn/trunk@59 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-31Revert all changes related to automatic ChangeLog creation.roktas1-17/+7
+ Remove ChangeLog and gnuify-changelog.pl + Remove 'package' target in Makefile. Minor unrelated cosmetic changes. git-svn-id: https://pandoc.googlecode.com/svn/trunk@52 788f1e2b-df1e-0410-8736-df70ead52e1b
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-09 17:07:38 +0000