Add *.tmp.meta to .gitignore and to "make clean".

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index 3194a06dde72d05d7293b8fb10caacb3af02c7ae..ccecfc68ef9ed9683871db493c83bc93658c8ef1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,8 @@
 OS:=$(shell uname | sed 's/[-_].*//')
-CFLAGS=-Wall -g -O2 -Werror $(PYINCLUDE) -g
-ifneq ($(OS),CYGWIN)
-  CFLAGS += -fPIC
-endif
-SHARED=-shared
+CFLAGS:=-Wall -O2 -Werror $(PYINCLUDE)
 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
 
@@ -27,10 +16,11 @@ 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
+PREFIX=/usr
+MANDIR=$(DESTDIR)$(PREFIX)/share/man
+DOCDIR=$(DESTDIR)$(PREFIX)/share/doc/bup
+BINDIR=$(DESTDIR)$(PREFIX)/bin
+LIBDIR=$(DESTDIR)$(PREFIX)/lib/bup
 install: all
        $(INSTALL) -d $(MANDIR)/man1 $(DOCDIR) $(BINDIR) \
                $(LIBDIR)/bup $(LIBDIR)/cmd $(LIBDIR)/tornado \
@@ -68,10 +58,16 @@ install: all
 %/clean:
        $(MAKE) -C $* clean
 
+config/config.h: config/Makefile config/configure config/configure.inc \
+               $(wildcard config/*.in)
+       cd config && $(MAKE) config.h
+
 lib/bup/_helpers$(SOEXT): \
+               config/config.h \
                lib/bup/bupsplit.c lib/bup/_helpers.c lib/bup/csetup.py
        @rm -f $@
-       cd lib/bup && $(PYTHON) csetup.py build
+       cd lib/bup && \
+       LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" $(PYTHON) csetup.py build
        cp lib/bup/build/*/_helpers$(SOEXT) lib/bup/
 
 .PHONY: lib/bup/_version.py
@@ -83,10 +79,14 @@ lib/bup/_version.py:
 runtests: all runtests-python runtests-cmdline
 
 runtests-python:
-       $(PYTHON) wvtest.py $(wildcard t/t*.py lib/*/t/t*.py)
+       $(PYTHON) wvtest.py \
+               $(wildcard t/t*.py) \
+               $(filter-out lib/bup/t/tmetadata.py,$(wildcard lib/*/t/t*.py))
+       $(PYTHON) wvtest.py lib/bup/t/tmetadata.py
 
 runtests-cmdline: all
        t/test.sh
+       t/test-meta.sh
 
 stupid:
        PATH=/bin:/usr/bin $(MAKE) test
@@ -96,9 +96,6 @@ test: all
 
 check: test
 
-%: %.o
-       $(CC) $(CFLAGS) (LDFLAGS) -o $@ $^ $(LIBS)
-
 bup: main.py
        rm -f $@
        ln -s $< $@
@@ -123,9 +120,6 @@ cmd/bup-%: cmd/%-cmd.sh
        rm -f $@
        ln -s $*-cmd.sh $@
 
-%.o: %.c
-       gcc -c -o $@ $< $(CPPFLAGS) $(CFLAGS)
-       
 # update the local 'man' and 'html' branches with pregenerated output files, for
 # people who don't have pandoc (and maybe to aid in google searches or something)
 export-docs: Documentation/all
@@ -155,10 +149,17 @@ import-docs: Documentation/clean
        git archive origin/html | (cd Documentation; tar -xvf -)
        git archive origin/man | (cd Documentation; tar -xvf -)
 
-clean: Documentation/clean
-       rm -f *.o lib/*/*.o *.so lib/*/*.so *.dll *.exe \
+clean: Documentation/clean config/clean
+       rm -f *.o lib/*/*.o *.so lib/*/*.so *.dll lib/*/*.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
+               out[12] out2[tc] tags[12] tags2[tc] \
+               testfs.img lib/bup/t/testfs.img
+       if test -e bupmeta.tmp/testfs; \
+         then umount bupmeta.tmp/testfs || true; fi
+       if test -e lib/bup/t/testfs; \
+         then umount lib/bup/t/testfs || true; fi
+       if test -e bupmeta.tmp/testfs-limited; \
+         then umount bupmeta.tmp/testfs-limited || true; fi
+       rm -rf *.tmp *.tmp.meta t/*.tmp lib/*/*/*.tmp build lib/bup/build lib/bup/t/testfs