hg merge binary, resolving one conflict by choosing left (new 0.17 version)

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 51c7b70621a6726d6b1665d4927dfff65733e94b..7c23b7411e4afbc1ff873a6cc608686498ffa039 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES = include
 SUBDIRS = docs include lib src tests support
+EXTRA_dist = README.FIRST
 
 test: all
        cd tests; make test; cd ..
@@ -10,10 +11,6 @@ test-extended: all
 valgrind:
        cd tests; make valgrind; cd ..
 
-valgrind-extended:
-       cd tests; make valgrind-extended; cd ..
-
-
 rpm: all dist
        cp libmemcached-$(VERSION).tar.gz /home/brian/rpmbuild/SOURCES/
        rpmbuild -ba support/libmemcached.spec