examples: modernize the example Makefiles

* examples/c++/Makefile, examples/c++/calc++/Makefile,
* examples/c++/glr/Makefile, examples/c/bistromathic/Makefile,
* examples/c/calc/Makefile, examples/c/glr/Makefile,
* examples/c/lexcalc/Makefile, examples/c/mfcalc/Makefile,
* examples/c/pushcalc/Makefile, examples/c/reccalc/Makefile,
* examples/c/rpcalc/Makefile, examples/d/calc/Makefile,
* examples/d/simple/Makefile, examples/java/calc/Makefile,
* examples/java/simple/Makefile:
Use --html to generate *.html directly.
No longer demonstrate --xml.
No longer show rules for xml to html.
Use --header, not --defines.
Use --graph without specifying the output file now that we
generate *.gv by default.

8 files changed, 14 insertions, 54 deletions

diff --git a/examples/c/bistromathic/Makefile b/examples/c/bistromathic/Makefile
index ae6630e6..0e61ce66 100644
--- a/examples/c/bistromathic/Makefile
+++ b/examples/c/bistromathic/Makefile
@@ -3,7 +3,6 @@
 
 BASE = bistromathic
 BISON = bison
-XSLTPROC = xsltproc
 
 # We need to find the headers and libs for readline (and possibly intl).
 # You probably need to customize this for your own environment.
@@ -18,8 +17,8 @@ LIBS = -lreadline -lm # In some environments, -lintl is needed.
 
 all: $(BASE)
 
-%.c %.h %.xml %.gv: %.y
-	$(BISON) $(BISONFLAGS) --header --xml --graph=$*.gv -o $*.c $<
+%.c %.h %.html %.xml %.gv: %.y
+	$(BISON) $(BISONFLAGS) --header --html --graph -o $*.c $<
 
 $(BASE): parse.o
 	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
@@ -28,10 +27,6 @@ run: $(BASE)
 	@echo "Type bistromathic expressions.  Quit with ctrl-d."
 	./$<
 
-html: $(BASE).html
-%.html: %.xml
-	$(XSLTPROC) $(XSLTPROCFLAGS) -o $@ $$($(BISON) --print-datadir)/xslt/xml2xhtml.xsl $<
-
 CLEANFILES =						\
   $(BASE) *.o						\
   parse.[ch] parse.output parse.xml parse.html parse.gv
diff --git a/examples/c/calc/Makefile b/examples/c/calc/Makefile
index 3a32d012..cdf2ae32 100644
--- a/examples/c/calc/Makefile
+++ b/examples/c/calc/Makefile
@@ -3,12 +3,11 @@
 
 BASE = calc
 BISON = bison
-XSLTPROC = xsltproc
 
 all: $(BASE)
 
-%.c %.h %.xml %.gv: %.y
-	$(BISON) $(BISONFLAGS) --header --xml --graph=$*.gv -o $*.c $<
+%.c %.h %.html %.xml %.gv: %.y
+	$(BISON) $(BISONFLAGS) --header --html --graph -o $*.c $<
 
 $(BASE): $(BASE).o
 	$(CC) $(CFLAGS) -o $@ $^
@@ -17,10 +16,6 @@ run: $(BASE)
 	@echo "Type arithmetic expressions.  Quit with ctrl-d."
 	./$<
 
-html: $(BASE).html
-%.html: %.xml
-	$(XSLTPROC) $(XSLTPROCFLAGS) -o $@ $$($(BISON) --print-datadir)/xslt/xml2xhtml.xsl $<
-
 CLEANFILES =									\
   $(BASE) *.o $(BASE).[ch] $(BASE).output $(BASE).xml $(BASE).html $(BASE).gv
 
diff --git a/examples/c/glr/Makefile b/examples/c/glr/Makefile
index a56edb1f..4bf7149e 100644
--- a/examples/c/glr/Makefile
+++ b/examples/c/glr/Makefile
@@ -3,12 +3,11 @@
 
 BASE = c++-types
 BISON = bison
-XSLTPROC = xsltproc
 
 all: $(BASE)
 
 %.c %.h %.xml %.gv: %.y
-	$(BISON) $(BISONFLAGS) --defines --xml --graph=$*.gv -o $*.c $<
+	$(BISON) $(BISONFLAGS) --header --graph -o $*.c $<
 
 $(BASE): $(BASE).o
 	$(CC) $(CFLAGS) -o $@ $^
@@ -17,10 +16,6 @@ run: $(BASE)
 	@echo "Type C++ declarations or expressions.  Quit with ctrl-d."
 	./$<
 
-html: $(BASE).html
-%.html: %.xml
-	$(XSLTPROC) $(XSLTPROCFLAGS) -o $@ $$($(BISON) --print-datadir)/xslt/xml2xhtml.xsl $<
-
 CLEANFILES =									\
   $(BASE) *.o $(BASE).[ch] $(BASE).output $(BASE).xml $(BASE).html $(BASE).gv
 
diff --git a/examples/c/lexcalc/Makefile b/examples/c/lexcalc/Makefile
index 88badb7b..33069256 100644
--- a/examples/c/lexcalc/Makefile
+++ b/examples/c/lexcalc/Makefile
@@ -4,12 +4,11 @@
 BASE = lexcalc
 BISON = bison
 FLEX = flex
-XSLTPROC = xsltproc
 
 all: $(BASE)
 
-%.c %.h %.xml %.gv: %.y
-	$(BISON) $(BISONFLAGS) --header --xml --graph=$*.gv -o $*.c $<
+%.c %.h %.html %.xml %.gv: %.y
+	$(BISON) $(BISONFLAGS) --header --html --graph -o $*.c $<
 
 %.c: %.l
 	$(FLEX) $(FLEXFLAGS) -o$@ $<
