summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-08-10 23:40:56 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-08-10 23:40:56 +0900
commitef2fb5c4f9e7895d5df2b5121dca2b98352b4ac0 (patch)
tree465fd87d26119e33c39c0a8066ed0525a052a9a8 /data
parentc80766dfa275a60b2047701d816e2f45395e75dd (diff)
meson build - trim down some data file build files a little
Diffstat (limited to 'data')
-rw-r--r--data/backgrounds/meson.build81
-rw-r--r--data/desktop/meson.build13
-rw-r--r--data/favorites/meson.build19
-rw-r--r--data/flags/meson.build207
-rw-r--r--data/icons/meson.build29
-rw-r--r--data/images/meson.build19
-rw-r--r--data/input_methods/meson.build23
-rw-r--r--data/tools/meson.build10
-rw-r--r--data/units/meson.build12
-rw-r--r--data/xsession/meson.build13
10 files changed, 200 insertions, 226 deletions
diff --git a/data/backgrounds/meson.build b/data/backgrounds/meson.build
index ae6e11766..36ce329ae 100644
--- a/data/backgrounds/meson.build
+++ b/data/backgrounds/meson.build
@@ -1,42 +1,39 @@
1backgrounds_dist = [ 1install_data([ 'Brown_Rock_Hi.edj',
2 'Brown_Rock_Hi.edj', 2 'Colorful_Roses.edj',
3 'Colorful_Roses.edj', 3 'Darkconcrete.edj',
4 'Darkconcrete.edj', 4 'Dark_Gradient.edj',
5 'Dark_Gradient.edj', 5 'Grassy.edj',
6 'Grassy.edj', 6 'Japanesemaple.edj',
7 'Japanesemaple.edj', 7 'Lakegrass.edj',
8 'Lakegrass.edj', 8 'Light_Gradient.edj',
9 'Light_Gradient.edj', 9 'Mossstring.edj',
10 'Mossstring.edj', 10 'Motleyrock.edj',
11 'Motleyrock.edj', 11 'Newgrowth.edj',
12 'Newgrowth.edj', 12 'Orange_Roses.edj',
13 'Orange_Roses.edj', 13 'Pattern_Radial.edj',
14 'Pattern_Radial.edj', 14 'Pattern_Vertical.edj',
15 'Pattern_Vertical.edj', 15 'Pattern_Vertical_Hi.edj',
16 'Pattern_Vertical_Hi.edj', 16 'Pine_Silhouettes.edj',
17 'Pine_Silhouettes.edj', 17 'Purple_Flower_Bunch.edj',
18 'Purple_Flower_Bunch.edj', 18 'Skywall.edj',
19 'Skywall.edj', 19 'Stringflower.edj',
20 'Stringflower.edj', 20 'Wetgrass.edj',
21 'Wetgrass.edj', 21 'Wetleaf.edj',
22 'Wetleaf.edj', 22 'Whiterock.edj',
23 'Whiterock.edj', 23 'Hills.edj',
24 'Hills.edj', 24 'Light.edj',
25 'Light.edj', 25 'Temple.edj',
26 'Temple.edj', 26 'Train.edj',
27 'Train.edj', 27 'Curly_Leaves.edj',
28 'Curly_Leaves.edj', 28 'Flower_Petals.edj',
29 'Flower_Petals.edj', 29 'Go_Away.edj',
30 'Go_Away.edj', 30 'Green_Stem.edj',
31 'Green_Stem.edj', 31 'Leafy_Red.edj',
32 'Leafy_Red.edj', 32 'Ramen.edj',
33 'Ramen.edj', 33 'Shady_Leaves.edj',
34 'Shady_Leaves.edj', 34 'Windy_Palm.edj',
35 'Windy_Palm.edj', 35 'Lantern_Cluster.edj',
36 'Lantern_Cluster.edj', 36 'Wall_Lanterns.edj'
37 'Wall_Lanterns.edj' 37 ],
38] 38 install_dir: join_paths(dir_data, 'enlightenment/data/backgrounds')
39 39 )
40install_data(backgrounds_dist,
41 install_dir: join_paths(dir_data, 'enlightenment/data/backgrounds')
42)
diff --git a/data/desktop/meson.build b/data/desktop/meson.build
index 824f7bf2d..442b20d4d 100644
--- a/data/desktop/meson.build
+++ b/data/desktop/meson.build
@@ -1,8 +1,5 @@
1desktop_dist = [ 1install_data([ 'enlightenment_filemanager.desktop',
2 'enlightenment_filemanager.desktop', 2 'enlightenment_askpass.desktop'
3 'enlightenment_askpass.desktop' 3 ],
4] 4 install_dir: join_paths(dir_data, 'applications')
5 5 )
6install_data(desktop_dist,
7 install_dir: join_paths(dir_data, 'applications')
8)
diff --git a/data/favorites/meson.build b/data/favorites/meson.build
index be8ffc581..85793a604 100644
--- a/data/favorites/meson.build
+++ b/data/favorites/meson.build
@@ -1,11 +1,8 @@
1favorites_dist = [ 1install_data([ '.order',
2 '.order', 2 'desktop.desktop',
3 'desktop.desktop', 3 'home.desktop',
4 'home.desktop', 4 'root.desktop',
5 'root.desktop', 5 'tmp.desktop'
6 'tmp.desktop' 6 ],
7] 7 install_dir: join_paths(dir_data, 'enlightenment/data/favorites')
8 8 )
9install_data(favorites_dist,
10 install_dir: join_paths(dir_data, 'enlightenment/data/favorites')
11)
diff --git a/data/flags/meson.build b/data/flags/meson.build
index fd5017198..aa322c067 100644
--- a/data/flags/meson.build
+++ b/data/flags/meson.build
@@ -1,105 +1,102 @@
1flags_dist = [ 1install_data([ 'ad_flag.png',
2 'ad_flag.png', 2 'af_flag.png',
3 'af_flag.png', 3 'al_flag.png',
4 'al_flag.png', 4 'am_flag.png',
5 'am_flag.png', 5 'ara_flag.png',
6 'ara_flag.png', 6 'ar_flag.png',
7 'ar_flag.png', 7 'at_flag.png',
8 'at_flag.png', 8 'az_flag.png',
9 'az_flag.png', 9 'ba_flag.png',
10 'ba_flag.png', 10 'bd_flag.png',
11 'bd_flag.png', 11 'be_flag.png',
12 'be_flag.png', 12 'bg_flag.png',
13 'bg_flag.png', 13 'brai_flag.png',
14 'brai_flag.png', 14 'br_flag.png',
15 'br_flag.png', 15 'bt_flag.png',
16 'bt_flag.png', 16 'bw_flag.png',
17 'bw_flag.png', 17 'by_flag.png',
18 'by_flag.png', 18 'ca_flag.png',
19 'ca_flag.png', 19 'cat_flag.png',
20 'cat_flag.png', 20 'cd_flag.png',
21 'cd_flag.png', 21 'ch_flag.png',
22 'ch_flag.png', 22 'cm_flag.png',
23 'cm_flag.png', 23 'cn_flag.png',
24 'cn_flag.png', 24 'cz_flag.png',
25 'cz_flag.png', 25 'de_flag.png',
26 'de_flag.png', 26 'dk_flag.png',
27 'dk_flag.png', 27 'ee_flag.png',
28 'ee_flag.png', 28 'epo_flag.png',
29 'epo_flag.png', 29 'es_flag.png',
30 'es_flag.png', 30 'et_flag.png',
31 'et_flag.png', 31 'fi_flag.png',
32 'fi_flag.png', 32 'fo_flag.png',
33 'fo_flag.png', 33 'fr_flag.png',
34 'fr_flag.png', 34 'gb_flag.png',
35 'gb_flag.png', 35 'ge_flag.png',
36 'ge_flag.png', 36 'gh_flag.png',
37 'gh_flag.png', 37 'gn_flag.png',
38 'gn_flag.png', 38 'gr_flag.png',
39 'gr_flag.png', 39 'hr_flag.png',
40 'hr_flag.png', 40 'hu_flag.png',
41 'hu_flag.png', 41 'ie_flag.png',
42 'ie_flag.png', 42 'il_flag.png',
43 'il_flag.png', 43 'in_flag.png',
44 'in_flag.png', 44 'iq_flag.png',
45 'iq_flag.png', 45 'ir_flag.png',
46 'ir_flag.png', 46 'is_flag.png',
47 'is_flag.png', 47 'it_flag.png',
48 'it_flag.png', 48 'jp_flag.png',
49 'jp_flag.png', 49 'ke_flag.png',
50 'ke_flag.png', 50 'kg_flag.png',
51 'kg_flag.png', 51 'kh_flag.png',
52 'kh_flag.png', 52 'kr_flag.png',
53 'kr_flag.png', 53 'ku_flag.png',
54 'ku_flag.png', 54 'kz_flag.png',
55 'kz_flag.png', 55 'la_flag.png',
56 'la_flag.png', 56 'lang-system.png',
57 'lang-system.png', 57 'latam_flag.png',
58 'latam_flag.png', 58 'lk_flag.png',
59 'lk_flag.png', 59 'lt_flag.png',
60 'lt_flag.png', 60 'lv_flag.png',
61 'lv_flag.png', 61 'ma_flag.png',
62 'ma_flag.png', 62 'mao_flag.png',
63 'mao_flag.png', 63 'md_flag.png',
64 'md_flag.png', 64 'me_flag.png',
65 'me_flag.png', 65 'mk_flag.png',
66 'mk_flag.png', 66 'ml_flag.png',
67 'ml_flag.png', 67 'mm_flag.png',
68 'mm_flag.png', 68 'mn_flag.png',
69 'mn_flag.png', 69 'mt_flag.png',
70 'mt_flag.png', 70 'mv_flag.png',
71 'mv_flag.png', 71 'my_flag.png',
72 'my_flag.png', 72 'ng_flag.png',
73 'ng_flag.png', 73 'nl_flag.png',
74 'nl_flag.png', 74 'no_flag.png',
75 'no_flag.png', 75 'np_flag.png',
76 'np_flag.png', 76 'ph_flag.png',
77 'ph_flag.png', 77 'pk_flag.png',
78 'pk_flag.png', 78 'pl_flag.png',
79 'pl_flag.png', 79 'pt_flag.png',
80 'pt_flag.png', 80 'ro_flag.png',
81 'ro_flag.png', 81 'rs_flag.png',
82 'rs_flag.png', 82 'ru_flag.png',
83 'ru_flag.png', 83 'se_flag.png',
84 'se_flag.png', 84 'si_flag.png',
85 'si_flag.png', 85 'sk_flag.png',
86 'sk_flag.png', 86 'sn_flag.png',
87 'sn_flag.png', 87 'sy_flag.png',
88 'sy_flag.png', 88 'th_flag.png',
89 'th_flag.png', 89 'tj_flag.png',
90 'tj_flag.png', 90 'tm_flag.png',
91 'tm_flag.png', 91 'tr_flag.png',
92 'tr_flag.png', 92 'tw_flag.png',
93 'tw_flag.png', 93 'tz_flag.png',
94 'tz_flag.png', 94 'ua_flag.png',
95 'ua_flag.png', 95 'unknown_flag.png',
96 'unknown_flag.png', 96 'us_flag.png',
97 'us_flag.png', 97 'uz_flag.png',
98 'uz_flag.png', 98 'vn_flag.png',
99 'vn_flag.png', 99 'za_flag.png'
100 'za_flag.png' 100 ],
101] 101 install_dir: join_paths(dir_data, 'enlightenment/data/flags')
102 102 )
103install_data(flags_dist,
104 install_dir: join_paths(dir_data, 'enlightenment/data/flags')
105)
diff --git a/data/icons/meson.build b/data/icons/meson.build
index 05fd5925e..63ab8292c 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -1,18 +1,15 @@
1icons_dist = [ 1install_data([ 'xterm.png',
2 'xterm.png', 2 'web_browser.png',
3 'web_browser.png', 3 'audio_player.png',
4 'audio_player.png', 4 'mail_client.png',
5 'mail_client.png', 5 'video_player.png',
6 'video_player.png', 6 'text_editor.png',
7 'text_editor.png', 7 'image_viewer.png',
8 'image_viewer.png', 8 'audio_player2.png'
9 'audio_player2.png' 9 ],
10] 10 install_dir: join_paths(dir_data, 'enlightenment/data/icons')
11 11 )
12install_data(icons_dist,
13 install_dir: join_paths(dir_data, 'enlightenment/data/icons')
14)
15 12
16install_data('enlightenment-askpass.png', 13install_data('enlightenment-askpass.png',
17 install_dir: join_paths(dir_data, 'pixmaps') 14 install_dir: join_paths(dir_data, 'pixmaps')
18) 15 )
diff --git a/data/images/meson.build b/data/images/meson.build
index 944c03bf1..5cdafec8e 100644
--- a/data/images/meson.build
+++ b/data/images/meson.build
@@ -1,11 +1,8 @@
1images_dist = [ 1install_data([ 'enlightenment.png',
2 'enlightenment.png', 2 'test.png',
3 'test.png', 3 'test.jpg',
4 'test.jpg', 4 'test.edj',
5 'test.edj', 5 'test.svg'
6 'test.svg' 6 ],
7] 7 install_dir: join_paths(dir_data, 'enlightenment/data/images')
8 8 )
9install_data(images_dist,
10 install_dir: join_paths(dir_data, 'enlightenment/data/images')
11)
diff --git a/data/input_methods/meson.build b/data/input_methods/meson.build
index 147abdb71..f75e0f09a 100644
--- a/data/input_methods/meson.build
+++ b/data/input_methods/meson.build
@@ -1,13 +1,10 @@
1input_methods_dist = [ 1install_data([ 'scim.imc',
2 'scim.imc', 2 'uim.imc',
3 'uim.imc', 3 'iiimf.imc',
4 'iiimf.imc', 4 'ibus.imc',
5 'ibus.imc', 5 'gcin.imc',
6 'gcin.imc', 6 'hime.imc',
7 'hime.imc', 7 'fcitx.imc'
8 'fcitx.imc' 8 ],
9] 9 install_dir: join_paths(dir_data, 'enlightenment/data/input_methods')
10 10 )
11install_data(input_methods_dist,
12 install_dir: join_paths(dir_data, 'enlightenment/data/input_methods')
13)
diff --git a/data/tools/meson.build b/data/tools/meson.build
index 212851082..3b39ab279 100644
--- a/data/tools/meson.build
+++ b/data/tools/meson.build
@@ -1,7 +1,3 @@
1tools_dist = [ 1install_data('enlightenment_remote',
2 'enlightenment_remote' 2 install_dir: dir_bin
3] 3 )
4
5install_data(tools_dist,
6 install_dir: dir_bin
7)
diff --git a/data/units/meson.build b/data/units/meson.build
index a30265b13..ac388bbe3 100644
--- a/data/units/meson.build
+++ b/data/units/meson.build
@@ -1,8 +1,8 @@
1if get_option('systemd') == true 1if get_option('systemd') == true
2 configure_file(input: 'enlightenment.service.in', 2 configure_file(input : 'enlightenment.service.in',
3 output: 'enlightenment.service', 3 output : 'enlightenment.service',
4 install: true, 4 install : true,
5 install_dir: systemd_unitdir, 5 install_dir : systemd_unitdir,
6 configuration: config_h 6 configuration: config_h
7 ) 7 )
8endif 8endif
diff --git a/data/xsession/meson.build b/data/xsession/meson.build
index 2a07a0ee3..dbf3f22ff 100644
--- a/data/xsession/meson.build
+++ b/data/xsession/meson.build
@@ -1,9 +1,8 @@
1desktop_config = configuration_data() 1desktop_config = configuration_data()
2desktop_config.set('prefix', dir_prefix) 2desktop_config.set('prefix', dir_prefix)
3 3configure_file(input : 'enlightenment.desktop.in',
4configure_file(input: 'enlightenment.desktop.in', 4 output : 'enlightenment.desktop',
5 output: 'enlightenment.desktop', 5 install : true,
6 install: true, 6 install_dir : join_paths(dir_data, 'xsessions'),
7 install_dir: join_paths(dir_data, 'xsessions'), 7 configuration: desktop_config
8 configuration: desktop_config 8 )
9)