# 
# 
# patch "ChangeLog"
#  from [c848fe552591ab672e17580bfe8d6b2cfd58a32d]
#    to [875ce6d50d9cc8ff4f8cbd2542ddc8f8451d5d39]
# 
# patch "Makefile.am"
#  from [daaf64a8c9fe9b65795f269ea47a9842bb804de7]
#    to [73bbbf9fadf07f9f85d194f011de6671b8dbbbda]
# 
============================================================
--- ChangeLog	c848fe552591ab672e17580bfe8d6b2cfd58a32d
+++ ChangeLog	875ce6d50d9cc8ff4f8cbd2542ddc8f8451d5d39
@@ -1,5 +1,9 @@
 2006-01-11  Richard Levitte  <address@hidden>
 
+	* Makefile.am: Add contrib/usher as an extra program.  This works
+	as a reminder that this program exists, and provides supported
+	ways to build it.
+
 	* contrib/usher.cc: Add a -m switch, to be able to specify the
 	name or complete path of/to the monotone binary, in case there
 	are several floating around on the system.
============================================================
--- Makefile.am	daaf64a8c9fe9b65795f269ea47a9842bb804de7
+++ Makefile.am	73bbbf9fadf07f9f85d194f011de6671b8dbbbda
@@ -223,8 +223,10 @@
 bin_PROGRAMS = monotone
 check_PROGRAMS = unit_tests
 noinst_PROGRAMS = txt2c 
+EXTRA_PROGRAMS = usher 
 
 monotone_SOURCES = $(MOST_SOURCES) monotone.cc main.cc
+usher_SOURCES = contrib/usher.cc
 unit_tests_SOURCES = $(MOST_SOURCES) unit_tests.cc crypto_tests.cc
 
 txt2c_SOURCES = txt2c.cc