From 9989d9e210c1c5f49290f61d1c36f10694fbd4bb Mon Sep 17 00:00:00 2001 From: ale <ale@incal.net> Date: Sun, 30 Oct 2011 09:28:28 +0000 Subject: [PATCH] add clean target; isolate fullbg module --- server/djrandom/frontend/static/Makefile | 5 ++++- server/djrandom/frontend/static/js/djr/Makefile | 3 +++ server/djrandom/frontend/templates/index.html | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/server/djrandom/frontend/static/Makefile b/server/djrandom/frontend/static/Makefile index afda304..56ef1a0 100644 --- a/server/djrandom/frontend/static/Makefile +++ b/server/djrandom/frontend/static/Makefile @@ -8,7 +8,6 @@ CSS_SOURCES = \ JS_SINGLE_FILE = js/bundle.js JS_SOURCES = \ js/jquery.autocomplete.min.js \ - js/jquery.fullbg.min.js \ js/jquery.grab.js \ js/jquery.transform.js \ js/mod.csstransforms.min.js \ @@ -28,6 +27,10 @@ COMPRESSED_BUNDLES = $(BUNDLES:%=%.gz) all: subdirs bundles compress +clean: + $(MAKE) -C js/djr clean + -rm -f $(BUNDLES) $(COMPRESSED_BUNDLES) + subdirs: $(MAKE) -C js/djr $(MAKE) -C js diff --git a/server/djrandom/frontend/static/js/djr/Makefile b/server/djrandom/frontend/static/js/djr/Makefile index 7d483db..d1e9aef 100644 --- a/server/djrandom/frontend/static/js/djr/Makefile +++ b/server/djrandom/frontend/static/js/djr/Makefile @@ -12,6 +12,9 @@ TARGET = ../djr.min.js all: $(TARGET) +clean: + -rm -f $(TARGET) + ../djr.min.js: $(SOURCES) $(JSCOMPILER) $(SOURCES:%=--js=%) --js_output_file=$@ diff --git a/server/djrandom/frontend/templates/index.html b/server/djrandom/frontend/templates/index.html index db31691..7b71fc1 100644 --- a/server/djrandom/frontend/templates/index.html +++ b/server/djrandom/frontend/templates/index.html @@ -44,6 +44,8 @@ <script type="text/javascript" src="/static/js/jquery-1.6.4.min.js"></script> + <script type="text/javascript" + src="/static/js/jquery.fullbg.min.js"></script> <script type="text/javascript" src="/static/js/bundle.js"></script> {% endif %} -- GitLab