X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Makefile;h=0220a20dd7c235bcc2df3ead1962698c126c6645;hb=013c33f8344e0a565c679d8008a4d3cac7889ba1;hp=2753e678b75c82887aa6ccd36344fff507aefb78;hpb=0f22a27d94f4fde05a0899f1eebd532374586ab0;p=neurodebian.git

diff --git a/Makefile b/Makefile
index 2753e67..0220a20 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,9 @@
-# old location
-WWW_UPLOAD_URI = elrond:/home/hanke/public_html/archive
-# brand new fancy one
-#WWW_UPLOAD_URI = neuro.debian.net:/home/www/neuro.debian.net/www
+WWW_UPLOAD_URI = neuro.debian.net:/home/www/neuro.debian.net/www
 WWW_DIR = build/html
 
 all: html
 
+
 prep:
 	if [ ! -d build ]; then mkdir build; fi
 	rsync -rvlhp sphinx/ build/src
@@ -22,32 +20,40 @@ html-stamp: pics prep source
 
 
 clean:
-	-rm -rf build
 	-rm html-stamp source-stamp
 	$(MAKE) -C artwork clean
 
 
-
 distclean: clean
+	-rm -rf build
 	-rm -rf cache
 
 
 source: source-stamp
 source-stamp: build/db.db
-	tools/reblender generate \
-		--cfg debneuro.cfg \
+	PYTHONPATH=. python neurodebian/dde.py \
+		--cfg neurodebian.cfg \
 		--db build/db.db \
 		--outdir build/src \
-		--pkgaddenum pkgs
+		--pkgaddenum pkgs \
+		commandisirrelevant
 	rm -f html-stamp
 	touch $@
 
 
+removedb:
+	-rm build/db.db
+
+
+updatedb: distclean build/db.db
+
+
 build/db.db:
 	mkdir -p build
-	tools/reblender refreshdb \
-		--cfg debneuro.cfg \
-		--db build/db.db
+	PYTHONPATH=. python neurodebian/dde.py \
+		--cfg neurodebian.cfg \
+		--db build/db.db \
+		updatedb
 
 
 upload-website: html