Extremely basic 'bup server' support.

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index b07f7d07a78729b3c5ea577f38957d4857b06447..e19cd3b00215ef75a82e2f73a4186f073c2d12a7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,23 +2,21 @@ CFLAGS=-Wall -g -O2 -Werror -I/usr/include/python2.5 -g -fPIC
 
 default: all
 
-all: bup-split bup-join bup datagen hashsplit.so
+all: bup-split bup-join bup-save bup-init bup-server bup randomgen chashsplit.so
 
-datagen: datagen.o
+randomgen: randomgen.o
 
-hashsplit.so: hashsplitmodule.o
+chashsplit.so: chashsplitmodule.o
        $(CC) -shared -o $@ $<
-
-test: all
-       ./bup split <testfile1 >tags1
-       ./bup split <testfile2 >tags2
-       diff -u tags1 tags2 || true
-       wc -c testfile1 testfile2
-       wc -l tags1 tags2
-       ./bup join <tags1 >out1
-       ./bup join <tags2 >out2
-       diff -u testfile1 out1
-       diff -u testfile2 out2
+       
+runtests: all
+       ./wvtest.py $(wildcard t/t*.py)
+       
+runtests-cmdline: all
+       ./test-sh
+       
+test: all runtests-cmdline
+       ./wvtestrun $(MAKE) runtests
 
 %: %.o
        gcc -o $@ $< $(LDFLAGS) $(LIBS)
@@ -39,6 +37,7 @@ bup-%: cmd-%.sh
        gcc -c -o $@ $^ $(CPPFLAGS) $(CFLAGS)
 
 clean:
-       rm -f *.o *.so *~ .*~ *.pyc \
-               bup bup-split bup-join datagen \
-               out[12] tags[12]
+       rm -f *.o *.so *~ .*~ *.pyc */*.pyc */*~ \
+               bup bup-* randomgen \
+               out[12] out2[tc] tags[12] tags2[tc]
+       rm -rf *.tmp