diff mbox series

[061/142] meson: convert replay directory to Meson

Message ID 20200128175342.9066-62-pbonzini@redhat.com
State New
Headers show
Series Proof of concept for Meson integration | expand

Commit Message

Paolo Bonzini Jan. 28, 2020, 5:52 p.m. UTC 
From: Marc-André Lureau <marcandre.lureau@redhat.com>

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 Makefile.objs        |  1 -
 meson.build          |  1 +
 replay/Makefile.objs |  9 ---------
 replay/meson.build   | 11 +++++++++++
 4 files changed, 12 insertions(+), 10 deletions(-)
 delete mode 100644 replay/Makefile.objs
 create mode 100644 replay/meson.build
diff mbox series

Patch

diff --git a/Makefile.objs b/Makefile.objs
index c4cea8d046..7b6985b4fb 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -62,7 +62,6 @@  common-obj-$(if $(CONFIG_LZFSE),m) += block-dmg-lzfse$(DSOSUF)
 common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) += block-dmg-bz2$(DSOSUF)
 
 common-obj-y += hw/
-common-obj-y += replay/
 common-obj-y += backends/
 endif
 
diff --git a/meson.build b/meson.build
index 0532ab3101..d72edea6a8 100644
--- a/meson.build
+++ b/meson.build
@@ -601,6 +601,7 @@  softmmu_ss.add(when: ['CONFIG_FDT', fdt],  if_true: [files('device_tree.c')])
 common_ss.add(files('cpus-common.c'))
 
 subdir('monitor')
+subdir('replay')
 
 mods = []
 block_mods = []
diff --git a/replay/Makefile.objs b/replay/Makefile.objs
deleted file mode 100644
index cee6539a23..0000000000
--- a/replay/Makefile.objs
+++ /dev/null
@@ -1,9 +0,0 @@ 
-common-obj-y += replay.o
-common-obj-y += replay-internal.o
-common-obj-y += replay-events.o
-common-obj-y += replay-time.o
-common-obj-y += replay-input.o
-common-obj-y += replay-char.o
-common-obj-y += replay-snapshot.o
-common-obj-y += replay-net.o
-common-obj-y += replay-audio.o
\ No newline at end of file
diff --git a/replay/meson.build b/replay/meson.build
new file mode 100644
index 0000000000..b53218940a
--- /dev/null
+++ b/replay/meson.build
@@ -0,0 +1,11 @@ 
+softmmu_ss.add(files(
+  'replay.c',
+  'replay-internal.c',
+  'replay-events.c',
+  'replay-time.c',
+  'replay-input.c',
+  'replay-char.c',
+  'replay-snapshot.c',
+  'replay-net.c',
+  'replay-audio.c',
+))