From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:39443) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc9rn-0003z2-0y for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:37:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sc9rl-0002Fa-7S for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:37:14 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:50333) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc9rk-000290-Ui for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:37:13 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so9244268pbb.4 for ; Tue, 05 Jun 2012 23:37:11 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 6 Jun 2012 08:36:20 +0200 Message-Id: <1338964592-22223-14-git-send-email-pbonzini@redhat.com> In-Reply-To: <1338964592-22223-1-git-send-email-pbonzini@redhat.com> References: <1338964592-22223-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 13/25] build: move ui/ objects to nested Makefile.objs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: anthony@codemonkey.ws Signed-off-by: Paolo Bonzini --- Makefile.objs | 21 ++------------------- ui/Makefile.objs | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 ui/Makefile.objs diff --git a/Makefile.objs b/Makefile.objs index 4acdbaa..a6310e3 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -110,7 +110,6 @@ common-obj-$(CONFIG_BRLAPI) += baum.o common-obj-$(CONFIG_POSIX) += migration-exec.o migration-unix.o migration-fd.o common-obj-$(CONFIG_WIN32) += version.o -common-obj-$(CONFIG_SPICE) += ui/spice-core.o ui/spice-input.o ui/spice-display.o spice-qemu-char.o audio-obj-y = audio.o noaudio.o wavaudio.o mixeng.o audio-obj-$(CONFIG_SDL) += sdlaudio.o @@ -127,24 +126,8 @@ audio-obj-$(CONFIG_AUDIO_PT_INT) += audio_pt_int.o audio-obj-$(CONFIG_AUDIO_WIN_INT) += audio_win_int.o audio-obj-y += wavcapture.o common-obj-y += $(addprefix audio/, $(audio-obj-y)) - -ui-obj-y += keymaps.o -ui-obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o -ui-obj-$(CONFIG_COCOA) += cocoa.o -ui-obj-$(CONFIG_CURSES) += curses.o -vnc-obj-y += vnc.o d3des.o -vnc-obj-y += vnc-enc-zlib.o vnc-enc-hextile.o -vnc-obj-y += vnc-enc-tight.o vnc-palette.o -vnc-obj-y += vnc-enc-zrle.o -vnc-obj-$(CONFIG_VNC_TLS) += vnc-tls.o vnc-auth-vencrypt.o -vnc-obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o -ifdef CONFIG_VNC_THREAD -vnc-obj-y += vnc-jobs-async.o -else -vnc-obj-y += vnc-jobs-sync.o -endif -common-obj-y += $(addprefix ui/, $(ui-obj-y)) -common-obj-$(CONFIG_VNC) += $(addprefix ui/, $(vnc-obj-y)) +common-obj-$(CONFIG_SPICE) += spice-qemu-char.o +common-obj-y += ui/ common-obj-y += iov.o acl.o common-obj-$(CONFIG_POSIX) += compatfd.o diff --git a/ui/Makefile.objs b/ui/Makefile.objs new file mode 100644 index 0000000..3687c8a --- /dev/null +++ b/ui/Makefile.objs @@ -0,0 +1,18 @@ +vnc-obj-y += vnc.o d3des.o +vnc-obj-y += vnc-enc-zlib.o vnc-enc-hextile.o +vnc-obj-y += vnc-enc-tight.o vnc-palette.o +vnc-obj-y += vnc-enc-zrle.o +vnc-obj-$(CONFIG_VNC_TLS) += vnc-tls.o vnc-auth-vencrypt.o +vnc-obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o +ifdef CONFIG_VNC_THREAD +vnc-obj-y += vnc-jobs-async.o +else +vnc-obj-y += vnc-jobs-sync.o +endif + +common-obj-y += keymaps.o +common-obj-$(CONFIG_SPICE) += spice-core.o spice-input.o spice-display.o +common-obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o +common-obj-$(CONFIG_COCOA) += cocoa.o +common-obj-$(CONFIG_CURSES) += curses.o +common-obj-$(CONFIG_VNC) += $(vnc-obj-y) -- 1.7.10.1