@@ -22,10 +21,6 @@ run: $(BASE)
 	@echo "Type arithmetic expressions.  Quit with ctrl-d."
 	./$<
 
-html: parse.html
-%.html: %.xml
-	$(XSLTPROC) $(XSLTPROCFLAGS) -o $@ $$($(BISON) --print-datadir)/xslt/xml2xhtml.xsl $<
-
 CLEANFILES =						\
   $(BASE) *.o						\
   parse.[ch] parse.output parse.xml parse.html parse.gv	\
diff --git a/examples/c/mfcalc/Makefile b/examples/c/mfcalc/Makefile
index b9518089..4014dd48 100644
--- a/examples/c/mfcalc/Makefile
+++ b/examples/c/mfcalc/Makefile
@@ -3,12 +3,11 @@
 
 BASE = mfcalc
 BISON = bison
-XSLTPROC = xsltproc
 
 all: $(BASE)
 
-%.c %.xml %.gv: %.y
-	$(BISON) $(BISONFLAGS) --xml --graph=$*.gv -o $*.c $<
+%.c %.html %.gv: %.y
+	$(BISON) $(BISONFLAGS) --html --graph -o $*.c $<
 
 %: %.c
 	$(CC) $(CFLAGS) -o $@ $<
@@ -17,9 +16,5 @@ run: $(BASE)
 	@echo "Type arithmetic expressions.  Quit with ctrl-d."
 	./$<
 
-html: $(BASE).html
-%.html: %.xml
-	$(XSLTPROC) $(XSLTPROCFLAGS) -o $@ $$($(BISON) --print-datadir)/xslt/xml2xhtml.xsl $<
-
 clean:
 	rm -f $(BASE) $(BASE).c $(BASE).html $(BASE).xml $(BASE).gv $(BASE).output
diff --git a/examples/c/pushcalc/Makefile b/examples/c/pushcalc/Makefile
index 3a32d012..83523935 100644
--- a/examples/c/pushcalc/Makefile
+++ b/examples/c/pushcalc/Makefile
@@ -3,12 +3,11 @@
 
 BASE = calc
 BISON = bison
-XSLTPROC = xsltproc
 
 all: $(BASE)
 
-%.c %.h %.xml %.gv: %.y
-	$(BISON) $(BISONFLAGS) --header --xml --graph=$*.gv -o $*.c $<
+%.c %.h %.html %.gv: %.y
+	$(BISON) $(BISONFLAGS) --header --html --graph -o $*.c $<
 
 $(BASE): $(BASE).o
 	$(CC) $(CFLAGS) -o $@ $^
@@ -17,10 +16,6 @@ run: $(BASE)
 	@echo "Type arithmetic expressions.  Quit with ctrl-d."
 	./$<
 
-html: $(BASE).html
-%.html: %.xml
-	$(XSLTPROC) $(XSLTPROCFLAGS) -o $@ $$($(BISON) --print-datadir)/xslt/xml2xhtml.xsl $<
-
 CLEANFILES =									\
   $(BASE) *.o $(BASE).[ch] $(BASE).output $(BASE).xml $(BASE).html $(BASE).gv
 
diff --git a/examples/c/reccalc/Makefile b/examples/c/reccalc/Makefile
index ff338003..69fc0c08 100644
--- a/examples/c/reccalc/Makefile
+++ b/examples/c/reccalc/Makefile
@@ -4,12 +4,11 @@
 BASE = reccalc
 BISON = bison
 FLEX = flex
-XSLTPROC = xsltproc
 
 all: $(BASE)
 
 %.c %.h %.xml %.gv: %.y
-	$(BISON) $(BISONFLAGS) --header --xml --graph=$*.gv -o $*.c $<
+	$(BISON) $(BISONFLAGS) --header --graph -o $*.c $<
 
 %.c %.h: %.l
 	$(FLEX) $(FLEXFLAGS) -o$*.c --header=$*.h $<
@@ -23,10 +22,6 @@ run: $(BASE)
 	@echo "Type arithmetic expressions.  Quit with ctrl-d."
 	./$<
 
-html: parse.html
-%.html: %.xml
-	$(XSLTPROC) $(XSLTPROCFLAGS) -o $@ $$($(BISON) --print-datadir)/xslt/xml2xhtml.xsl $<
-
 CLEANFILES =						\
   $(BASE) *.o						\
   parse.[ch] parse.output parse.xml parse.html parse.gv	\
diff --git a/examples/c/rpcalc/Makefile b/examples/c/rpcalc/Makefile
index 624f247b..23ea410c 100644
--- a/examples/c/rpcalc/Makefile
+++ b/examples/c/rpcalc/Makefile
@@ -3,12 +3,11 @@
 
 BASE = rpcalc
 BISON = bison
-XSLTPROC = xsltproc
 
 all: $(BASE)
 
-%.c %.xml %.gv: %.y
-	$(BISON) $(BISONFLAGS) --xml --graph=$*.gv -o $*.c $<
+%.c %.html %.gv: %.y
+	$(BISON) $(BISONFLAGS) --html --graph -o $*.c $<
 
 %: %.c
 	$(CC) $(CFLAGS) -o $@ $<
@@ -17,9 +16,5 @@ run: $(BASE)
 	@echo "Type arithmetic expressions in Reverse Polish Notation.  Quit with ctrl-d."
 	./$<
 
-html: $(BASE).html
-%.html: %.xml
-	$(XSLTPROC) $(XSLTPROCFLAGS) -o $@ $$($(BISON) --print-datadir)/xslt/xml2xhtml.xsl $<
-
 clean:
 	rm -f $(BASE) $(BASE).c $(BASE).html $(BASE).xml $(BASE).gv