meson: use install_data to replace install_dir

11 files changed, 93 insertions, 20 deletions

diff --git a/src/themes/ClearlooksRe/meson.build b/src/themes/ClearlooksRe/meson.build
new file mode 100644
index 00000000..b58b9218
--- /dev/null
+++ b/src/themes/ClearlooksRe/meson.build
@@ -0,0 +1,4 @@
+install_data(
+  'metacity-theme-1.xml',
+  install_dir : join_paths(datadir, 'themes', 'ClearlooksRe', 'metacity-1'),
+)
diff --git a/src/themes/Dopple-Left/meson.build b/src/themes/Dopple-Left/meson.build
new file mode 100644
index 00000000..1adb4647
--- /dev/null
+++ b/src/themes/Dopple-Left/meson.build
@@ -0,0 +1,4 @@
+install_data(
+  'metacity-theme-1.xml',
+  install_dir : join_paths(datadir, 'themes', 'Dopple-Left', 'metacity-1'),
+)
diff --git a/src/themes/Dopple/meson.build b/src/themes/Dopple/meson.build
new file mode 100644
index 00000000..87384e54
--- /dev/null
+++ b/src/themes/Dopple/meson.build
@@ -0,0 +1,4 @@
+install_data(
+  'metacity-theme-1.xml',
+  install_dir : join_paths(datadir, 'themes', 'Dopple', 'metacity-1'),
+)
diff --git a/src/themes/DustBlue/meson.build b/src/themes/DustBlue/meson.build
new file mode 100644
index 00000000..3402d4bb
--- /dev/null
+++ b/src/themes/DustBlue/meson.build
@@ -0,0 +1,17 @@
+install_data(
+  'button_close_normal.png',
+  'button_close_prelight.png',
+  'button_close_pressed.png',
+  'button_max_normal.png',
+  'button_max_prelight.png',
+  'button_max_pressed.png',
+  'button_menu_normal.png',
+  'button_menu_prelight.png',
+  'button_menu_pressed.png',
+  'button_min_normal.png',
+  'button_min_prelight.png',
+  'button_min_pressed.png',
+  'menu.png',
+  'metacity-theme-1.xml',
+  install_dir : join_paths(datadir, 'themes', 'DustBlue', 'metacity-1')
+)
diff --git a/src/themes/Spidey-Left/meson.build b/src/themes/Spidey-Left/meson.build
new file mode 100644
index 00000000..e0b5a966
--- /dev/null
+++ b/src/themes/Spidey-Left/meson.build
@@ -0,0 +1,4 @@
+install_data(
+  'metacity-theme-1.xml',
+  install_dir : join_paths(datadir, 'themes', 'Spidey-Left', 'metacity-1'),
+)
diff --git a/src/themes/Spidey/meson.build b/src/themes/Spidey/meson.build
new file mode 100644
index 00000000..b0cc49c4
--- /dev/null
+++ b/src/themes/Spidey/meson.build
@@ -0,0 +1,4 @@
+install_data(
+  'metacity-theme-1.xml',
+  install_dir : join_paths(datadir, 'themes', 'Spidey', 'metacity-1'),
+)
diff --git a/src/themes/Splint-Left/meson.build b/src/themes/Splint-Left/meson.build
new file mode 100644
index 00000000..495fc432
--- /dev/null
+++ b/src/themes/Splint-Left/meson.build
@@ -0,0 +1,4 @@
+install_data(
+  'metacity-theme-1.xml',
+  install_dir : join_paths(datadir, 'themes', 'Splint-Left', 'metacity-1'),
+)
diff --git a/src/themes/Splint/meson.build b/src/themes/Splint/meson.build
new file mode 100644
index 00000000..7b1f05eb
--- /dev/null
+++ b/src/themes/Splint/meson.build
@@ -0,0 +1,4 @@
+install_data(
+  'metacity-theme-1.xml',
+  install_dir : join_paths(datadir, 'themes', 'Splint', 'metacity-1'),
+)
diff --git a/src/themes/WinMe/meson.build b/src/themes/WinMe/meson.build
new file mode 100644
index 00000000..f0b269e9
--- /dev/null
+++ b/src/themes/WinMe/meson.build
@@ -0,0 +1,14 @@
+install_data(
+  'close_normal.png',
+  'close_normal_small.png',
+  'close_pressed.png',
+  'close_pressed_small.png',
+  'maximize_normal.png',
+  'maximize_pressed.png',
+  'metacity-theme-1.xml',
+  'minimize_normal.png',
+  'minimize_pressed.png',
+  'restore_normal.png',
+  'restore_pressed.png',
+  install_dir : join_paths(datadir, 'themes', 'WinMe', 'metacity-1')
+)
diff --git a/src/themes/eOS/meson.build b/src/themes/eOS/meson.build
new file mode 100644
index 00000000..309cae15
--- /dev/null
+++ b/src/themes/eOS/meson.build
@@ -0,0 +1,24 @@
+install_data(
+  'close.png',
+  'close_unfocused_over.png',
+  'close_unfocused.png',
+  'maximize.png',
+  'maximize_unfocused_over.png',
+  'maximize_unfocused.png',
+  'menu.png',
+  'menu_prelight.png',
+  'metacity-theme-1.xml',
+  'minimize.png',
+  'minimize_unfocused_over.png',
+  'minimize_unfocused.png',
+  'trough_left.png',
+  'trough_left_unfocused.png',
+  'trough_middle.png',
+  'trough_middle_unfocused.png',
+  'trough_right.png',
+  'trough_right_unfocused.png',
+  'unmaximize.png',
+  'unmaximize_unfocused_over.png',
+  'unmaximize_unfocused.png',
+  install_dir : join_paths(datadir, 'themes', 'eOS', 'metacity-1')
+)
diff --git a/src/themes/meson.build b/src/themes/meson.build
index e11da1f5..f9a4470d 100644
--- a/src/themes/meson.build
+++ b/src/themes/meson.build
@@ -1,20 +1,10 @@
-themes = [
-  'ClearlooksRe',
-  'eOS',
-  'DustBlue',
-  'WinMe',
-  'Splint-Left',
-  'Dopple',
-  'Spidey-Left',
-  'Splint',
-  'Dopple-Left',
-  'Spidey',
-]
-
-themedir = join_paths(datadir, 'themes')
-foreach theme: themes
-  install_subdir(theme,
-    install_dir : join_paths(themedir, theme, 'metacity-1'),
-    strip_directory : true
-  )
-endforeach
+subdir('ClearlooksRe')
+subdir('eOS')
+subdir('DustBlue')
+subdir('WinMe')
+subdir('Splint-Left')
+subdir('Dopple')
+subdir('Spidey-Left')
+subdir('Splint')
+subdir('Dopple-Left')
+subdir('Spidey')