Author: dylan
Date: 2004-12-28 17:40:25 -0500 (Tue, 28 Dec 2004)
New Revision: 438

Added:
   trunk/web/.htaccess
   trunk/web/templates/
Removed:
   trunk/web/inc/
Modified:
   trunk/web/Makefile
Log:
Build system fixes.


Added: trunk/web/.htaccess
===================================================================
--- trunk/web/.htaccess 2004-12-28 22:23:51 UTC (rev 437)
+++ trunk/web/.htaccess 2004-12-28 22:40:25 UTC (rev 438)
@@ -0,0 +1 @@
+Options +MultiViews

Modified: trunk/web/Makefile
===================================================================
--- trunk/web/Makefile  2004-12-28 22:23:51 UTC (rev 437)
+++ trunk/web/Makefile  2004-12-28 22:40:25 UTC (rev 438)
@@ -5,8 +5,7 @@
 
 TTFLAGS = -I inc -P init -P config
 
-TT       = tt
-# fixhtml.pl
+TT       = ./bin/tt
 FIX      = ./bin/fixhtml
 TIDY     = tidy
 VALIDATE = validate
@@ -20,33 +19,25 @@
 
 
 export PERL5LIB
-src       = $(patsubst ./%,%,$(shell find -name '*.thtml' -or -name '*.tcss'))
-html_src  = $(patsubst %.thtml,%.html,$(filter %.thtml,$(src)))
-css_src = $(patsubst %.tcss,%.css,$(filter %.tcss,$(src))) 
-files     = $(html_src) $(css_src) 
 
+input   := $(patsubst ./%,%,$(shell find -name '*.thtml'))
+html    := $(input:.thtml=.html)
+targets := $(html) haver.css
 
 
-
-build: $(files)
-       @find -name Makefile -mindepth 2 -exec sh -c 'make -C $$(dirname {})' \;
-
+build: $(targets)
+       
 upload:
        echo "TODO"
        
-test:
-       rsync --exclude=.svn/ --delete -az ./ /home/dylan/pub/haver/
 
-
 clean:
-       rm -vf $(files)
-       @find -name Makefile -mindepth 2 -exec sh -c 'make -C $$(dirname {}) 
clean' \;
+       rm -vf $(targets)
 
-validate: $(html_src)
-       validate $(html_src)
+validate: $(html)
+       validate $(html)
 
-#inc/config inc/init inc/page inc/topmenu inc/sidebar inc/bottom
-#inc/config inc/init
+
 %.tmp: %.thtml $(DEPENDS) $(GDEPENDS)
        @echo "TT   $<"
        @$(TT) $(TTFLAGS) $< > $@

Copied: trunk/web/templates (from rev 387, trunk/web/inc)


Reply via email to