diff --git a/Makefile b/Makefile index 44e4356df..5031ec688 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ DATADIR=/usr/share/plinth PYDIR=$(DATADIR)/python/plinth ## Catch-all targets -default: config dirs template css docs +default: config dirs css docs all: default predepend: @@ -58,10 +58,6 @@ config: Makefile @cat $< | python -c 'import re,sys;print re.sub("\s*([{};,:])\s*", "\\1", re.sub("/\*.*?\*/", "", re.sub("\s+", " ", sys.stdin.read())))' > $@ css: $(COMPRESSED_CSS) -template: - @$(MAKE) -s -C templates -templates: template - docs: @$(MAKE) -s -C doc doc: docs @@ -78,7 +74,6 @@ clean: @find . -name "*.pyc" -exec rm {} \; @find . -name "*.bak" -exec rm {} \; @$(MAKE) -s -C doc clean - @$(MAKE) -s -C templates clean rm -f plinth.config rm -f predepend diff --git a/doc/Makefile b/doc/Makefile index adaf5e2f1..c45bdbc99 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -41,7 +41,7 @@ $(SOURCES): @rm -f $@ @ln -s ../$(patsubst %.mdwn,%,$@) $@ -../TODO : $(TODO_SOURCES) ../*.py ../modules/*.py ../Makefile Makefile ../templates/Makefile +../TODO : $(TODO_SOURCES) ../*.py ../modules/*.py ../Makefile Makefile grep -ro --exclude=.git* --exclude=plinth.1 --exclude=*.tex --exclude=*.html \ --exclude=README.mdwn --exclude=INSTALL.mdwn \ --exclude=TODO.mdwn --exclude=COPYING.mdwn \ diff --git a/templates/Makefile b/templates/Makefile deleted file mode 100644 index df1b31f48..000000000 --- a/templates/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -CHEETAH=cheetah -TEMPLATES=$(wildcard *.tmpl) -TEMPLATE_PYFILES := $(patsubst %.tmpl,%.py,$(TEMPLATES)) - -## Catch-all tagets -default: $(TEMPLATE_PYFILES) - -%.py: %.tmpl - $(CHEETAH) c $< -templates: $(TEMPLATE_PYFILES) -template: templates - -clean: - rm -rf .\#* \#* *.pyc *.bak - @rm -f $(TEMPLATE_PYFILES) diff --git a/templates/__init__.py b/templates/__init__.py deleted file mode 100644 index e69de29bb..000000000