summaryrefslogtreecommitdiff
path: root/lib/libXfont/Makefile.am
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2010-10-31 15:09:47 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2010-10-31 15:09:47 +0000
commitfd26e32ab54423920a85d4fc12c64045292cb270 (patch)
tree96fb34862e54c1feb7bd443c7a0f76663306b744 /lib/libXfont/Makefile.am
parentf4d594417229e8972102a7f5e0b9706aee1b00c0 (diff)
Update to libXfont 1.4.3. No functional change.
Diffstat (limited to 'lib/libXfont/Makefile.am')
-rw-r--r--lib/libXfont/Makefile.am27
1 files changed, 1 insertions, 26 deletions
diff --git a/lib/libXfont/Makefile.am b/lib/libXfont/Makefile.am
index 49102e81e..9153e98bf 100644
--- a/lib/libXfont/Makefile.am
+++ b/lib/libXfont/Makefile.am
@@ -19,7 +19,7 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-SUBDIRS=src
+SUBDIRS=doc src
libXfontincludedir = $(includedir)/X11/fonts
libXfontinclude_HEADERS = \
@@ -54,28 +54,3 @@ ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog INSTALL
-
-# Developer documentation - not installed on system
-EXTRA_DIST = doc/fontlib.xml doc/fontlib.xsl doc/fontlib.css
-
-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
- $(AM_V_GEN)$(XMLTO) -m $(srcdir)/doc/fontlib.xsl -o doc txt $(srcdir)/doc/fontlib.xml
-
-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) --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) --with-fop -m $(srcdir)/doc/fontlib.xsl -o doc ps $(srcdir)/doc/fontlib.xml
-endif HAVE_XMLTO
-endif ENABLE_DEVEL_DOCS