diff options
| author | infirit <[email protected]> | 2014-06-25 16:56:57 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-06-25 17:22:42 +0200 |
| commit | 6dde73c669ffea065cdb8a21ce80e128962a1cb6 (patch) | |
| tree | 622bbde74fe9db10a330331b494ddc1ede22d820 | |
| parent | ebfdf71c7a87e4f56ba8631a58b7a27bb3767742 (diff) | |
| download | mate-themes-6dde73c669ffea065cdb8a21ce80e128962a1cb6.tar.bz2 mate-themes-6dde73c669ffea065cdb8a21ce80e128962a1cb6.tar.xz | |
Shiny: Move theme files into desktop-themes
In preparation for the Gtk+ 3 theme
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | desktop-themes/Shiny/Makefile.am | 11 | ||||
| -rw-r--r-- | desktop-themes/Shiny/gtk-2.0/Makefile.am (renamed from gtk-themes/Shiny/Makefile.am) | 0 | ||||
| -rw-r--r-- | desktop-themes/Shiny/gtk-2.0/gtkrc (renamed from gtk-themes/Shiny/gtkrc) | 0 | ||||
| -rw-r--r-- | desktop-themes/Shiny/metacity-1/Makefile.am | 8 | ||||
| -rw-r--r-- | desktop-themes/Shiny/metacity-1/metacity-theme-1.xml (renamed from marco-themes/Shiny/metacity-theme-1.xml) | 0 | ||||
| -rw-r--r-- | gtk-themes/Makefile.am | 2 | ||||
| -rw-r--r-- | marco-themes/Makefile.am | 1 |
8 files changed, 19 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 2139e4f1..bf1613b5 100644 --- a/configure.ac +++ b/configure.ac @@ -247,6 +247,8 @@ desktop-themes/BlueMenta/unity/Makefile desktop-themes/BlueMenta/xfwm4/Makefile desktop-themes/Quid/Makefile desktop-themes/Shiny/Makefile +desktop-themes/Shiny/gtk-2.0/Makefile +desktop-themes/Shiny/metacity-1/Makefile desktop-themes/TraditionalGreen/Makefile desktop-themes/TraditionalGreen/gtk-2.0/Makefile desktop-themes/TraditionalGreen/gtk-3.0/Makefile @@ -286,7 +288,6 @@ gtk-themes/ContrastLowLargePrint/pixmaps/Makefile gtk-themes/LargePrint/Makefile gtk-themes/LargePrint/gtkrc gtk-themes/Reverse/Makefile -gtk-themes/Shiny/Makefile gtk-themes/Simply/Makefile icon-themes/Makefile icon-themes/ContrastHigh/Makefile diff --git a/desktop-themes/Shiny/Makefile.am b/desktop-themes/Shiny/Makefile.am index e00c5fe2..214f34f8 100644 --- a/desktop-themes/Shiny/Makefile.am +++ b/desktop-themes/Shiny/Makefile.am @@ -1,11 +1,18 @@ THEME_NAME=Shiny THEME_IN_FILES=index.theme.in -%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache - themedir = $(datadir)/themes/$(THEME_NAME) theme_DATA = index.theme DISTCLEANFILES=index.theme EXTRA_DIST=index.theme.in index.theme + +SUBDIRS = \ + gtk-2.0 \ + metacity-1 + +DIST_SUBDIRS = $(SUBDIRS) + +%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache + diff --git a/gtk-themes/Shiny/Makefile.am b/desktop-themes/Shiny/gtk-2.0/Makefile.am index 9ce2f398..9ce2f398 100644 --- a/gtk-themes/Shiny/Makefile.am +++ b/desktop-themes/Shiny/gtk-2.0/Makefile.am diff --git a/gtk-themes/Shiny/gtkrc b/desktop-themes/Shiny/gtk-2.0/gtkrc index 904d295e..904d295e 100644 --- a/gtk-themes/Shiny/gtkrc +++ b/desktop-themes/Shiny/gtk-2.0/gtkrc diff --git a/desktop-themes/Shiny/metacity-1/Makefile.am b/desktop-themes/Shiny/metacity-1/Makefile.am new file mode 100644 index 00000000..a851d69f --- /dev/null +++ b/desktop-themes/Shiny/metacity-1/Makefile.am @@ -0,0 +1,8 @@ +THEME_NAME=Shiny + +themedir = $(datadir)/themes/$(THEME_NAME)/metacity-1 + +theme_DATA = \ + metacity-theme-1.xml + +EXTRA_DIST = $(theme_DATA) diff --git a/marco-themes/Shiny/metacity-theme-1.xml b/desktop-themes/Shiny/metacity-1/metacity-theme-1.xml index b4418f8f..b4418f8f 100644 --- a/marco-themes/Shiny/metacity-theme-1.xml +++ b/desktop-themes/Shiny/metacity-1/metacity-theme-1.xml diff --git a/gtk-themes/Makefile.am b/gtk-themes/Makefile.am index f308d019..0fa5c85b 100644 --- a/gtk-themes/Makefile.am +++ b/gtk-themes/Makefile.am @@ -1,6 +1,5 @@ SUBDIRS = \ AlaDelta \ - Shiny \ Simply \ ContrastHighInverse \ ContrastHighLargePrint \ @@ -12,7 +11,6 @@ SUBDIRS = \ DIST_SUBDIRS = \ AlaDelta \ - Shiny \ Simply \ ContrastHighInverse \ ContrastHighLargePrint \ diff --git a/marco-themes/Makefile.am b/marco-themes/Makefile.am index e19ad244..53a22788 100644 --- a/marco-themes/Makefile.am +++ b/marco-themes/Makefile.am @@ -2,7 +2,6 @@ THEMES = \ Atantla \ AlaDelta \ Quid \ - Shiny \ Reverse \ Fog \ BlackMenta |