update to new banana layout

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-234

diff --git a/Makefile b/Makefile
index ab49d95..3debbad 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,7 @@ bzdist: clean pkg-bzdist
 
 clean:
        rm -rf locale include/xorg.globals.inc.php
+       rm -f htdocs/banana/banana.css htdocs/valid.html include/banana htdocs/banana/img htdocs/banana/xface.php
 
 %: %.in Makefile
        sed -e 's,@VERSION@,$(VERSION),g' $< > $@
@@ -35,14 +36,17 @@ templates_c:
 htdocs/valid.html:
        ln -sf ../templates_c/valid.html htdocs/valid.html
 
-include/banana:
-       ln -sf ../../banana/include ./include/banana
+include/banana: ../banana/banana
+       ln -sf ../$< $@
 
-htdocs/banana/banana.css:
-       ln -s ../../../banana/css/style.css htdocs/banana/banana.css
+htdocs/banana/banana.css: ../banana/css/style.css
+       ln -sf ../../$< $@
 
-htdocs/banana/%: ../banana/%
-       ln -s ../../$< $@
+htdocs/banana/xface.php: ../banana/examples/xface.php
+       ln -sf ../../$< $@
+
+htdocs/banana/img: ../banana/img
+       ln -sf ../../$< $@
 
 devel: build templates_c htdocs/valid.html include/banana \
        htdocs/banana/xface.php htdocs/banana/img htdocs/banana/banana.css

diff --git a/include/.arch-inventory b/include/.arch-inventory
index a0b4a85..65d95a3 100644 (file)
--- a/include/.arch-inventory
+++ b/include/.arch-inventory
@@ -1 +1 @@
-precious ^xorg.globals.inc.php$
+precious ^(xorg.globals.inc.php|banana)$

diff --git a/include/banana b/include/banana
deleted file mode 120000 (symlink)
index f5f27cd..0000000
--- a/include/banana
+++ /dev/null
@@ -1 +0,0 @@
-../../banana/include
\ No newline at end of file