Start using wvtest.sh for shell-based tests in test-sh.

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index d0df36c99d707de0aee2d3d9b6636e945da21308..3209e8a98a8334ef4d9084f5aea2e6724ca88b6b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,34 +1,42 @@
-CFLAGS=-Wall -g -O2 -Werror -I/usr/include/python2.5 -g -fPIC
+PYINCLUDE:=$(shell python2.5-config --includes)
+PYLIB:=$(shell python2.5-config --lib)
+OS:=$(shell uname)
+MACHINE:=$(shell uname -m)
+CFLAGS=-Wall -g -O2 -Werror $(PYINCLUDE) -g -fPIC
+SHARED=-shared
+
+ifeq (${OS},Darwin)
+  CFLAGS += -arch $(MACHINE)
+  SHARED = -dynamiclib
+endif
 
 default: all
 
-all: bup-split bup-join bup randomgen hashsplit.so
+all: bup-split bup-join bup-save bup-init bup-server bup-index \
+       bup randomgen chashsplit.so
 
 randomgen: randomgen.o
+       $(CC) $(CFLAGS) -o $@ $<
 
-hashsplit.so: hashsplitmodule.o
-       $(CC) -shared -o $@ $<
+chashsplit.so: chashsplitmodule.o
+       $(CC) $(CFLAGS) $(SHARED) -o $@ $< $(PYLIB)
        
-runtests: all
+runtests: all runtests-python runtests-cmdline
+
+runtests-python:
        ./wvtest.py $(wildcard t/t*.py)
        
 runtests-cmdline: all
-       @echo "Testing \"$@\" in Makefile:"
-       ./bup split -b <testfile1 >tags1
-       ./bup split -b 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
-       
-test: all runtests-cmdline
+       t/test.sh
+       
+stupid:
+       PATH=/bin:/usr/bin $(MAKE) test
+       
+test: all
        ./wvtestrun $(MAKE) runtests
 
 %: %.o
-       gcc -o $@ $< $(LDFLAGS) $(LIBS)
+       $(CC) $(CFLAGS) (LDFLAGS) -o $@ $< $(LIBS)
        
 bup: bup.py
        rm -f $@
@@ -46,6 +54,7 @@ bup-%: cmd-%.sh
        gcc -c -o $@ $^ $(CPPFLAGS) $(CFLAGS)
 
 clean:
-       rm -f *.o *.so *~ .*~ *.pyc \
-               bup bup-split bup-join randomgen \
-               out[12] tags[12]
+       rm -f *.o *.so *~ .*~ *.pyc */*.pyc */*~ \
+               bup bup-* randomgen \
+               out[12] out2[tc] tags[12] tags2[tc]
+       rm -rf *.tmp