X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=62f006c6dbf24d4a9f6290c740657e57c84bac9e;hb=f22c7343443d8af71dcac249cb21c7d7d2cc5686;hp=a9c8f04e2acb10ea055202568795af7835c04539;hpb=318b866da7ea78dbb0b69295e6a2d2b4ac49bebf;p=bup.git

diff --git a/Makefile b/Makefile
index a9c8f04..62f006c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,15 @@
 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) $(CFLAGS)
 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 Documentation/all
+	t/configure-sampledata --setup
 
 bup: lib/bup/_version.py lib/bup/_helpers$(SOEXT) cmds
 
@@ -27,10 +17,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 \
@@ -43,23 +34,23 @@ install: all
 	  $(INSTALL) -m 0644 \
 		Documentation/*.html \
 		$(DOCDIR)
-	$(INSTALL) -m 0755 bup $(BINDIR)
-	$(INSTALL) -m 0755 \
+	$(INSTALL) -pm 0755 bup $(BINDIR)
+	$(INSTALL) -pm 0755 \
 		cmd/bup-* \
 		$(LIBDIR)/cmd
-	$(INSTALL) -m 0644 \
+	$(INSTALL) -pm 0644 \
 		lib/bup/*.py \
 		$(LIBDIR)/bup
-	$(INSTALL) -m 0755 \
+	$(INSTALL) -pm 0755 \
 		lib/bup/*$(SOEXT) \
 		$(LIBDIR)/bup
-	$(INSTALL) -m 0644 \
+	$(INSTALL) -pm 0644 \
 		lib/tornado/*.py \
 		$(LIBDIR)/tornado
-	$(INSTALL) -m 0644 \
+	$(INSTALL) -pm 0644 \
 		lib/web/static/* \
 		$(LIBDIR)/web/static/
-	$(INSTALL) -m 0644 \
+	$(INSTALL) -pm 0644 \
 		lib/web/*.html \
 		$(LIBDIR)/web/
 %/all:
@@ -68,10 +59,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
@@ -82,10 +79,21 @@ lib/bup/_version.py:
 
 runtests: all runtests-python runtests-cmdline
 
-runtests-python:
-	$(PYTHON) wvtest.py $(wildcard t/t*.py lib/*/t/t*.py)
+runtests-python: all
+	$(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-cat-file.sh
+	t/test-index-check-device.sh
+	t/test-meta.sh
+	t/test-restore-map-owner.sh
+	t/test-restore-single-file.sh
+	t/test-rm-between-index-and-save.sh
+	t/test-command-without-init-fails.sh
+	t/test-redundant-saves.sh
 	t/test.sh
 
 stupid:
@@ -96,14 +104,13 @@ test: all
 
 check: test
 
-%: %.o
-	$(CC) $(CFLAGS) (LDFLAGS) -o $@ $^ $(LIBS)
-
 bup: main.py
 	rm -f $@
 	ln -s $< $@
 
-cmds: $(patsubst cmd/%-cmd.py,cmd/bup-%,$(wildcard cmd/*-cmd.py))
+cmds: \
+    $(patsubst cmd/%-cmd.py,cmd/bup-%,$(wildcard cmd/*-cmd.py)) \
+    $(patsubst cmd/%-cmd.sh,cmd/bup-%,$(wildcard cmd/*-cmd.sh))
 
 cmd/bup-%: cmd/%-cmd.py
 	rm -f $@
@@ -117,9 +124,10 @@ bup-%: cmd-%.sh
 	rm -f $@
 	ln -s $< $@
 
-%.o: %.c
-	gcc -c -o $@ $< $(CPPFLAGS) $(CFLAGS)
-	
+cmd/bup-%: cmd/%-cmd.sh
+	rm -f $@
+	ln -s $*-cmd.sh $@
+
 # 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
@@ -149,10 +157,22 @@ 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
+	umount t/mnt/* || true
+	if test -e t/mnt; then rm -r t/mnt; fi
+        # FIXME: migrate these to t/mnt/
+	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
+	if test -e t/tmp; then rm -r t/tmp; fi
+	t/configure-sampledata --clean