diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-25 08:09:35 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-25 08:09:35 +0000 |
| commit | 33ffba2e91f46fed9e98d82d3db52b443fb49d9b (patch) | |
| tree | 03db1d562b43892e14b1cd00233669ad3ce82fa7 /libXfont/Makefile.am | |
| parent | 345335d61c71c245846d679d568a8b5eca1a5ca9 (diff) | |
| parent | 65fee5533a4cec1d9c1ec631f9cb98f09cf638cf (diff) | |
| download | vcxsrv-33ffba2e91f46fed9e98d82d3db52b443fb49d9b.tar.gz vcxsrv-33ffba2e91f46fed9e98d82d3db52b443fb49d9b.tar.bz2 vcxsrv-33ffba2e91f46fed9e98d82d3db52b443fb49d9b.zip | |
svn merge "^/branches/released" .
Diffstat (limited to 'libXfont/Makefile.am')
| -rw-r--r-- | libXfont/Makefile.am | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/libXfont/Makefile.am b/libXfont/Makefile.am index b90a7adbb..49102e81e 100644 --- a/libXfont/Makefile.am +++ b/libXfont/Makefile.am @@ -43,21 +43,27 @@ nodist_libXfontinclude_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xfont.pc -EXTRA_DIST = xfont.pc.in ChangeLog include/X11/fonts/fontconf.h.in +MAINTAINERCLEANFILES = ChangeLog INSTALL -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL # Developer documentation - not installed on system -EXTRA_DIST += doc/fontlib.xml doc/fontlib.xsl doc/fontlib.css +EXTRA_DIST = doc/fontlib.xml doc/fontlib.xsl doc/fontlib.css -if MAKE_DEVEL_DOCS +if ENABLE_DEVEL_DOCS if HAVE_XMLTO noinst_DATA = doc/fontlib.txt doc/fontlib.html $(srcdir)/doc/fontlib.css +if HAVE_FOP +noinst_DATA += doc/fontlib.pdf doc/fontlib.ps +endif CLEANFILES = doc/fontlib.txt doc/fontlib.html doc/fontlib.pdf doc/fontlib.ps doc/fontlib.txt: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl @@ -67,9 +73,9 @@ doc/fontlib.html: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl $(AM_V_GEN)$(XMLTO) -m $(srcdir)/doc/fontlib.xsl -o doc xhtml-nochunks $(srcdir)/doc/fontlib.xml doc/fontlib.pdf: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl - $(AM_V_GEN)$(XMLTO) -m $(srcdir)/doc/fontlib.xsl -o doc pdf $(srcdir)/doc/fontlib.xml + $(AM_V_GEN)$(XMLTO) --with-fop -m $(srcdir)/doc/fontlib.xsl -o doc pdf $(srcdir)/doc/fontlib.xml doc/fontlib.ps: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl - $(AM_V_GEN)$(XMLTO) -m $(srcdir)/doc/fontlib.xsl -o doc ps $(srcdir)/doc/fontlib.xml + $(AM_V_GEN)$(XMLTO) --with-fop -m $(srcdir)/doc/fontlib.xsl -o doc ps $(srcdir)/doc/fontlib.xml endif HAVE_XMLTO -endif MAKE_DEVEL_DOCS +endif ENABLE_DEVEL_DOCS |