Merge branch 'maint'

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index a007484646be1f3206681fdf97534ba11c522e7f..65a8e3d8c22ace200b2abe915a1b0ef48c07889c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 OS:=$(shell uname | sed 's/[-_].*//')
-MACHINE:=$(shell uname -m)
 CFLAGS=-Wall -g -O2 -Werror $(PYINCLUDE) -g
 ifneq ($(OS),CYGWIN)
   CFLAGS += -fPIC
@@ -8,6 +7,7 @@ SHARED=-shared
 SOEXT:=.so
 
 ifeq (${OS},Darwin)
+  MACHINE:=$(shell arch)
   CFLAGS += -arch $(MACHINE)
   SHARED = -dynamiclib
 endif
@@ -19,56 +19,108 @@ endif
 
 default: all
 
-all: bup-split bup-join bup-save bup-init bup-server bup-index bup-tick \
-       bup-midx bup-fuse bup-ls bup-damage bup-fsck bup-margin bup-drecurse \
-       bup memtest randomgen$(EXT) _hashsplit$(SOEXT)
+all: bup Documentation/all
 
-randomgen$(EXT): randomgen.o
-       $(CC) $(CFLAGS) -o $@ $<
+bup: lib/bup/_version.py lib/bup/_helpers$(SOEXT) cmds
 
-_hashsplit$(SOEXT): _hashsplit.c csetup.py
+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
+       [ ! -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/* \
+               $(LIBDIR)/web
+%/all:
+       $(MAKE) -C $* all
+
+%/clean:
+       $(MAKE) -C $* clean
+
+lib/bup/_helpers$(SOEXT): \
+               lib/bup/bupsplit.c lib/bup/_helpers.c lib/bup/csetup.py
        @rm -f $@
-       python csetup.py build
-       cp build/*/_hashsplit.so .
-       
+       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:
-       ./wvtest.py $(wildcard t/t*.py)
-       
+       $(PYTHON) wvtest.py $(wildcard t/t*.py lib/*/t/t*.py)
+
 runtests-cmdline: all
        t/test.sh
-       
+
 stupid:
        PATH=/bin:/usr/bin $(MAKE) test
-       
+
 test: all
-       ./wvtestrun $(MAKE) runtests
+       ./wvtestrun $(MAKE) PYTHON=$(PYTHON) runtests
+
+check: test
 
 %: %.o
        $(CC) $(CFLAGS) (LDFLAGS) -o $@ $^ $(LIBS)
-       
-bup: bup.py
+
+bup: main.py
        rm -f $@
        ln -s $< $@
-       
-bup-%: cmd-%.py
+
+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 $< $@
-       
+
 %.o: %.c
        gcc -c -o $@ $< $(CPPFLAGS) $(CFLAGS)
 
-clean:
-       rm -f *.o *.so *.dll *.exe *~ .*~ *.pyc */*.pyc */*~ \
-               bup bup-* randomgen memtest \
+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 build
+       rm -rf *.tmp t/*.tmp lib/*/*/*.tmp build lib/bup/build