X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=61bee31780e92cc580ce66a7e449482ca83fb12f;hb=a7df49566dd006c5725eabcd11aab958cf8e5600;hp=8a95b8c260d5821bdc4711848e14fa0597556299;hpb=fee8381b6b80398fcb6893860400ead6a598f15b;p=m6w6%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 8a95b8c2..61bee317 100644
--- 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
+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
 
-libmemcached_libmemcached_la_LDFLAGS=
+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 docs/include.am
 include example/include.am
 include libhashkit/include.am
-include libmemcached-1.0/include.am
-include libhashkit-1.0/include.am
-include libmemcachedprotocol-0.0/include.am
 include libmemcached/include.am
-include libmemcached/util/include.am
-include libmemcached/protocol/include.am
+include libmemcachedutil/include.am
+include libmemcachedprotocol/include.am
 include libmemcachedinternal/include.am
 include libmemcachedinternal/util/include.am
-include libtest/include.am
 include poll/include.am
 include support/include.am
 include tests/include.am
 include util/include.am
 include win32/include.am
+include memcached/include.am
 
 docs: html man
 
@@ -71,7 +78,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 .