-CFLAGS=-Wall -g -O2 -Werror -I/usr/include/python2.5 -g -fPIC
+OS:=$(shell uname | sed 's/[-_].*//')
+CFLAGS=-Wall -g -O2 -Werror $(PYINCLUDE) -g
+ifneq ($(OS),CYGWIN)
+ CFLAGS += -fPIC
+endif
+SHARED=-shared
+SOEXT:=.so
+
+ifeq (${OS},Darwin)
+ MACHINE:=$(shell arch)
+ CFLAGS += -arch $(MACHINE)
+ SHARED = -dynamiclib
+endif
+ifeq ($(OS),CYGWIN)
+ LDFLAGS += -L/usr/bin
+ EXT:=.exe
+ SOEXT:=.dll
+endif
default: all
-all: bup-split bup-join bup-save bup randomgen chashsplit.so
+all: bup Documentation/all
+
+bup: lib/bup/_version.py lib/bup/_helpers$(SOEXT) cmds
+
+Documentation/all: bup
+
+INSTALL=install
+PYTHON=python
+MANDIR=$(DESTDIR)/usr/share/man
+DOCDIR=$(DESTDIR)/usr/share/doc/bup
+BINDIR=$(DESTDIR)/usr/bin
+LIBDIR=$(DESTDIR)/usr/lib/bup
+install: all
+ $(INSTALL) -d $(MANDIR)/man1 $(DOCDIR) $(BINDIR) \
+ $(LIBDIR)/bup $(LIBDIR)/cmd $(LIBDIR)/tornado \
+ $(LIBDIR)/web $(LIBDIR)/web/static
+ [ ! -e Documentation/.docs-available ] || \
+ $(INSTALL) -m 0644 \
+ Documentation/*.1 \
+ $(MANDIR)/man1
+ [ ! -e Documentation/.docs-available ] || \
+ $(INSTALL) -m 0644 \
+ Documentation/*.html \
+ $(DOCDIR)
+ $(INSTALL) -m 0755 bup $(BINDIR)
+ $(INSTALL) -m 0755 \
+ cmd/bup-* \
+ $(LIBDIR)/cmd
+ $(INSTALL) -m 0644 \
+ lib/bup/*.py \
+ $(LIBDIR)/bup
+ $(INSTALL) -m 0755 \
+ lib/bup/*$(SOEXT) \
+ $(LIBDIR)/bup
+ $(INSTALL) -m 0644 \
+ lib/tornado/*.py \
+ $(LIBDIR)/tornado
+ $(INSTALL) -m 0644 \
+ lib/web/static/* \
+ $(LIBDIR)/web/static/
+ $(INSTALL) -m 0644 \
+ lib/web/*.html \
+ $(LIBDIR)/web/
+%/all:
+ $(MAKE) -C $* all
+
+%/clean:
+ $(MAKE) -C $* clean
-randomgen: randomgen.o
+lib/bup/_helpers$(SOEXT): \
+ lib/bup/bupsplit.c lib/bup/_helpers.c lib/bup/csetup.py
+ @rm -f $@
+ cd lib/bup && $(PYTHON) csetup.py build
+ cp lib/bup/build/*/_helpers$(SOEXT) lib/bup/
+
+.PHONY: lib/bup/_version.py
+lib/bup/_version.py:
+ rm -f $@ $@.new
+ ./format-subst.pl $@.pre >$@.new
+ mv $@.new $@
+
+runtests: all runtests-python runtests-cmdline
+
+runtests-python:
+ $(PYTHON) wvtest.py $(wildcard t/t*.py lib/*/t/t*.py)
-chashsplit.so: chashsplitmodule.o
- $(CC) -shared -o $@ $<
-
-runtests: all
- ./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 $$(cat tags1) >out1
- ./bup join <tags2 >out2
- diff -u testfile1 out1
- diff -u testfile2 out2
-
-test: all runtests-cmdline
- ./wvtestrun $(MAKE) runtests
+ t/test.sh
+
+stupid:
+ PATH=/bin:/usr/bin $(MAKE) test
+
+test: all
+ ./wvtestrun $(MAKE) PYTHON=$(PYTHON) runtests
+
+check: test
%: %.o
- gcc -o $@ $< $(LDFLAGS) $(LIBS)
-
-bup: bup.py
+ $(CC) $(CFLAGS) (LDFLAGS) -o $@ $^ $(LIBS)
+
+bup: main.py
rm -f $@
- ln -s $^ $@
-
-bup-%: cmd-%.py
+ ln -s $< $@
+
+cmds: $(patsubst cmd/%-cmd.py,cmd/bup-%,$(wildcard cmd/*-cmd.py))
+
+cmd/bup-%: cmd/%-cmd.py
rm -f $@
- ln -s $^ $@
-
+ ln -s $*-cmd.py $@
+
+%: %.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 *~ .*~ *.pyc */*.pyc */*~ \
- bup bup-split bup-join bup-save randomgen \
- out[12] tags[12]
+clean: Documentation/clean
+ rm -f *.o lib/*/*.o *.so lib/*/*.so *.dll *.exe \
+ .*~ *~ */*~ lib/*/*~ lib/*/*/*~ \
+ *.pyc */*.pyc lib/*/*.pyc lib/*/*/*.pyc \
+ bup bup-* cmd/bup-* lib/bup/_version.py randomgen memtest \
+ out[12] out2[tc] tags[12] tags2[tc]
+ rm -rf *.tmp t/*.tmp lib/*/*/*.tmp build lib/bup/build