A few 32-bit fixes.

[m6w6/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b342d8661ee86d12492909e5205fb1e3e1cb7a27..446e8ae8bd45bb474ed7bdfe3187502d275b6b72 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
-INCLUDES = 
-SUBDIRS = docs libmemcached tests support clients
+ACLOCAL_AMFLAGS = -I config
+
+SUBDIRS = docs libmemcached libmemcachedutil tests support clients
 EXTRA_dist = README.FIRST
 
 test: all
@@ -11,8 +12,23 @@ test-extended: all
 valgrind:
        @(cd tests; ${MAKE} valgrind)
 
-rpm: all dist
-       cp libmemcached-$(VERSION).tar.gz /home/brian/rpm/SOURCES/
+test-no-outputdiff:
+       @(cd tests; ${MAKE} test-no-outputdiff)
+
+fedora:
+       rm ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
+       rm ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
+       cp libmemcached-$(VERSION).tar.gz /home/brian/rpmbuild/SOURCES/
        rpmbuild -ba support/libmemcached.spec
-       cp /home/brian/rpm/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
-       cp /home/brian/rpm/SRPMS/libmemcached-$(VERSION)*.rpm .
+       cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
+       cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
+
+generic:
+       rm ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
+       rm ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
+       cp libmemcached-$(VERSION).tar.gz /home/brian/rpmbuild/SOURCES/
+       rpmbuild -ba support/libmemcached.spec
+       cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
+       cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
+
+rpm: all dist generic fedora