git » nmdb » commit a7b6e86

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..3fcab55
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,33 @@
+
+all: default
+
+default: nmdb libnmdb
+
+nmdb:
+	make -C nmdb
+
+libnmdb:
+	make -C libnmdb
+
+install:
+	make -C nmdb install
+	make -C libnmdb install
+
+clean:
+	make -C nmdb clean
+	make -C libnmdb clean
+
+
+python:
+	cd bindings/python && python setup.py build
+
+python_install:
+	cd bindings/python && python setup.py install
+
+python_clean:
+	cd bindings/python && rm -rf build/
+
+
+.PHONY: default all clean nmdb libnmdb python python_install python_clean
+
+
diff --git a/README b/README
index e8bd54e..13339fa 100644
--- a/README
+++ b/README
@@ -32,23 +32,26 @@ http://auriga.wearlab.de/~alb/nmdb.
 How to compile, test and install
 --------------------------------
 
-Requisites:
- * Running Linux kernel >= 2.6.16 with TIPC enabled.
- * Kernel headers also >= 2.6.16. Alternatively, you can run a TIPC patched
-     kernel, and have the tipc.h header be put somewhere in the include path
-     by hand.
+General requisites:
  * libevent (http://www.monkey.org/~provos/libevent/).
  * qdbm (http://qdbm.sf.net/).
 
-To compile the server and the library, you can just use "make" on their
-directories. To install them, use "make install".
+Requisites to enable TIPC:
+ * Running Linux kernel >= 2.6.16 with TIPC enabled.
+ * Kernel headers also >= 2.6.16. Alternatively, you can run a TIPC patched
+     kernel, and have the tipc.h header somewhere in the include path.
+
+To compile the server and the library, you can just use "make" on the top
+level directory. To install them, use "make install". By default, all
+protocols are enabled, including TIPC. To disable any of them, run something
+like "make ENABLE_TIPC=0".
 
 To run some tests, start the server and then go to the "tests/c/" directory.
 Run "build.sh build" and then run any of the generated tests.
 
 To compile the Python bindings, you need to have the library already
-installed. Go to the directory and run "python setup.py install", which will
-build and install the modules. The module will be named "nmdb".
+installed. Use "make python_install" at the top level directory to build and
+install the modules. The module will be named "nmdb".
 
 
 Where to report bugs