Add separate create locks per object group.

[fs/lustre-release.git] / lustre / doc / Makefile.am

diff --git a/lustre/doc/Makefile.am b/lustre/doc/Makefile.am
index b4c352e..a47d5e7 100644 (file)
--- a/lustre/doc/Makefile.am
+++ b/lustre/doc/Makefile.am
@@ -14,19 +14,25 @@ PS2PDF = ps2pdf
 TEXEXPAND = texexpand
 SUFFIXES = .lin .lyx .pdf .ps .sgml .html .txt .tex .fig .eps .dvi
 
-DOCS = lustre.pdf lustre-HOWTO.txt
+if DOC
+  DOCS = lustre.pdf
+else
+  DOCS =
+endif
+
 IMAGES := $(patsubst %.fig,%.eps,$(wildcard *.fig))
 LYXFILES= $(filter-out $(patsubst %.lin,%.lyx,$(wildcard *.lin)),\
        $(wildcard *.lin *.lyx))
 
 MAINTAINERCLEANFILES =  $(IMAGES) $(DOCS) $(VERSIONED)
 CLEANFILES = *.aux *.tex doc.old/*.aux doc.old/*.tex *.eps *.log *.pdf
-VERSIONED = lustre-HOWTO.lyx lustre.lyx doc.old/lustre-HOWTO.lyx doc.old/lustre.lyx
+VERSIONED = lustre.lyx doc.old/lustre.lyx
 GENERATED = $(VERSIONED) lustre-full.tex lustre-chbar.tex
 
 EXTRA_DIST = chbar.sh postbar tex2pdf $(DOCS) $(IMAGES) $(LYXFILES) lustre.bib
 
-all: $(DOCS)
+all:
+docs: $(DOCS)
 
 # These variables are set by lbuild/check-build.
 RPMRELEASE ?= RELEASE
@@ -71,7 +77,7 @@ $(VERSIONED) : %.lyx: %.lin Makefile
 .ps.pdf:
        $(PS2PDF) $< $@
 
-lustre.tex lustre.pdf lustre.txt lustre.html: $(IMAGES) $(LYXFILES) lustre-HOWTO.lyx
+lustre.tex lustre.pdf lustre.txt lustre.html: $(IMAGES) $(LYXFILES)
 .fig.eps:
        -fig2dev -L eps $< > $@
 
@@ -83,11 +89,20 @@ syncweb: lustre.pdf
 # Build a changebar document from the files in doc.old and this directory.
 chbar: lustre-chbar.pdf
 
+# FIXME: Temporary rules until pdftex displays changebars correctly.
+lustre-chbar.pdf: lustre-chbar-nopdf.ps
+       $(PS2PDF) $< $@
+lustre-chbar-nopdf.ps: lustre-chbar-nopdf.dvi
+       $(DVIPS) $< -o $@
+lustre-chbar-nopdf.dvi: lustre-chbar-nopdf.tex
+       $(LATEX) $<
+       $(LATEX) $<
+lustre-chbar-nopdf.tex: lustre-chbar.tex
+       sed -e 's/^\(.*usepackage.*pdftex\)/%\1/' $< > $@
+
 %-chbar.tex: chbar.sh postbar doc.old/%-full.tex %-full.tex
        $(SHELL) $(srcdir)/chbar.sh doc.old/$*-full.tex $*-full.tex | $(srcdir)/postbar > $@
 
-# This rule needs to come before the next %-full.tex rule.
-doc.old/lustre.tex: doc.old/lustre-HOWTO.lyx
 doc.old/%-full.tex: doc.old/%.tex
        cd doc.old && $(TEXEXPAND) -texinputs=. -output=$*-full.tex $*.tex
 
@@ -96,7 +111,7 @@ doc.old/%-full.tex: doc.old/%.tex
        $(TEXEXPAND) -texinputs=. -texinputs=$(srcdir) -output=$@ $<
 
 # Check out the old directory if it doesn't exist.
-doc.old/lustre.lin doc.old/lustre-HOWTO.lin:
+doc.old/lustre.lin:
        @if test "X$(OLD)" = X; then \
          echo "You must populate doc.old or specify a CVS tag like OLD=v0_5_1"; \
          exit 1; \
@@ -107,5 +122,3 @@ doc.old/lustre.lin doc.old/lustre-HOWTO.lin:
 
 dist-hook:
        rm -rf $(distdir)/figs/CVS
-
-include $(top_srcdir)/Rules