diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-01 12:14:50 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-07 13:52:10 -0500 |
| commit | ef749d07e717ca38b7d8b525c81d6b04db5f16ed (patch) | |
| tree | 0b36790a3c9532c6b3c6e7815d9300096518fd2b /Makefile.objs | |
| parent | d5ec4f27c387c3b3200abb8656343b2519ea3047 (diff) | |
json-parser: propagate error from parser
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'Makefile.objs')
| -rw-r--r-- | Makefile.objs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.objs b/Makefile.objs index 0f7bb52fc0..66ffad4b78 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -2,7 +2,7 @@ # QObject qobject-obj-y = qint.o qstring.o qdict.o qlist.o qfloat.o qbool.o qobject-obj-y += qjson.o json-lexer.o json-streamer.o json-parser.o -qobject-obj-y += qerror.o +qobject-obj-y += qerror.o error.o ####################################################################### # oslib-obj-y is code depending on the OS (win32 vs posix) @@ -59,7 +59,7 @@ fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y)) # system emulation, i.e. a single QEMU executable should support all # CPUs and machines. -common-obj-y = $(block-obj-y) blockdev.o error.o +common-obj-y = $(block-obj-y) blockdev.o common-obj-y += $(net-obj-y) common-obj-y += $(qobject-obj-y) common-obj-$(CONFIG_LINUX) += $(fsdev-obj-$(CONFIG_LINUX)) |