DOCS = lustre.pdf lustre-HOWTO.txt
IMAGES := $(patsubst %.fig,%.eps,$(wildcard *.fig))
-#IMAGES = sys_stat.eps sys_odirect.eps sys_open.eps sys_write.eps sys_mount.eps cache1.eps cache2.eps intermezzocache.eps intermezzofilesys.eps meta.eps metadata1.eps networklayer.eps bigpicture.eps intermezzo.eps mds.eps portals.eps client.eps layering.eps metadata.eps sb.eps cow.eps lockacq.eps obdfs.eps snapsetup.eps dirbodyapi.eps loraid.eps ost.eps updates.eps hotmigrate.eps lustreclusters.eps osthw.eps portals-lib.eps lockqueues.eps lockexample1.eps lockexample2.eps lockexample3.eps lockexample4.eps lockseverity.eps gssapi.eps lovextents.eps cpsd.eps setup-accept.eps authenticate.eps login.eps
-
-LYXFILES= $(wildcard *.lin) $(wildcard *.lyx)
+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
# 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 > $@
-%-full.tex: %.tex
- $(TEXEXPAND) -texinputs=. -texinputs=$(srcdir) -output=$@ $<
-
+# 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
+# This rule needs to come after the more specific doc.old rule.
+%-full.tex: %.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:
@if test "X$(OLD)" = X; then \