X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=Makefile;h=b1591ba5ecb9021fa7a238d5daf5b10a3a1ff55a;hb=1f8bb12ed1315b4f00122a301bef1c7011c4f9ac;hp=6910a158a40caf34bc18040d48f3dcdc2e7f52e0;hpb=34ce43dbf3a663c072155f021d4f0d1f836dee31;p=platal.git

diff --git a/Makefile b/Makefile
index 6910a15..b1591ba 100644
--- a/Makefile
+++ b/Makefile
@@ -16,16 +16,11 @@ VCS_FILTER = ! -name .arch-ids ! -name CVS
 
 all: build
 
-devel: build htdocs/valid.html
+build: core banana wiki
 
-headers:
-	headache -c install.d/platal-dev/templates/header.conf -h install.d/platal-dev/templates/header \
-		`find templates -name '*.tpl' ! -path 'templates/xnet/skin.tpl' ! -path 'templates/skin/*.tpl' ! -name 'vcard.tpl' `
-
-build: spool/templates_c wiki include/platal/globals.inc.php banana
-
-clean:
-	rm -rf include/platal/globals.inc.php
+q:
+	@echo -e "Code statistics\n"
+	@sloccount $(filter-out wiki/ spool/, $(wildcard */)) 2> /dev/null | egrep '^[a-z]*:'
 
 %: %.in Makefile
 	sed -e 's,@VERSION@,$(VERSION),g' $< > $@
@@ -33,34 +28,55 @@ clean:
 ################################################################################
 # targets
 
+##
+## core
+##
+
+core: spool/templates_c include/globals.inc.php
+
 spool/templates_c spool/uploads:
 	mkdir -p $@
 	chmod o+w $@
 
-spool/wiki.d:
-	mkdir -p $@
-	chmod o+w $@
-	cd $@ && ln -sf ../../install.d/wiki/wiki.d/* .
 
-wiki/cookbook/e-protect.php:
-	cd wiki/cookbook && ln -sf ../../install.d/wiki/e-protect.php
+##
+## wiki
+##
+
+WIKI_NEEDS = \
+     wiki/local/farmconfig.php      \
+     wiki/pub/skins/empty           \
+     wiki/cookbook/e-protect.php    \
+     spool/wiki.d                   \
+     htdocs/uploads                 \
+     htdocs/wiki                    \
 
-htdocs/valid.html:
-	touch spool/templates_c/valid.html
-	chmod o+w spool/templates_c/valid.html
-	cd htdocs && ln -sf ../spool/templates_c/valid.html
+wiki: get-wiki build-wiki
 
-htdocs/uploads:
+build-wiki: $(WIKI_NEEDS) | get-wiki
+
+htdocs/uploads: spool/uploads
 	cd htdocs && ln -sf ../spool/uploads
 
 htdocs/wiki:
 	cd htdocs && ln -sf ../wiki/pub wiki
 
+
+spool/wiki.d:
+	mkdir -p $@
+	chmod o+w $@
+	cd $@ && ln -sf ../../include/wiki/wiki.d/* .
+
+
+wiki/cookbook/e-protect.php:
+	cd wiki/cookbook && ln -sf ../../include/wiki/e-protect.php
+
 wiki/local/farmconfig.php:
-	cd wiki/local/     && ln -sf ../../plugins/pmwiki.config.php farmconfig.php
+	cd wiki/local/ && ln -sf ../../include/wiki/farmconfig.php
 
 wiki/pub/skins/empty:
-	cd wiki/pub/skins/ && ln -sf ../../../install.d/wiki/empty
+	cd wiki/pub/skins/ && ln -sf ../../../include/wiki/empty
+
 
 get-wiki:
 	@if ! test -d wiki; then                                          \
@@ -70,6 +86,10 @@ get-wiki:
 	    mv pmwiki-* wiki;						  \
 	fi
 
+##
+## banana
+##
+
 banana: htdocs/images/banana htdocs/css/banana.css
 htdocs/images/banana:
 	cd $(@D) && ln -sf /usr/share/banana/img $(@F)
@@ -77,10 +97,6 @@ htdocs/images/banana:
 htdocs/css/banana.css:
 	cd $(@D) && ln -sf /usr/share/banana/css/style.css $(@F)
 
-build-wiki: wiki/local/farmconfig.php wiki/pub/skins/empty spool/wiki.d
-
-wiki: get-wiki build-wiki spool/uploads htdocs/uploads htdocs/wiki wiki/cookbook/e-protect.php
-
 ################################################################################
 
 .PHONY: build dist clean wiki build-wiki banana