Merge in trunk.

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 79b4cc7ae70ea59b7b77c80ed1054826f46ced13..2c2760160a862144f2541861679a0054adaafcd9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,6 +35,8 @@ EXTRA_DIST= \
 
 include libtest/include.am
 include libmemcached/include.am
+include libmemcached/protocol/include.am
+include libmemcached/util/include.am
 include clients/include.am
 include libhashkit/include.am
 include tests/include.am
@@ -64,7 +66,7 @@ generic:
        cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
        cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
 
-rpm: all dist generic fedora
+rpm: all man dist generic fedora
 
 merge-clean:
        find ./ | $(GREP) \.gcda | xargs rm -f
@@ -93,6 +95,4 @@ lcov-clean: clean
        find . -name '*.gcno' | xargs rm -f
        find . -name '*.gcda' | xargs rm -f
 
-CLEANFILES+= config/top.h
-
-
+DISTCLEANFILES+= config/top.h