# 
# 
# rename "contrib/usher.cc"
#     to "usher.cc"
# 
# patch "Makefile.am"
#  from [380383c22ef6bb6b1d7203b215dbed739c249c63]
#    to [c7b6cea218bf3bb4d91931b33c448d7fd42550f4]
# 
============================================================
--- Makefile.am	380383c22ef6bb6b1d7203b215dbed739c249c63
+++ Makefile.am	c7b6cea218bf3bb4d91931b33c448d7fd42550f4
@@ -220,13 +220,12 @@
 
 # primaries
 
-bin_PROGRAMS = monotone
+bin_PROGRAMS = monotone monotone-usher
 check_PROGRAMS = unit_tests
 noinst_PROGRAMS = txt2c 
-EXTRA_PROGRAMS = usher 
 
 monotone_SOURCES = $(MOST_SOURCES) monotone.cc main.cc
-usher_SOURCES = contrib/usher.cc
+monotone_usher_SOURCES = usher.cc
 unit_tests_SOURCES = $(MOST_SOURCES) unit_tests.cc crypto_tests.cc
 
 txt2c_SOURCES = txt2c.cc