Update util and fix a few cppcheck warnings.

[m6w6/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4d94c2fc2267fd9667a92c12ef8703dd16114e98..a977a2c5fcbec6153aa9106baf212eaac471ee59 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,14 +19,15 @@ nobase_include_HEADERS =
 check_PROGRAMS =
 EXTRA_HEADERS =
 BUILT_SOURCES=
-EXTRA_DIST= \
-           ${srcdir}/m4/pandora_*.m4 \
-           .quickly \
-           README.FIRST \
-           README.win32 \
-           config/autorun.sh \
-           config/pandora-plugin \
-           config/uncrustify.cfg
+EXTRA_DIST=
+
+EXTRA_DIST+= ${srcdir}/m4/pandora_*.m4
+EXTRA_DIST+= .quickly
+EXTRA_DIST+= README.FIRST
+EXTRA_DIST+= README.win32
+EXTRA_DIST+= config/autorun.sh
+EXTRA_DIST+= config/pandora-plugin
+EXTRA_DIST+= config/uncrustify.cfg
 
 include libtest/include.am
 
@@ -47,6 +48,7 @@ include libmemcachedprotocol/include.am
 include libmemcachedinternal/include.am
 include libmemcachedinternal/util/include.am
 include poll/include.am
+include rpm.am
 include support/include.am
 include tests/include.am
 include util/include.am
@@ -59,34 +61,6 @@ TESTS += ${check_PROGRAMS}
 
 EXTRA_DIST+= ${man_MANS}
 
-fedora:
-       @rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
-       @rm -f ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
-       @cp libmemcached-$(VERSION).tar.gz ~/rpmbuild/SOURCES/
-       @rpmbuild -ba support/libmemcached.spec
-       @cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
-       @cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
-
-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/
-       @rpmbuild -ba support/libmemcached.spec
-       @cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
-       @cp ~/rpmbuild/RPMS/x86_64/libmemcached-devel-$(VERSION)*.rpm .
-       @cp ~/rpmbuild/RPMS/x86_64/libmemcached-debuginfo-$(VERSION)*.rpm .
-       @cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
-
-rpm: man distcheck generic
-
-release: rpm
-       @rpm --addsign libmemcached-$(VERSION)*.rpm .
-       @rpm --checksig libmemcached-$(VERSION)*.rpm .
-       @rpm --addsign libmemcached-devel-$(VERSION)*.rpm .
-       @rpm --checksig libmemcached-devel-$(VERSION)*.rpm .
-       @rpm --addsign libmemcached-debuginfo-$(VERSION)*.rpm .
-       @rpm --checksig libmemcached-debuginfo-$(VERSION)*.rpm .
-
 merge-clean:
        @find ./ | $(GREP) \.gcda | xargs rm -f
        @find ./ | $(GREP) \.gcno | xargs rm -f