Merge in refactor of storage such that it is laid out without prototypes.

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 65e07090f26d3de5d1ffca1f19b0ff4d37c89c23..b47dfc827666bad98a2782c0e2b78c2805a1455c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 # includes append to these:
 SUFFIXES =
-PHONY =
+.PHONY =
 TESTS =
 CLEANFILES =
 DISTCLEANFILES =
@@ -43,6 +43,7 @@ include tests/include.am
 include example/include.am
 include support/include.am
 include poll/include.am
+include util/include.am
 include win32/include.am
 include docs/include.am
 
@@ -60,7 +61,7 @@ fedora:
        @cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
        @cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
 
-generic:
+generic: support/libmemcached.spec
        @rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
        @rm -f ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
        @cp libmemcached-$(VERSION).tar.gz ~/rpmbuild/SOURCES/
@@ -87,6 +88,9 @@ merge-clean:
        @find ./ | $(GREP) \.orig | xargs rm -f
        @find ./ | $(GREP) \.rej | xargs rm -f
        @find ./ | $(GREP) \.rpm | xargs rm -f
+       @find ./ | $(GREP) \.THIS | xargs rm -f
+       @find ./ | $(GREP) \.OTHER | xargs rm -f
+       @find ./ | $(GREP) \.BASE | xargs rm -f
        @find ./ | $(GREP) \~$$ | xargs rm -f
        @echo "Files that need to be either removed or checked in:"
        @bzr unknowns