From 99694ec805b9d98b5132f9db0d9b786b153a7742 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rich@annexia.org>
Date: Sun, 18 May 2008 19:03:58 +0000
Subject: [PATCH] Added rules to build examples.

---
 Makefile.in | 27 +++++++++++++++++++++------
 README      | 12 ++++++++----
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 21b9952..b14909d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,7 +32,7 @@ OCAMLOPTPACKAGES =
 
 OCAMLDOCFLAGS	= -html -sort
 
-EXAMPLES	= $(wildcard examples/*.ml)
+EXAMPLES	= $(patsubst %.ml,%,$(wildcard examples/*.ml))
 
 TESTS		= $(patsubst %.ml,%,$(wildcard tests/*.ml))
 
@@ -54,14 +54,23 @@ PP	= -pp "camlp4o bitmatch.cma pa_bitmatch.cmo"
 
 test: pa_bitmatch.cmo bitmatch.cma
 	@for f in $(TESTS); do \
-	  echo Test: $$f; \
+	  echo Building $$f; \
 	  $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) $(PP) \
 	    -package unix -linkpkg -I . bitmatch.cma $$f.ml -o $$f; \
 	  if [ $$? -ne 0 ]; then exit 1; fi; \
+	  echo Running $$f; \
 	  $$f; \
 	  if [ $$? -ne 0 ]; then exit 1; fi; \
 	done
 
+examples:
+	@for f in $(EXAMPLES); do \
+	  echo Building $$f; \
+	  $(OCAMLFIND) ocamlc $(OCAMLFLAGS) $(PP) \
+	    -package unix -linkpkg -I . bitmatch.cma $$f.ml -o $$f; \
+	  if [ $$? -ne 0 ]; then exit 1; fi; \
+	done
+
 print-tests: pa_bitmatch.cmo
 	@for f in $(TESTS); do \
 	  echo Test: $$f.ml; \
@@ -72,8 +81,8 @@ print-tests: pa_bitmatch.cmo
 
 print-examples: pa_bitmatch.cmo
 	@for f in $(EXAMPLES); do \
-	  echo Example: $$f; \
-	  camlp4o bitmatch.cma pa_bitmatch.cmo -printer pr_o.cmo $$f; \
+	  echo Example: $$f.ml; \
+	  camlp4o bitmatch.cma pa_bitmatch.cmo -printer pr_o.cmo $$f.ml; \
 	  if [ $$? -ne 0 ]; then exit 1; fi; \
 	done
 
@@ -82,7 +91,12 @@ print-examples: pa_bitmatch.cmo
 clean:
 	rm -f core *~ *.cmi *.cmo *.cmx *.cma *.cmxa *.a *.o
 	rm -f tests/*~ tests/*.cmi tests/*.cmo $(TESTS)
-	rm -f examples/*~
+	rm -f examples/*~ examples/*.cmi examples/*.cmo $(EXAMPLES)
+
+distclean: clean
+	rm -rf autom4te.cache
+	rm -f config.log config.status
+	rm -f config.h Makefile META bitmatch_config.ml
 
 # Documentation.
 
@@ -139,6 +153,7 @@ check-manifest:
 	rm -f .orig-manifest .check-manifest; \
 	exit $$rv
 
-.PHONY: depend dist check-manifest dpkg doc print-examples print-tests test
+.PHONY: depend dist check-manifest dpkg doc \
+	print-examples print-tests examples test
 
 .SUFFIXES:      .cmo .cmi .cmx .ml .mli .mll
diff --git a/README b/README
index 75edaf5..e6da02d 100644
--- a/README
+++ b/README
@@ -10,11 +10,15 @@ To build:
 	./configure
 	make
 
-	make test		# optional, to run tests
+Other make targets:
 
-	make print-tests	# optional, to print expanded test macros
-	make print-examples	# optional, to print expanded example macros
+	make test		# build and run the test suite
 
-To install, run this as root:
+	make examples		# build the examples
+
+	make print-tests	# print expanded test macros
+	make print-examples	# print expanded example macros
+
+To install (as root):
 
 	make install
-- 
1.8.3.1