cmd-midx: a command for merging multiple .idx files into one.

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index 2249d0e7f376d36fb4aa139d0026872ea7d99c34..2723930586eaa4b6ddead0530101b9fcdb25b707 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,3 @@
-PYINCLUDE:=$(shell python2.5-config --includes)
-PYLIB:=$(shell python2.5-config --lib)
 OS:=$(shell uname | sed 's/[-_].*//')
 MACHINE:=$(shell uname -m)
 CFLAGS=-Wall -g -O2 -Werror $(PYINCLUDE) -g
@@ -22,13 +20,16 @@ endif
 default: all
 
 all: bup-split bup-join bup-save bup-init bup-server bup-index bup-tick \
-       bup randomgen$(EXT) chashsplit$(SOEXT)
+       bup-midx \
+       bup memtest randomgen$(EXT) _hashsplit$(SOEXT)
 
 randomgen$(EXT): randomgen.o
        $(CC) $(CFLAGS) -o $@ $<
 
-chashsplit$(SOEXT): chashsplitmodule.o
-       $(CC) $(CFLAGS) $(LDFLAGS) $(SHARED) -o $@ $< $(PYLIB)
+_hashsplit$(SOEXT): _hashsplit.c csetup.py
+       @rm -f $@
+       python csetup.py build
+       cp build/*/_hashsplit.so .
        
 runtests: all runtests-python runtests-cmdline
 
@@ -45,25 +46,29 @@ test: all
        ./wvtestrun $(MAKE) runtests
 
 %: %.o
-       $(CC) $(CFLAGS) (LDFLAGS) -o $@ $< $(LIBS)
+       $(CC) $(CFLAGS) (LDFLAGS) -o $@ $^ $(LIBS)
        
 bup: bup.py
        rm -f $@
-       ln -s $^ $@
+       ln -s $< $@
        
 bup-%: cmd-%.py
        rm -f $@
-       ln -s $^ $@
+       ln -s $< $@
+       
+%: %.py
+       rm -f $@
+       ln -s $< $@
        
 bup-%: cmd-%.sh
        rm -f $@
-       ln -s $^ $@
+       ln -s $< $@
        
 %.o: %.c
-       gcc -c -o $@ $^ $(CPPFLAGS) $(CFLAGS)
+       gcc -c -o $@ $< $(CPPFLAGS) $(CFLAGS)
 
 clean:
        rm -f *.o *.so *.dll *.exe *~ .*~ *.pyc */*.pyc */*~ \
-               bup bup-* randomgen \
+               bup bup-* randomgen memtest \
                out[12] out2[tc] tags[12] tags2[tc]
-       rm -rf *.tmp
+       rm -rf *.tmp build