From patchwork Mon Jun 7 06:08:07 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Chary X-Patchwork-Id: 54833 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 38A261007D1 for ; Mon, 7 Jun 2010 16:15:47 +1000 (EST) Received: from localhost ([127.0.0.1]:59614 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OLVcd-00065A-Eq for incoming@patchwork.ozlabs.org; Mon, 07 Jun 2010 02:15:43 -0400 Received: from [140.186.70.92] (port=34405 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OLVV0-0003Lg-MY for qemu-devel@nongnu.org; Mon, 07 Jun 2010 02:07:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OLVUw-0002fT-Vz for qemu-devel@nongnu.org; Mon, 07 Jun 2010 02:07:50 -0400 Received: from iksaif.net ([88.191.73.63]:54671) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OLVUw-0002ep-N9 for qemu-devel@nongnu.org; Mon, 07 Jun 2010 02:07:46 -0400 Received: from tartiflon (lal69-3-82-241-209-44.fbx.proxad.net [82.241.209.44]) (Authenticated sender: corentincj@iksaif.net) by iksaif.net (Postfix) with ESMTPA id 93D35C9006D; Mon, 7 Jun 2010 08:11:55 +0200 (CEST) From: Corentin Chary To: qemu-devel@nongnu.org Date: Mon, 7 Jun 2010 08:08:07 +0200 Message-Id: <1275890889-13349-5-git-send-email-corentincj@iksaif.net> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1275890889-13349-1-git-send-email-corentincj@iksaif.net> References: <1275890889-13349-1-git-send-email-corentincj@iksaif.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Corentin Chary , Anthony Liguori , Alexander Graf , Adam Litke Subject: [Qemu-devel] [PATCH v2 4/6] ui: move all ui components in ui/ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Move sdl, vnc, curses and cocoa UI into ui/ to cleanup the root directory. Also remove some unnecessary explicit targets from Makefile. Signed-off-by: Corentin Chary --- Makefile | 38 +++----------------- Makefile.objs | 22 ++++++----- cocoa.m => ui/cocoa.m | 0 curses.c => ui/curses.c | 0 curses_keys.h => ui/curses_keys.h | 0 d3des.c => ui/d3des.c | 0 d3des.h => ui/d3des.h | 0 keymaps.c => ui/keymaps.c | 0 keymaps.h => ui/keymaps.h | 0 sdl.c => ui/sdl.c | 0 sdl_keysym.h => ui/sdl_keysym.h | 0 sdl_zoom.c => ui/sdl_zoom.c | 0 sdl_zoom.h => ui/sdl_zoom.h | 0 sdl_zoom_template.h => ui/sdl_zoom_template.h | 0 vnc-auth-sasl.c => ui/vnc-auth-sasl.c | 0 vnc-auth-sasl.h => ui/vnc-auth-sasl.h | 0 vnc-auth-vencrypt.c => ui/vnc-auth-vencrypt.c | 0 vnc-auth-vencrypt.h => ui/vnc-auth-vencrypt.h | 0 .../vnc-encoding-hextile.c | 0 vnc-encoding-tight.c => ui/vnc-encoding-tight.c | 0 vnc-encoding-tight.h => ui/vnc-encoding-tight.h | 0 vnc-encoding-zlib.c => ui/vnc-encoding-zlib.c | 0 vnc-tls.c => ui/vnc-tls.c | 0 vnc-tls.h => ui/vnc-tls.h | 0 vnc.c => ui/vnc.c | 0 vnc.h => ui/vnc.h | 0 vnc_keysym.h => ui/vnc_keysym.h | 0 vnchextile.h => ui/vnchextile.h | 0 x_keymap.c => ui/x_keymap.c | 0 x_keymap.h => ui/x_keymap.h | 0 30 files changed, 17 insertions(+), 43 deletions(-) rename cocoa.m => ui/cocoa.m (100%) rename curses.c => ui/curses.c (100%) rename curses_keys.h => ui/curses_keys.h (100%) rename d3des.c => ui/d3des.c (100%) rename d3des.h => ui/d3des.h (100%) rename keymaps.c => ui/keymaps.c (100%) rename keymaps.h => ui/keymaps.h (100%) rename sdl.c => ui/sdl.c (100%) rename sdl_keysym.h => ui/sdl_keysym.h (100%) rename sdl_zoom.c => ui/sdl_zoom.c (100%) rename sdl_zoom.h => ui/sdl_zoom.h (100%) rename sdl_zoom_template.h => ui/sdl_zoom_template.h (100%) rename vnc-auth-sasl.c => ui/vnc-auth-sasl.c (100%) rename vnc-auth-sasl.h => ui/vnc-auth-sasl.h (100%) rename vnc-auth-vencrypt.c => ui/vnc-auth-vencrypt.c (100%) rename vnc-auth-vencrypt.h => ui/vnc-auth-vencrypt.h (100%) rename vnc-encoding-hextile.c => ui/vnc-encoding-hextile.c (100%) rename vnc-encoding-tight.c => ui/vnc-encoding-tight.c (100%) rename vnc-encoding-tight.h => ui/vnc-encoding-tight.h (100%) rename vnc-encoding-zlib.c => ui/vnc-encoding-zlib.c (100%) rename vnc-tls.c => ui/vnc-tls.c (100%) rename vnc-tls.h => ui/vnc-tls.h (100%) rename vnc.c => ui/vnc.c (100%) rename vnc.h => ui/vnc.h (100%) rename vnc_keysym.h => ui/vnc_keysym.h (100%) rename vnchextile.h => ui/vnchextile.h (100%) rename x_keymap.c => ui/x_keymap.c (100%) rename x_keymap.h => ui/x_keymap.h (100%) diff --git a/cocoa.m b/ui/cocoa.m similarity index 100% rename from cocoa.m rename to ui/cocoa.m diff --git a/curses.c b/ui/curses.c similarity index 100% rename from curses.c rename to ui/curses.c diff --git a/curses_keys.h b/ui/curses_keys.h similarity index 100% rename from curses_keys.h rename to ui/curses_keys.h diff --git a/d3des.c b/ui/d3des.c similarity index 100% rename from d3des.c rename to ui/d3des.c diff --git a/d3des.h b/ui/d3des.h similarity index 100% rename from d3des.h rename to ui/d3des.h diff --git a/keymaps.c b/ui/keymaps.c similarity index 100% rename from keymaps.c rename to ui/keymaps.c diff --git a/keymaps.h b/ui/keymaps.h similarity index 100% rename from keymaps.h rename to ui/keymaps.h diff --git a/sdl.c b/ui/sdl.c similarity index 100% rename from sdl.c rename to ui/sdl.c diff --git a/sdl_keysym.h b/ui/sdl_keysym.h similarity index 100% rename from sdl_keysym.h rename to ui/sdl_keysym.h diff --git a/sdl_zoom.c b/ui/sdl_zoom.c similarity index 100% rename from sdl_zoom.c rename to ui/sdl_zoom.c diff --git a/sdl_zoom.h b/ui/sdl_zoom.h similarity index 100% rename from sdl_zoom.h rename to ui/sdl_zoom.h diff --git a/sdl_zoom_template.h b/ui/sdl_zoom_template.h similarity index 100% rename from sdl_zoom_template.h rename to ui/sdl_zoom_template.h diff --git a/vnc-auth-sasl.c b/ui/vnc-auth-sasl.c similarity index 100% rename from vnc-auth-sasl.c rename to ui/vnc-auth-sasl.c diff --git a/vnc-auth-sasl.h b/ui/vnc-auth-sasl.h similarity index 100% rename from vnc-auth-sasl.h rename to ui/vnc-auth-sasl.h diff --git a/vnc-auth-vencrypt.c b/ui/vnc-auth-vencrypt.c similarity index 100% rename from vnc-auth-vencrypt.c rename to ui/vnc-auth-vencrypt.c diff --git a/vnc-auth-vencrypt.h b/ui/vnc-auth-vencrypt.h similarity index 100% rename from vnc-auth-vencrypt.h rename to ui/vnc-auth-vencrypt.h diff --git a/vnc-encoding-hextile.c b/ui/vnc-encoding-hextile.c similarity index 100% rename from vnc-encoding-hextile.c rename to ui/vnc-encoding-hextile.c diff --git a/vnc-encoding-tight.c b/ui/vnc-encoding-tight.c similarity index 100% rename from vnc-encoding-tight.c rename to ui/vnc-encoding-tight.c diff --git a/vnc-encoding-tight.h b/ui/vnc-encoding-tight.h similarity index 100% rename from vnc-encoding-tight.h rename to ui/vnc-encoding-tight.h diff --git a/vnc-encoding-zlib.c b/ui/vnc-encoding-zlib.c similarity index 100% rename from vnc-encoding-zlib.c rename to ui/vnc-encoding-zlib.c diff --git a/vnc-tls.c b/ui/vnc-tls.c similarity index 100% rename from vnc-tls.c rename to ui/vnc-tls.c diff --git a/vnc-tls.h b/ui/vnc-tls.h similarity index 100% rename from vnc-tls.h rename to ui/vnc-tls.h diff --git a/vnc.c b/ui/vnc.c similarity index 100% rename from vnc.c rename to ui/vnc.c diff --git a/vnc.h b/ui/vnc.h similarity index 100% rename from vnc.h rename to ui/vnc.h diff --git a/vnc_keysym.h b/ui/vnc_keysym.h similarity index 100% rename from vnc_keysym.h rename to ui/vnc_keysym.h diff --git a/vnchextile.h b/ui/vnchextile.h similarity index 100% rename from vnchextile.h rename to ui/vnchextile.h diff --git a/x_keymap.c b/ui/x_keymap.c similarity index 100% rename from x_keymap.c rename to ui/x_keymap.c diff --git a/x_keymap.h b/ui/x_keymap.h similarity index 100% rename from x_keymap.h rename to ui/x_keymap.h diff --git a/Makefile b/Makefile index 221fbd8..f0295da 100644 --- a/Makefile +++ b/Makefile @@ -96,42 +96,14 @@ audio/audio.o audio/fmodaudio.o: QEMU_CFLAGS += $(FMOD_CFLAGS) QEMU_CFLAGS+=$(CURL_CFLAGS) -cocoa.o: cocoa.m +ui/cocoa.o: ui/cocoa.m -keymaps.o: keymaps.c keymaps.h +ui/sdl.o audio/sdlaudio.o ui/sdl_zoom.o baum.o: QEMU_CFLAGS += $(SDL_CFLAGS) -sdl_zoom.o: sdl_zoom.c sdl_zoom.h sdl_zoom_template.h - -sdl.o: sdl.c keymaps.h sdl_keysym.h sdl_zoom.h - -sdl.o audio/sdlaudio.o sdl_zoom.o baum.o: QEMU_CFLAGS += $(SDL_CFLAGS) - -acl.o: acl.h acl.c - -vnc.h: vnc-tls.h vnc-auth-vencrypt.h vnc-auth-sasl.h keymaps.h - -vnc.o: vnc.c vnc.h vnc_keysym.h vnchextile.h d3des.c d3des.h acl.h - -vnc.o: QEMU_CFLAGS += $(VNC_TLS_CFLAGS) - -vnc-tls.o: vnc-tls.c vnc.h - -vnc-auth-vencrypt.o: vnc-auth-vencrypt.c vnc.h - -vnc-auth-sasl.o: vnc-auth-sasl.c vnc.h - -vnc-encoding-zlib.o: vnc-encoding-zlib.c vnc.h - -vnc-encoding-hextile.o: vnc-encoding-hextile.c vnc.h - -vnc-encoding-tight.o: vnc-encoding-tight.c vnc.h vnc-encoding-tight.h - -curses.o: curses.c keymaps.h curses_keys.h +ui/vnc.o: QEMU_CFLAGS += $(VNC_TLS_CFLAGS) bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS) -iov.o: iov.c iov.h - ###################################################################### qemu-img.o: qemu-img-cmds.h @@ -159,7 +131,7 @@ clean: # avoid old build problems by removing potentially incorrect old files rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h rm -f *.o *.d *.a $(TOOLS) TAGS cscope.* *.pod *~ */*~ - rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d + rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d ui/*.o ui/*.d rm -f qemu-img-cmds.h $(MAKE) -C tests clean for d in $(ALL_SUBDIRS) libhw32 libhw64 libuser libdis libdis-user; do \ @@ -343,4 +315,4 @@ tarbin: $(mandir)/man8/qemu-nbd.8 # Include automatically generated dependency files --include $(wildcard *.d audio/*.d slirp/*.d block/*.d net/*.d) +-include $(wildcard *.d audio/*.d slirp/*.d block/*.d net/*.d ui/*.d) diff --git a/Makefile.objs b/Makefile.objs index 9796dcb..d5973ba 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -100,16 +100,18 @@ audio-obj-$(CONFIG_AUDIO_WIN_INT) += audio_win_int.o audio-obj-y += wavcapture.o common-obj-y += $(addprefix audio/, $(audio-obj-y)) -common-obj-y += keymaps.o -common-obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o -common-obj-$(CONFIG_CURSES) += curses.o -common-obj-y += vnc.o acl.o d3des.o -common-obj-y += vnc-encoding-zlib.o vnc-encoding-hextile.o -common-obj-y += vnc-encoding-tight.o -common-obj-y += iov.o -common-obj-$(CONFIG_VNC_TLS) += vnc-tls.o vnc-auth-vencrypt.o -common-obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o -common-obj-$(CONFIG_COCOA) += cocoa.o +ui-obj-y += keymaps.o +ui-obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o +ui-obj-$(CONFIG_CURSES) += curses.o +ui-obj-y += vnc.o d3des.o +ui-obj-y += vnc-encoding-zlib.o vnc-encoding-hextile.o +ui-obj-y += vnc-encoding-tight.o +ui-obj-$(CONFIG_VNC_TLS) += vnc-tls.o vnc-auth-vencrypt.o +ui-obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o +ui-obj-$(CONFIG_COCOA) += cocoa.o +common-obj-y += $(addprefix ui/, $(ui-obj-y)) + +common-obj-y += iov.o acl.o common-obj-$(CONFIG_IOTHREAD) += qemu-thread.o common-obj-y += notify.o event_notifier.o common-obj-y += qemu-timer.o