Turned on more warnings, and fixed the errors. Moved common.h, which includes

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7c23b7411e4afbc1ff873a6cc608686498ffa039..95382924e5482886040ea24d3b02a32c3ec6d7c7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,34 @@
-INCLUDES = include
-SUBDIRS = docs include lib src tests support
+ACLOCAL_AMFLAGS = -I config
+INCLUDES = 
+SUBDIRS = docs libmemcached libmemcachedutil tests support clients
 EXTRA_dist = README.FIRST
 
 test: all
-       cd tests; make test; cd ..
+       @(cd tests; ${MAKE} test)
 
 test-extended: all
-       cd tests; make test-extended; cd ..
+       @(cd tests; ${MAKE} test-extended)
 
 valgrind:
-       cd tests; make valgrind; cd ..
+       @(cd tests; ${MAKE} valgrind)
 
-rpm: all dist
+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/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
-       cp /home/brian/rpmbuild/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