git.iko.soy/searx
on master help sign in
make themes: rename 'style' targtes to 'themes' targets

style.legacy could be renamed themes.legacy : it actually builds the files for the legacy theme, then themes.legacy can be a dependency of themes. Same for the other styles.* Debatable: about style.bootstrap, same convention : theme.bootstrap (even it is more a toolbox for the oscar theme). So there is no need to add the missing make styles in the help target. thanks @dalf: - https://github.com/asciimoo/searx/pull/1900#discussion_r399160355 Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>

commit8a16903a1ca980fc3c670e304067c9e68eb59a25 authorMarkus Heiser <markus.heiser@darmarit.de> dateSun 29 Mar 2020, 11:29 (7 years ago) parentec453e0
1 file changed+21−20
compare with master
unifiedsplit
Makefile+21−20
Makefile+21−20
@@ -117,39 +117,40 @@ node.clean:
117117# build themes
118118# ------------
119119
120−PHONY += themes themes.oscar themes.simple
121−themes: themes.oscar themes.simple
120+PHONY += themes.bootstrap themes themes.oscar themes.simple themes.legacy themes.courgette themes.pixart
121+themes: themes.bootstrap themes.oscar themes.simple themes.legacy themes.courgette themes.pixart
122122
123−themes.oscar:
124− $(Q)echo '[!] Grunt build : oscar theme'
125− $(Q)PATH="$$(npm bin):$$PATH" grunt --gruntfile "searx/static/themes/oscar/gruntfile.js"
126−
127−themes.simple:
128− $(Q)echo '[!] Grunt build : simple theme'
129− $(Q)PATH="$$(npm bin):$$PATH" grunt --gruntfile "searx/static/themes/simple/gruntfile.js"
123+quiet_cmd_lessc = LESSC $3
124+ cmd_lessc = PATH="$$(npm bin):$$PATH" \
125+ lessc --clean-css="--s1 --advanced --compatibility=ie9" "searx/static/$2" "searx/static/$3"
130126
131−# build styles
132−# ------------
127+quiet_cmd_grunt = GRUNT $2
128+ cmd_grunt = PATH="$$(npm bin):$$PATH" \
129+ grunt --gruntfile "$2"
133130
134−PHONY += styles style.legacy style.courgette style.pixart style.bootstrap
135−styles: style.legacy style.courgette style.pixart style.bootstrap
131+themes.oscar:
132+ $(Q)echo '[!] build oscar theme'
133+ $(call cmd,grunt,searx/static/themes/oscar/gruntfile.js)
136134
137−quiet_cmd_lessc = STYLE $3
138− cmd_lessc = PATH="$$(npm bin):$$PATH" \
139− lessc --clean-css="--s1 --advanced --compatibility=ie9" "searx/static/$2" "searx/static/$3"
135+themes.simple:
136+ $(Q)echo '[!] build simple theme'
137+ $(call cmd,grunt,searx/static/themes/simple/gruntfile.js)
140138
141−style.legacy:
139+themes.legacy:
140+ $(Q)echo '[!] build legacy theme'
142141 $(call cmd,lessc,themes/legacy/less/style-rtl.less,themes/legacy/css/style-rtl.css)
143142 $(call cmd,lessc,themes/legacy/less/style.less,themes/legacy/css/style.css)
144143
145−style.courgette:
144+themes.courgette:
145+ $(Q)echo '[!] build courgette theme'
146146 $(call cmd,lessc,themes/courgette/less/style.less,themes/courgette/css/style.css)
147147 $(call cmd,lessc,themes/courgette/less/style-rtl.less,themes/courgette/css/style-rtl.css)
148148
149−style.pixart:
149+themes.pixart:
150+ $(Q)echo '[!] build pixart theme'
150151 $(call cmd,lessc,themes/pix-art/less/style.less,themes/pix-art/css/style.css)
151152
152−style.bootstrap:
153+themes.bootstrap:
153154 $(call cmd,lessc,less/bootstrap/bootstrap.less,css/bootstrap.min.css)
154155
155156