Updated makefile.

1 files changed, 172 insertions, 134 deletions

diff --git a/themes/Adwaita/gtk-2.0/Makefile.am b/themes/Adwaita/gtk-2.0/Makefile.am
index 6bf04436..0e77b5df 100644
--- a/themes/Adwaita/gtk-2.0/Makefile.am
+++ b/themes/Adwaita/gtk-2.0/Makefile.am
@@ -7,141 +7,179 @@ libadwaita_la_LDFLAGS = -module -avoid-version -no-undefined
 libadwaita_la_LIBADD =  $(GTK2_ENGINE_LIBS)
 
 themedir = $(datadir)/themes/Adwaita/gtk-2.0
-theme_DATA = gtkrc
+theme_data = gtkrc main.rc apps.rc
+
+asset_dirs = "assets"
 
-asset_dirs = "Arrows" "Buttons" "Check-Radio" "Entry" "Expanders" \
-	"Handles" "Lines" "Menu-Menubar" "Others" "ProgressBar" \
-	"Range" "Scrollbars" "Shadows" "Spin" "Tabs" "Toolbar"
 asset_data = \
-	Arrows/arrow-down.png \
-	Arrows/arrow-down-insens.png \
-	Arrows/arrow-down-prelight.png \
-	Arrows/arrow-down-small.png \
-	Arrows/arrow-down-small-insens.png \
-	Arrows/arrow-down-small-prelight.png \
-	Arrows/arrow-left.png \
-	Arrows/arrow-left-insens.png \
-	Arrows/arrow-left-prelight.png \
-	Arrows/arrow-right.png \
-	Arrows/arrow-right-insens.png \
-	Arrows/arrow-right-prelight.png \
-	Arrows/arrow-up.png \
-	Arrows/arrow-up-insens.png \
-	Arrows/arrow-up-prelight.png \
-	Arrows/arrow-up-small.png \
-	Arrows/arrow-up-small-insens.png \
-	Arrows/arrow-up-small-prelight.png \
-	Arrows/menu-arrow.png \
-	Arrows/menu-arrow-prelight.png \
-	Buttons/button-default.png \
-	Buttons/button-insensitive.png \
-	Buttons/button-prelight.png \
-	Buttons/button-pressed.png \
-	Buttons/button-default-nohilight.png \
-	Buttons/button-insensitive-nohilight.png \
-	Buttons/button-prelight-nohilight.png \
-	Buttons/button-pressed-nohilight.png \
-	Check-Radio/checkbox-checked.png \
-	Check-Radio/checkbox-unchecked.png \
-	Check-Radio/checkbox-checked-insensitive.png \
-	Check-Radio/checkbox-unchecked-insensitive.png \
-	Check-Radio/menucheck.png \
-	Check-Radio/menucheck_prelight.png \
-	Check-Radio/menuoption.png \
-	Check-Radio/menuoption_prelight.png \
-	Check-Radio/option-checked.png \
-	Check-Radio/option-unchecked.png \
-	Check-Radio/option-checked-insensitive.png \
-	Check-Radio/option-unchecked-insensitive.png \
-	Entry/combo-entry-border-bg.png \
-	Entry/combo-entry-border-rtl-bg.png \
-	Entry/combo-entry-border-active-bg.png \
-	Entry/combo-entry-border-active-rtl-bg.png \
-	Entry/combo-entry-border-disabled-bg.png \
-	Entry/combo-entry-border-disabled-rtl-bg.png \
-	Entry/combo-entry-border-notebook.png \
-	Entry/combo-entry-border-rtl-notebook.png \
-	Entry/combo-entry-border-active-notebook.png \
-	Entry/combo-entry-border-active-rtl-notebook.png \
-	Entry/combo-entry-border-disabled-notebook.png \
-	Entry/combo-entry-border-disabled-rtl-notebook.png \
-	Entry/combo-entry-button.png \
-	Entry/combo-entry-button-rtl.png \
-	Entry/combo-entry-button-active.png \
-	Entry/combo-entry-button-active-rtl.png \
-	Entry/combo-entry-button-disabled.png \
-	Entry/combo-entry-button-disabled-rtl.png \
-	Entry/entry-border-fill.png \
-	Entry/entry-border-fill-plain.png \
-	Entry/entry-border-fill-solid.png \
-	Entry/entry-border-bg.png \
-	Entry/entry-border-active-bg.png \
-	Entry/entry-border-bg-solid.png \
-	Entry/entry-border-active-bg-solid.png \
-	Entry/entry-border-disabled-bg.png \
-	Entry/entry-border-notebook.png \
-	Entry/entry-border-active-notebook.png \
-	Entry/entry-border-disabled-notebook.png \
-	Entry/entry-border-bg-solid-spin.png \
-	Entry/entry-border-active-bg-solid-spin.png \
-	Entry/notebook-entry-border-active-bg.png \
-	Entry/notebook-entry-border-bg.png \
-	Entry/notebook-entry-border-disabled-bg.png \
-	Expanders/minus.png \
-	Expanders/plus.png \
-	Handles/handle-h.png \
-	Handles/handle-v.png \
-	Lines/line-h.png \
-	Lines/line-v.png \
-	Lines/menu_line_h.png \
-	Menu-Menubar/menubar_button.png \
-	Menu-Menubar/menubar.png \
-	Others/focus.png \
-	Others/null.png \
-	Others/tree_header.png \
-	ProgressBar/progressbar.png \
-	ProgressBar/progressbar_v.png \
-	ProgressBar/trough-progressbar.png \
-	ProgressBar/trough-progressbar_v.png \
-	Range/slider-horiz.png \
-	Range/slider-horiz-prelight.png \
-	Range/slider-vert.png \
-	Range/slider-vert-prelight.png \
-	Range/trough-horizontal.png \
-	Range/trough-vertical.png \
-	Scrollbars/slider-horiz-active.png \
-	Scrollbars/slider-horiz.png \
-	Scrollbars/slider-vert-active.png \
-        Scrollbars/slider-vert.png \
-	Scrollbars/slider-horiz-insens.png \
-	Scrollbars/slider-horiz-prelight.png \
-	Scrollbars/slider-vert-insens.png \
-	Scrollbars/slider-vert-prelight.png \
-        Scrollbars/trough-scrollbar-horiz.png \
-	Scrollbars/trough-scrollbar-vert.png \
-	Shadows/frame.png \
-	Shadows/frame-gap-start.png \
-	Shadows/frame-gap-end.png \
-	Spin/down-background.png \
-	Spin/up-background.png \
-	Spin/down-background-disable.png \
-	Spin/up-background-disable.png \
-	Spin/down-background-rtl.png \
-	Spin/up-background-rtl.png \
-	Spin/down-background-disable-rtl.png \
-	Spin/up-background-disable-rtl.png \
-	Tabs/notebook-gap-horiz.png \
-	Tabs/notebook-gap-vert.png \
-	Tabs/notebook.png \
-	Tabs/tab-bottom.png \
-	Tabs/tab-left.png \
-	Tabs/tab-right.png \
-	Tabs/tab-top.png \
-	Tabs/tab-bottom-active.png \
-	Tabs/tab-left-active.png \
-	Tabs/tab-right-active.png \
-	Tabs/tab-top-active.png \
-	Toolbar/inline-toolbar.png
+	assets/border.png \
+	assets/button-active.png \
+	assets/button-hover.png \
+	assets/button-insensitive.png \
+	assets/button.png \
+	assets/combo-entry-ltr-button-active.png \
+	assets/combo-entry-ltr-button-hover.png \
+	assets/combo-entry-ltr-button-insensitive.png \
+	assets/combo-entry-ltr-button.png \
+	assets/combo-entry-ltr-entry-active.png \
+	assets/combo-entry-ltr-entry-insensitive.png \
+	assets/combo-entry-ltr-entry.png \
+	assets/combo-entry-rtl-button-active.png \
+	assets/combo-entry-rtl-button-hover.png \
+	assets/combo-entry-rtl-button-insensitive.png \
+	assets/combo-entry-rtl-button.png \
+	assets/combo-entry-rtl-entry-active.png \
+	assets/combo-entry-rtl-entry-insensitive.png \
+	assets/combo-entry-rtl-entry.png \
+	assets/entry-active.png \
+	assets/entry-background-insensitive.png \
+	assets/entry-background.png \
+	assets/entry-insensitive.png \
+	assets/entry.png \
+	assets/focus.png \
+	assets/frame-inline.png \
+	assets/frame-notebook.png \
+	assets/frame.png \
+	assets/handle-horz.png \
+	assets/handle.png \
+	assets/handle-vert.png \
+	assets/checkbox-checked-active.png \
+	assets/checkbox-checked-hover.png \
+	assets/checkbox-checked-insensitive.png \
+	assets/checkbox-checked.png \
+	assets/checkbox-mixed-active.png \
+	assets/checkbox-mixed-hover.png \
+	assets/checkbox-mixed-insensitive.png \
+	assets/checkbox-mixed.png \
+	assets/checkbox-unchecked-active.png \
+	assets/checkbox-unchecked-hover.png \
+	assets/checkbox-unchecked-insensitive.png \
+	assets/checkbox-unchecked.png \
+	assets/line.png \
+	assets/menubar-item-active.png \
+	assets/menu-border.png \
+	assets/menu-checkbox-hover.png \
+	assets/menu-checkbox-checked-hover.png \
+	assets/menu-checkbox-checked-insensitive.png \
+	assets/menu-checkbox-checked.png \
+	assets/menu-checkbox-insensitive.png \
+	assets/menu-checkbox-mixed-hover.png \
+	assets/menu-checkbox-mixed-insensitive.png \
+	assets/menu-checkbox-mixed.png \
+	assets/menu-checkbox.png \
+	assets/menu-pan-down-insensitive.png \
+	assets/menu-pan-down.png \
+	assets/menu-pan-left-hover.png \
+	assets/menu-pan-left-insensitive.png \
+	assets/menu-pan-left.png \
+	assets/menu-pan-right-hover.png \
+	assets/menu-pan-right-insensitive.png \
+	assets/menu-pan-right.png \
+	assets/menu-pan-up-insensitive.png \
+	assets/menu-pan-up.png \
+	assets/menu-radio-hover.png \
+	assets/menu-radio-checked-hover.png \
+	assets/menu-radio-checked-insensitive.png \
+	assets/menu-radio-checked.png \
+	assets/menu-radio-insensitive.png \
+	assets/menu-radio-mixed-hover.png \
+	assets/menu-radio-mixed-insensitive.png \
+	assets/menu-radio-mixed.png \
+	assets/menu-radio.png \
+	assets/notebook-combo-entry-ltr-entry-active.png \
+	assets/notebook-combo-entry-ltr-entry-insensitive.png \
+	assets/notebook-combo-entry-ltr-entry.png \
+	assets/notebook-combo-entry-rtl-entry-active.png \
+	assets/notebook-combo-entry-rtl-entry-insensitive.png \
+	assets/notebook-combo-entry-rtl-entry.png \
+	assets/notebook-entry-active.png \
+	assets/notebook-entry-insensitive.png \
+	assets/notebook-entry.png \
+	assets/pan-down-insensitive.png \
+	assets/pan-down.png \
+	assets/pan-left-insensitive.png \
+	assets/pan-left.png \
+	assets/pan-left-semi.png \
+	assets/pan-right-insensitive.png \
+	assets/pan-right.png \
+	assets/pan-right-semi.png \
+	assets/pan-up-insensitive.png \
+	assets/pan-up.png \
+	assets/progressbar-horz.png \
+	assets/progressbar-horz-trough.png \
+	assets/progressbar-vert.png \
+	assets/progressbar-vert-trough.png \
+	assets/radio-checked-active.png \
+	assets/radio-checked-hover.png \
+	assets/radio-checked-insensitive.png \
+	assets/radio-checked.png \
+	assets/radio-mixed-active.png \
+	assets/radio-mixed-hover.png \
+	assets/radio-mixed-insensitive.png \
+	assets/radio-mixed.png \
+	assets/radio-unchecked-active.png \
+	assets/radio-unchecked-hover.png \
+	assets/radio-unchecked-insensitive.png \
+	assets/radio-unchecked.png \
+	assets/scale-horz-focus.png \
+	assets/scale-horz-trough-active.png \
+	assets/scale-horz-trough.png \
+	assets/scale-slider-active.png \
+	assets/scale-slider-hover.png \
+	assets/scale-slider-insensitive.png \
+	assets/scale-slider.png \
+	assets/scale-vert-trough-active.png \
+	assets/scale-vert-trough.png \
+	assets/scrollbar-horz-slider-active.png \
+	assets/scrollbar-horz-slider-hover.png \
+	assets/scrollbar-horz-slider.png \
+	assets/scrollbar-horz-trough.png \
+	assets/scrollbar-vert-slider-active.png \
+	assets/scrollbar-vert-slider-active-rtl.png \
+	assets/scrollbar-vert-slider-hover.png \
+	assets/scrollbar-vert-slider-hover-rtl.png \
+	assets/scrollbar-vert-slider.png \
+	assets/scrollbar-vert-slider-rtl.png \
+	assets/scrollbar-vert-trough.png \
+	assets/scrollbar-vert-trough-rtl.png \
+	assets/spin-down-insensitive.png \
+	assets/spin-down.png \
+	assets/spin-ltr-down-active.png \
+	assets/spin-ltr-down-hover.png \
+	assets/spin-ltr-down-insensitive.png \
+	assets/spin-ltr-down.png \
+	assets/spin-ltr-up-active.png \
+	assets/spin-ltr-up-hover.png \
+	assets/spin-ltr-up-insensitive.png \
+	assets/spin-ltr-up.png \
+	assets/spin-rtl-down-active.png \
+	assets/spin-rtl-down-hover.png \
+	assets/spin-rtl-down-insensitive.png \
+	assets/spin-rtl-down.png \
+	assets/spin-rtl-up-active.png \
+	assets/spin-rtl-up-hover.png \
+	assets/spin-rtl-up-insensitive.png \
+	assets/spin-rtl-up.png \
+	assets/spin-up-insensitive.png \
+	assets/spin-up.png \
+	assets/tab-down-active.png \
+	assets/tab-down.png \
+	assets/tab-horz-gap.png \
+	assets/tab-left-active.png \
+	assets/tab-left.png \
+	assets/tab-right-active.png \
+	assets/tab-right.png \
+	assets/tab-up-active.png \
+	assets/tab-up.png \
+	assets/tab-vert-gap.png \
+	assets/treeview-pan-down-active.png \
+	assets/treeview-pan-down-hover.png \
+	assets/treeview-pan-down.png \
+	assets/treeview-pan-up-active.png \
+	assets/treeview-pan-up-hover.png \
+	assets/treeview-pan-up.png \
+	assets/treeview-separator-ltr.png \
+	assets/treeview-separator-rtl.png
 
 install-data-local:
 	for dir in $(asset_dirs); do \
@@ -158,4 +196,4 @@ uninstall-local:
 		done; \
 	done
 
-EXTRA_DIST = $(theme_DATA) $(asset_data)
+EXTRA_DIST = $(theme_data) $(asset_data)