Better formatting

Let's leave indentation and whatnot to the editor.

1 files changed, 77 insertions, 62 deletions

diff --git a/Makefile b/Makefile
index 0bdf008..a766fb6 100644
--- a/Makefile
+++ b/Makefile
@@ -26,13 +26,13 @@
 # 2) It gives some flexibility in that files can be created or deleted
 #    freely as long as they are not part of any of these lists
 
-ROOTMETA := bootstrap.js install.rdf chrome.manifest icon.png LICENSE.txt \
-	    options.xul
+ROOTMETA := bootstrap.js install.rdf chrome.manifest icon.png	\
+	    LICENSE.txt options.xul
 
-ROOTHTML := about.html asset-viewer.html background.html cloud-ui.html \
-	    dashboard.html hosts-files.html logger-ui.html \
-	    main-blocked.html popup.html raw-settings.html settings.html \
-	    user-rules.html
+ROOTHTML := about.html asset-viewer.html background.html	\
+	    cloud-ui.html dashboard.html hosts-files.html	\
+	    logger-ui.html main-blocked.html popup.html		\
+	    raw-settings.html settings.html user-rules.html
 
 ROOTOTHER := frameScript.js frameModule.js
 
@@ -40,35 +40,47 @@ ROOT := $(ROOTMETA) $(ROOTHTML) $(ROOTOTHER)
 
 ASSETS := assets/assets.json
 
-CSSSHEET := css/cloud-ui.css css/common.css css/dashboard-common.css \
-	    css/dashboard.css css/hosts-files.css css/legacy-toolbar-button.css \
-	    css/logger-ui.css css/popup.css css/raw-settings.css \
-	    css/user-rules.css
+CSSSHEET := css/cloud-ui.css css/common.css css/dashboard-common.css	\
+	    css/dashboard.css css/hosts-files.css			\
+	    css/legacy-toolbar-button.css css/logger-ui.css		\
+	    css/popup.css css/raw-settings.css css/user-rules.css
 
-CSSFONTS := css/fonts/fontawesome-webfont.ttf \
-	    css/fonts/Roboto_Condensed/LICENSE.txt \
-	    css/fonts/Roboto_Condensed/RobotoCondensed-Bold.ttf \
-	    css/fonts/Roboto_Condensed/RobotoCondensed-Light.ttf \
+CSSFONTS := css/fonts/fontawesome-webfont.ttf				\
+	    css/fonts/Roboto_Condensed/LICENSE.txt			\
+	    css/fonts/Roboto_Condensed/RobotoCondensed-Bold.ttf		\
+	    css/fonts/Roboto_Condensed/RobotoCondensed-Light.ttf	\
 	    css/fonts/Roboto_Condensed/RobotoCondensed-Regular.ttf
 
 CSS := $(CSSSHEET) $(CSSFONTS)
 
-IMGICON := img/browsericons/icon19-0.png img/browsericons/icon19-1.png \
-	   img/browsericons/icon19-2.png img/browsericons/icon19-3.png \
-	   img/browsericons/icon19-4.png img/browsericons/icon19-5.png \
-	   img/browsericons/icon19-6.png img/browsericons/icon19-7.png \
-	   img/browsericons/icon19-8.png img/browsericons/icon19-9.png \
-	   img/browsericons/icon19-10.png img/browsericons/icon19-11.png \
-	   img/browsericons/icon19-12.png img/browsericons/icon19-13.png \
-	   img/browsericons/icon19-14.png img/browsericons/icon19-15.png \
-	   img/browsericons/icon19-16.png img/browsericons/icon19-17.png \
-	   img/browsericons/icon19-18.png img/browsericons/icon19-19.png \
-	   img/browsericons/icon38-off.png img/browsericons/icon19-off.png
-
-IMGOTHER := img/cloud.png img/icon_16.png img/icon_64.png \
-	    img/matrix-group-hide.png img/matrix-group-hline.png \
-	    img/matrix-group-show.png img/permanent-black-small.png \
-	    img/permanent-black-small-cb.png img/permanent-white-small.png \
+IMGICON := img/browsericons/icon19-0.png	\
+	   img/browsericons/icon19-1.png	\
+	   img/browsericons/icon19-2.png	\
+	   img/browsericons/icon19-3.png	\
+	   img/browsericons/icon19-4.png	\
+	   img/browsericons/icon19-5.png	\
+	   img/browsericons/icon19-6.png	\
+	   img/browsericons/icon19-7.png	\
+	   img/browsericons/icon19-8.png	\
+	   img/browsericons/icon19-9.png	\
+	   img/browsericons/icon19-10.png	\
+	   img/browsericons/icon19-11.png	\
+	   img/browsericons/icon19-12.png	\
+	   img/browsericons/icon19-13.png	\
+	   img/browsericons/icon19-14.png	\
+	   img/browsericons/icon19-15.png	\
+	   img/browsericons/icon19-16.png	\
+	   img/browsericons/icon19-17.png	\
+	   img/browsericons/icon19-18.png	\
+	   img/browsericons/icon19-19.png	\
+	   img/browsericons/icon38-off.png	\
+	   img/browsericons/icon19-off.png
+
+IMGOTHER := img/cloud.png img/icon_16.png img/icon_64.png		\
+	    img/matrix-group-hide.png img/matrix-group-hline.png	\
+	    img/matrix-group-show.png img/permanent-black-small.png	\
+	    img/permanent-black-small-cb.png				\
+	    img/permanent-white-small.png				\
 	    img/permanent-black-small-cb.png
 
 IMG := $(IMGICON) $(IMGOTHER)
