X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=77f38e5b4909ea182de0ff866992840c1bb927b9;hb=7bca10ca93172c1417f10c630a13c7aa88617ded;hp=4d94c2fc2267fd9667a92c12ef8703dd16114e98;hpb=c47f06ddcf0d108912b7e242f7b4151fdede2e0a;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 4d94c2fc..77f38e5b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # vim:ft=automake
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 -I libtest/m4
 
 # includes append to these:
 SUFFIXES =
@@ -19,18 +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=
 
-include libtest/include.am
+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
+
+aclocaldir= $(datadir)/aclocal
+dist_aclocal_DATA=
 
-libtest_libtest_la_DEPENDENCIES+= memcached/memcached
+include libtest/include.am
 
 include libhashkit-1.0/include.am
 include libmemcached-1.0/include.am
@@ -39,6 +41,7 @@ include libmemcachedutil-1.0/include.am
 
 include clients/include.am
 include docs/include.am
+include man/include.am
 include example/include.am
 include libhashkit/include.am
 include libmemcached/include.am
@@ -47,53 +50,26 @@ 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
 include win32/include.am
-include memcached/include.am
 
-docs: html man
+include m4/include.am
 
 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
 	@find ./ | $(GREP) \.gz | xargs rm -f
-	@find ./ | $(GREP) \.orig | xargs rm -f
+	@find ./ | $(GREP) \.moved | xargs rm -r -f
+	@find ./ | $(GREP) \\.orig | xargs rm -f
 	@find ./ | $(GREP) \.rej | xargs rm -f
-	@find ./ | $(GREP) \.rpm | xargs rm -f
+	@rm -f *\.rpm
 	@find ./ | $(GREP) \.THIS | xargs rm -f
 	@find ./ | $(GREP) \.OTHER | xargs rm -f
 	@find ./ | $(GREP) \.BASE | xargs rm -f