Thomas Heijligen submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved Angel Pons: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved Peter Marheine: Looks good to me, but someone else must approve Anastasia Klimchuk: Looks good to me, approved
meson: relocate source file list

Change-Id: I921be8a8a99b93d23c1dbd4ea54672ba9998558d
Signed-off-by: Thomas Heijligen <thomas.heijligen@secunet.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/64026
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Peter Marheine <pmarheine@chromium.org>
---
M meson.build
1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/meson.build b/meson.build
index 222f7c1..6b088f0 100644
--- a/meson.build
+++ b/meson.build
@@ -86,7 +86,40 @@

cargs = []
deps = []
-srcs = []
+srcs = files(
+ '82802ab.c',
+ 'at45db.c',
+ 'bitbang_spi.c',
+ 'edi.c',
+ 'en29lv640b.c',
+ 'flashchips.c',
+ 'flashrom.c',
+ 'fmap.c',
+ 'helpers.c',
+ 'ich_descriptors.c',
+ 'jedec.c',
+ 'layout.c',
+ 'libflashrom.c',
+ 'opaque.c',
+ 'print.c',
+ 'programmer.c',
+ 'programmer_table.c',
+ 's25f.c',
+ 'sfdp.c',
+ 'spi25.c',
+ 'spi25_statusreg.c',
+ 'spi95.c',
+ 'spi.c',
+ 'sst28sf040.c',
+ 'sst49lfxxxc.c',
+ 'sst_fwhub.c',
+ 'stm50.c',
+ 'udelay.c',
+ 'w29ee011.c',
+ 'w39.c',
+ 'writeprotect.c',
+ 'writeprotect_ranges.c',
+)

host_is_x86 = ['x86', 'x86_64'].contains(host_machine.cpu_family())

@@ -392,39 +425,6 @@

include_dir = include_directories('include')

-# core modules needed by both the library and the CLI
-srcs += '82802ab.c'
-srcs += 'at45db.c'
-srcs += 'edi.c'
-srcs += 'en29lv640b.c'
-srcs += 'flashchips.c'
-srcs += 'flashrom.c'
-srcs += 'fmap.c'
-srcs += 'helpers.c'
-srcs += 'ich_descriptors.c'
-srcs += 'jedec.c'
-srcs += 'layout.c'
-srcs += 'libflashrom.c'
-srcs += 'opaque.c'
-srcs += 'print.c'
-srcs += 'programmer.c'
-srcs += 'programmer_table.c'
-srcs += 's25f.c'
-srcs += 'sfdp.c'
-srcs += 'spi25.c'
-srcs += 'spi25_statusreg.c'
-srcs += 'spi95.c'
-srcs += 'spi.c'
-srcs += 'sst28sf040.c'
-srcs += 'sst49lfxxxc.c'
-srcs += 'sst_fwhub.c'
-srcs += 'stm50.c'
-srcs += 'udelay.c'
-srcs += 'w29ee011.c'
-srcs += 'w39.c'
-srcs += 'writeprotect.c'
-srcs += 'writeprotect_ranges.c'
-
mapfile = 'libflashrom.map'
vflag = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile)
flashrom = library(

To view, visit change 64026. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I921be8a8a99b93d23c1dbd4ea54672ba9998558d
Gerrit-Change-Number: 64026
Gerrit-PatchSet: 4
Gerrit-Owner: Thomas Heijligen <src@posteo.de>
Gerrit-Reviewer: Anastasia Klimchuk <aklm@chromium.org>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Edward O'Callaghan <quasisec@chromium.org>
Gerrit-Reviewer: Felix Singer <felixsinger@posteo.net>
Gerrit-Reviewer: Peter Marheine <pmarheine@chromium.org>
Gerrit-Reviewer: Thomas Heijligen <src@posteo.de>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter@mailbox.org>
Gerrit-MessageType: merged