X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=895debbc01a83515345979683eec4401ec62dccd;hb=dbc62573e1a6dc8cbcc97d0898e8615b0916d6ab;hp=7432e682d45d3cb5fe2dbc429892d5cc7c8e7c47;hpb=5356e466e864b310a0195b72ce232197827bbe4e;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 7432e682..895debbc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,7 +74,7 @@ endif
 
 include libmemcachedinternal/include.am
 include libmemcachedinternal/util/include.am
-include rpm/include.am
+include rpm/include.mk
 include support/include.am
 include tests/include.am
 include util/include.am
@@ -96,7 +96,6 @@ merge-clean:
 	@find ./ | $(GREP) \.moved | xargs rm -r -f
 	@find ./ | $(GREP) \\.orig | xargs rm -f
 	@find ./ | $(GREP) \.rej | xargs rm -f
-	@rm -f *\.rpm
 	@find ./ | $(GREP) \.THIS | xargs rm -f
 	@find ./ | $(GREP) \.OTHER | xargs rm -f
 	@find ./ | $(GREP) \.BASE | xargs rm -f
@@ -104,7 +103,7 @@ merge-clean:
 	@echo "Files that need to be either removed or checked in:"
 	@bzr unknowns
 
-clean-local: clean-libtest-check clean-docs-check
+clean-local: clean-libtest-check clean-docs-check clean-rpm
 
 
 lcov: lcov-clean check
@@ -126,8 +125,6 @@ DISTCLEANFILES+= config/top.h
 
 maintainer-clean-local:
 	find . -type f -name '*~' -exec rm -f '{}' \;
-	-rm -f @PACKAGE@-*.rpm
-	-rm -f @PACKAGE@-*.tar.gz
 	-rm -f man/*.1
 	-rm -f man/*.3
 	-rm -f man/*.8
@@ -141,6 +138,7 @@ maintainer-clean-local:
 	-rm -f build-aux/install-sh
 	-rm -f build-aux/ltmain.sh
 	-rm -f build-aux/missing
+	-rm -f build-aux/test-driver
 	-rm -f build-aux/ylwrap
 	-rm -f mem_config.in
 	-rm -f config.log
@@ -154,4 +152,4 @@ maintainer-clean-local:
 	-rm -f m4/test-driver
 	-rmdir build-aux
 	-rm -rf ${top_builddir}/html
-	-rm -f bootstrap
+	-rm -f $(DIST_ARCHIVES)