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

[m6w6/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b47dfc827666bad98a2782c0e2b78c2805a1455c..127c071a17647d8bc95172fa084e42251e080950 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+# vim:ft=automake
+
 ACLOCAL_AMFLAGS = -I m4
 
 # includes append to these:
@@ -17,35 +19,40 @@ 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 \
-           m4/ac_cxx_header_stdcxx_98.m4 \
-           m4/acx_pthread.m4  \
-           m4/gettext.m4 \
-           m4/iconv.m4 \
-           m4/pkg.m4 \
-           m4/po.m4 \
-           m4/progtest.m4
+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
-include libmemcached/include.am
-include libmemcached/protocol/include.am
-include libmemcached/util/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
+include libmemcachedutil-1.0/include.am
+
 include clients/include.am
-include libhashkit/include.am
-include tests/include.am
+include docs/include.am
 include example/include.am
-include support/include.am
+include libhashkit/include.am
+include libmemcached/include.am
+include libmemcachedutil/include.am
+include libmemcachedprotocol/include.am
+include libmemcachedinternal/include.am
+include libmemcachedinternal/util/include.am
 include poll/include.am
+include support/include.am
+include tests/include.am
 include util/include.am
 include win32/include.am
-include docs/include.am
+include memcached/include.am
 
 docs: html man
 
@@ -56,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/
@@ -71,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 .