diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-05-22 13:42:53 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-06-07 09:21:12 +0200 |
| commit | 7f07b9cbc51066ddaa133b29389e225612aaced2 (patch) | |
| tree | 67c007537b3323e89f834f7d564ea6e1b6693146 /qom | |
| parent | 99100dc3b55126fc60fbbfb854d5aab25ab5dafd (diff) | |
| download | qemu-7f07b9cbc51066ddaa133b29389e225612aaced2.zip qemu-7f07b9cbc51066ddaa133b29389e225612aaced2.tar.gz qemu-7f07b9cbc51066ddaa133b29389e225612aaced2.tar.bz2 | |
build: adapt qom/Makefile and move it to Makefile.objs
qom/ already used a separate makefile. Convert it to use relative
paths, and make it declare both common-obj-y and user-obj-y. This
way, the upper makefiles do not need to know that some QOM files
are compiled twice.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'qom')
| -rw-r--r-- | qom/Makefile | 2 | ||||
| -rw-r--r-- | qom/Makefile.objs | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/qom/Makefile b/qom/Makefile deleted file mode 100644 index 34c6de5..0000000 --- a/qom/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -qom-y = object.o container.o qom-qobject.o -qom-twice-y = cpu.o diff --git a/qom/Makefile.objs b/qom/Makefile.objs new file mode 100644 index 0000000..5ef060a --- /dev/null +++ b/qom/Makefile.objs @@ -0,0 +1,4 @@ +qom-obj-y = object.o container.o qom-qobject.o +qom-obj-twice-y = cpu.o +common-obj-y = $(qom-obj-twice-y) +user-obj-y = $(qom-obj-twice-y) |