X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=127c071a17647d8bc95172fa084e42251e080950;hb=e9c7a25491f4cf9265a926b7d9848bd70acaf7aa;hp=d19991ecd98a55fd645f07447747f2456589118c;hpb=bd53173d0a23c8c2a0dac68056cbd2cc52d5a6ef;p=m6w6%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index d19991ec..127c071a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+# vim:ft=automake
+
 ACLOCAL_AMFLAGS = -I m4
 
 # includes append to these:
@@ -17,19 +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=
 
-libmemcached_libmemcached_la_LDFLAGS=
+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 .