@@ -77,54 +89,57 @@ LIB := lib/publicsuffixlist.js lib/punycode.js lib/yamd5.js
 
 # The locale folder is split into parts because it's a long list
 # and it's somewhat easier to read this way
-LOC1 := locale/en/messages.properties locale/ar/messages.properties \
-	locale/bg/messages.properties locale/bn/messages.properties \
-	locale/cs/messages.properties locale/da/messages.properties \
+LOC1 := locale/en/messages.properties locale/ar/messages.properties	\
+	locale/bg/messages.properties locale/bn/messages.properties	\
+	locale/cs/messages.properties locale/da/messages.properties	\
 	locale/de/messages.properties locale/el/messages.properties
 
-LOC2 := locale/eo/messages.properties locale/es/messages.properties \
-	locale/et/messages.properties locale/fa/messages.properties \
-	locale/fi/messages.properties locale/fil/messages.properties \
+LOC2 := locale/eo/messages.properties locale/es/messages.properties	\
+	locale/et/messages.properties locale/fa/messages.properties	\
+	locale/fi/messages.properties locale/fil/messages.properties	\
 	locale/fr/messages.properties locale/he/messages.properties
 
-LOC3 := locale/hi/messages.properties locale/hu/messages.properties \
-	locale/id/messages.properties locale/it/messages.properties \
-	locale/ja/messages.properties locale/ko/messages.properties \
+LOC3 := locale/hi/messages.properties locale/hu/messages.properties	\
+	locale/id/messages.properties locale/it/messages.properties	\
+	locale/ja/messages.properties locale/ko/messages.properties	\
 	locale/lv/messages.properties locale/ml/messages.properties
 
-LOC4 := locale/nb/messages.properties locale/nl/messages.properties \
-	locale/pl/messages.properties locale/pt-BR/messages.properties \
-	locale/pt-PT/messages.properties locale/ro/messages.properties \
-	locale/ru/messages.properties locale/sl/messages.properties
+LOC4 := locale/nb/messages.properties locale/nl/messages.properties	\
+	locale/pl/messages.properties					\
+	locale/pt-BR/messages.properties				\
+	locale/pt-PT/messages.properties				\
+	locale/ro/messages.properties locale/ru/messages.properties	\
+	locale/sl/messages.properties
 
-LOC5 := locale/sr/messages.properties locale/sv/messages.properties \
-	locale/te/messages.properties locale/tr/messages.properties \
-	locale/uk/messages.properties locale/vi/messages.properties \
-	locale/zh-CN/messages.properties locale/zh-TW/messages.properties
+LOC5 := locale/sr/messages.properties locale/sv/messages.properties	\
+	locale/te/messages.properties locale/tr/messages.properties	\
+	locale/uk/messages.properties locale/vi/messages.properties	\
+	locale/zh-CN/messages.properties				\
+	locale/zh-TW/messages.properties
 
 LOCALE := $(LOC1) $(LOC2) $(LOC3) $(LOC4) $(LOC5)
 
 # The js folder is split into parts because it's a long list
 # and it's somewhat easier to read this way
-JS1 := js/about.js js/assets.js js/asset-viewer.js js/background.js \
-       js/browsercache.js js/cloud-ui.js js/contentscript.js \
-       js/contentscript-start.js js/cookies.js js/dashboard-common.js \
+JS1 := js/about.js js/assets.js js/asset-viewer.js js/background.js	\
+       js/browsercache.js js/cloud-ui.js js/contentscript.js		\
+       js/contentscript-start.js js/cookies.js js/dashboard-common.js	\
        js/dashboard.js js/hosts-files.js
 
-JS2 := js/httpsb.js js/i18n.js js/liquid-dict.js js/logger.js \
-       js/logger-ui.js js/main-blocked.js js/matrix.js js/messaging.js \
-       js/pagestats.js js/polyfill.js js/popup.js js/profiler.js \
-       js/raw-settings.js js/settings.js js/start.js js/storage.js
+JS2 := js/httpsb.js js/i18n.js js/liquid-dict.js js/logger.js		\
+       js/logger-ui.js js/main-blocked.js js/matrix.js			\
+       js/messaging.js js/pagestats.js js/polyfill.js js/popup.js	\
+       js/profiler.js js/raw-settings.js js/settings.js js/start.js	\
+       js/storage.js
 
-JS3 := js/tab.js js/traffic.js js/udom.js js/uritools.js js/user-rules.js \
-       js/usersettings.js js/utils.js js/xal.js CallbackWrapper.jsm \
-       HttpRequestHeaders.jsm
+JS3 := js/tab.js js/traffic.js js/udom.js js/uritools.js		\
+       js/user-rules.js js/usersettings.js js/utils.js js/xal.js	\
+       CallbackWrapper.jsm HttpRequestHeaders.jsm
 
-JS4 := js/vapi-client.js js/vapi-common.js js/vapi-background.js \
-       js/vapi-tabs.js js/vapi-window.js \
-       js/vapi-core.js js/vapi-browser.js js/vapi-storage.js \
-       js/vapi-messaging.js js/vapi-net.js js/vapi-cookies.js \
-       js/vapi-cloud.js
+JS4 := js/vapi-client.js js/vapi-common.js js/vapi-background.js	\
+       js/vapi-tabs.js js/vapi-window.js js/vapi-core.js		\
+       js/vapi-browser.js js/vapi-storage.js js/vapi-messaging.js	\
+       js/vapi-net.js js/vapi-cookies.js js/vapi-cloud.js
 
 JS := $(JS1) $(JS2) $(JS3) $(JS4)