X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=4394dec47fa2009b9aacdb0636a9a1d944cf28c8;hb=35811e5efa56436f7f0e03c68bc8cf78f2b2c1c4;hp=82b19a4d91e921883d3602791831d0882936b606;hpb=b2beb16e38f248ecc3a7253a5cf75de2056bb137;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 82b19a4d..4394dec4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,10 @@
-ACLOCAL_AMFLAGS = -I m4
+# vim:ft=automake
+
+ACLOCAL_AMFLAGS = -I m4 -I libtest/m4
 
 # includes append to these:
 SUFFIXES =
-PHONY =
+.PHONY =
 TESTS =
 CLEANFILES =
 DISTCLEANFILES =
@@ -17,34 +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
+
+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 rpm.am
+include support/include.am
+include tests/include.am
+include util/include.am
 include win32/include.am
-include docs/include.am
+
+include m4/include.am
 
 docs: html man
 
@@ -52,41 +60,14 @@ 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:
-	@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