Skip to content

Commit c975bdc

Browse files
committed
Meson: avoid building sources twice
By using a static library as an intermediate.
1 parent 2ff8de8 commit c975bdc

File tree

1 file changed

+17
-21
lines changed

1 file changed

+17
-21
lines changed

src/meson.build

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ resources = gnome.compile_resources(
1111
)
1212

1313
# headers for enum scanning
14-
headers = files (
14+
headers = files(
1515
'tilesource.h',
1616
'tilecache.h',
1717
)
1818

19-
sources = files (
19+
sources = files(
2020
'action.c',
2121
'app.c',
2222
'builtin.c',
@@ -178,30 +178,26 @@ enumtypes = gnome.mkenums(
178178
c_template: 'enumtypes.c.in',
179179
)
180180

181-
nip4 = executable('nip4', [
182-
enumtypes,
183-
marshal,
184-
resources,
185-
parse_c,
186-
lex_c,
187-
sources,
188-
'main-gui.c',
189-
],
181+
nip4_lib = static_library('nip4',
182+
sources: [enumtypes, marshal, resources, parse_c, lex_c, sources],
183+
dependencies: nip4_deps,
184+
)
185+
186+
nip4_dep = declare_dependency(
190187
dependencies: nip4_deps,
188+
link_whole: nip4_lib,
189+
)
190+
191+
nip4 = executable('nip4',
192+
'main-gui.c',
193+
dependencies: nip4_dep,
191194
win_subsystem: 'windows',
192195
install: true,
193196
)
194197

195-
nip4_batch = executable('nip4-batch', [
196-
enumtypes,
197-
marshal,
198-
resources,
199-
parse_c,
200-
lex_c,
201-
sources,
202-
'main-batch.c',
203-
],
204-
dependencies: nip4_deps,
198+
nip4_batch = executable('nip4-batch',
199+
'main-batch.c',
200+
dependencies: nip4_dep,
205201
win_subsystem: 'console',
206202
install: true,
207203
)

0 commit comments

Comments
 (0)