This adds the long-awaited indexfile feature, so you no longer have to feed

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index f57f6e957463ceb592c4f0b3d5a0a174090fae9a..7c24fa1fbd950047af51667310745cfa8f272178 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,33 +1,52 @@
-CFLAGS=-Wall -g -O2 -Werror -I/usr/include/python2.5 -g -fwrapv -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: hashsplit hashjoin datagen hashsplit.so
+all: bup-split bup-join bup-save bup-init bup-server bup-index bup-tick \
+       bup randomgen chashsplit.so
 
-hashsplit: hashsplit.o
+randomgen: randomgen.o
+       $(CC) $(CFLAGS) -o $@ $<
 
-datagen: datagen.o
-
-hashjoin: hashjoin.sh
-
-hashsplit.so: hashsplitmodule.o
-       $(CC) -shared -Wl,-Bsymbolic-functions -o $@ $<
+chashsplit.so: chashsplitmodule.o
+       $(CC) $(CFLAGS) $(SHARED) -o $@ $< $(PYLIB)
+       
+runtests: all runtests-python runtests-cmdline
 
+runtests-python:
+       ./wvtest.py $(wildcard t/t*.py)
+       
+runtests-cmdline: all
+       t/test.sh
+       
+stupid:
+       PATH=/bin:/usr/bin $(MAKE) test
+       
 test: all
-       ./hashsplit.py <testfile1 >tags1
-       ./hashsplit.py <testfile2 >tags2
-       diff -u tags1 tags2 || true
-       wc -c testfile1 testfile2
-       wc -l tags1 tags2
-       ./hashjoin <tags1 >out1
-       ./hashjoin <tags2 >out2
-       diff -u testfile1 out1
-       diff -u testfile2 out2
+       ./wvtestrun $(MAKE) runtests
 
 %: %.o
-       gcc -o $@ $< $(LDFLAGS) $(LIBS)
+       $(CC) $(CFLAGS) (LDFLAGS) -o $@ $< $(LIBS)
+       
+bup: bup.py
+       rm -f $@
+       ln -s $^ $@
+       
+bup-%: cmd-%.py
+       rm -f $@
+       ln -s $^ $@
        
-%: %.sh
+bup-%: cmd-%.sh
        rm -f $@
        ln -s $^ $@
        
@@ -35,5 +54,7 @@ test: all
        gcc -c -o $@ $^ $(CPPFLAGS) $(CFLAGS)
 
 clean:
-       rm -f *.o *.so *~ hashsplit hashjoin hsplit hjoin 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