Fixes condition where we were not correctly setting weighted vs not.

[m6w6/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f033421ad07b8955ba651647ce7d8e3618676796..127c071a17647d8bc95172fa084e42251e080950 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,17 +19,20 @@ 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
 
+libtest_libtest_la_DEPENDENCIES+= memcached/memcached
+
 include libhashkit-1.0/include.am
 include libmemcached-1.0/include.am
 include libmemcachedprotocol-0.0/include.am
@@ -49,6 +52,7 @@ include support/include.am
 include tests/include.am
 include util/include.am
 include win32/include.am
+include memcached/include.am
 
 docs: html man
 
@@ -59,12 +63,18 @@ EXTRA_DIST+= ${man_MANS}
 fedora:
        @rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
        @rm -f ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
+       @mkdir -p ~/rpmbuild/SOURCES/
+       @mkdir -p ~/rpmbuild/RPMS/x86_64/
+       @mkdir -p ~/rpmbuild/SRPMS/
        @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
+       @mkdir -p ~/rpmbuild/SOURCES/
+       @mkdir -p ~/rpmbuild/RPMS/x86_64/
+       @mkdir -p ~/rpmbuild/SRPMS/
        @rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
        @rm -f ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
        @cp libmemcached-$(VERSION).tar.gz ~/rpmbuild/SOURCES/
@@ -74,7 +84,12 @@ generic: support/libmemcached.spec
        @cp ~/rpmbuild/RPMS/x86_64/libmemcached-debuginfo-$(VERSION)*.rpm .
        @cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
 
-rpm: man distcheck generic
+clean_rpm:
+       @rm -f *.tar.gz
+       @rm -f *.src.rpm
+       @rm -f *.rpm
+
+rpm: clean_rpm man distcheck generic
 
 release: rpm
        @rpm --addsign libmemcached-$(VERSION)*.rpm .