From 3b9233910fcdcf4093a902792d4ce203f1539196 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 3 May 2017 15:45:15 +0100 Subject: [PATCH] build: De-duplicate options to sassc If we want to change the list of options we use with sassc, not having to copy-paste them in multiple rules would be a good start. --- gtk/Makefile.am | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gtk/Makefile.am b/gtk/Makefile.am index ce84af9ace..70b1d5fd9e 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1314,17 +1314,19 @@ scss_verbose = $(scss_verbose_@AM_V@) scss_verbose_ = $(scss_verbose_@AM_DEFAULT_V@) scss_verbose_0 = @echo " SCSS $@"; +SASSC_OPTS = -a + theme/Adwaita/gtk-contained.css: $(top_srcdir)/gtk/theme/Adwaita/gtk-contained.scss $(adwaita_theme_scss) - $(scss_verbose) $(MKDIR_P) $(dir $@) && $(SASSC) -a $< $@ || rm -f $@ + $(scss_verbose) $(MKDIR_P) $(dir $@) && $(SASSC) $(SASSC_OPTS) $< $@ || rm -f $@ theme/Adwaita/gtk-contained-dark.css: $(top_srcdir)/gtk/theme/Adwaita/gtk-contained-dark.scss $(adwaita_theme_scss) - $(scss_verbose) $(MKDIR_P) $(dir $@) && $(SASSC) -a $< $@ || rm -f $@ + $(scss_verbose) $(MKDIR_P) $(dir $@) && $(SASSC) $(SASSC_OPTS) $< $@ || rm -f $@ theme/HighContrast/gtk-contained.css: $(top_srcdir)/gtk/theme/HighContrast/gtk-contained.scss $(highcontrast_theme_scss) - $(scss_verbose) $(MKDIR_P) $(dir $@) && $(SASSC) -a $< $@ || rm -f $@ + $(scss_verbose) $(MKDIR_P) $(dir $@) && $(SASSC) $(SASSC_OPTS) $< $@ || rm -f $@ theme/HighContrast/gtk-contained-inverse.css: $(top_srcdir)/gtk/theme/HighContrast/gtk-contained-inverse.scss $(highcontrast_theme_scss) - $(scss_verbose) $(MKDIR_P) $(dir $@) && $(SASSC) -a $< $@ || rm -f $@ + $(scss_verbose) $(MKDIR_P) $(dir $@) && $(SASSC) $(SASSC_OPTS) $< $@ || rm -f $@ endif # REBUILD_SCSS