diff options
| -rw-r--r-- | Makefile | 38 | ||||
| -rw-r--r-- | Makefile.objs | 22 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | ui/cocoa.m (renamed from cocoa.m) | 0 | ||||
| -rw-r--r-- | ui/curses.c (renamed from curses.c) | 0 | ||||
| -rw-r--r-- | ui/curses_keys.h (renamed from curses_keys.h) | 0 | ||||
| -rw-r--r-- | ui/d3des.c (renamed from d3des.c) | 0 | ||||
| -rw-r--r-- | ui/d3des.h (renamed from d3des.h) | 0 | ||||
| -rw-r--r-- | ui/keymaps.c (renamed from keymaps.c) | 0 | ||||
| -rw-r--r-- | ui/keymaps.h (renamed from keymaps.h) | 0 | ||||
| -rw-r--r-- | ui/sdl.c (renamed from sdl.c) | 0 | ||||
| -rw-r--r-- | ui/sdl_keysym.h (renamed from sdl_keysym.h) | 0 | ||||
| -rw-r--r-- | ui/sdl_zoom.c (renamed from sdl_zoom.c) | 0 | ||||
| -rw-r--r-- | ui/sdl_zoom.h (renamed from sdl_zoom.h) | 0 | ||||
| -rw-r--r-- | ui/sdl_zoom_template.h (renamed from sdl_zoom_template.h) | 0 | ||||
| -rw-r--r-- | ui/vnc-auth-sasl.c (renamed from vnc-auth-sasl.c) | 0 | ||||
| -rw-r--r-- | ui/vnc-auth-sasl.h (renamed from vnc-auth-sasl.h) | 0 | ||||
| -rw-r--r-- | ui/vnc-auth-vencrypt.c (renamed from vnc-auth-vencrypt.c) | 0 | ||||
| -rw-r--r-- | ui/vnc-auth-vencrypt.h (renamed from vnc-auth-vencrypt.h) | 0 | ||||
| -rw-r--r-- | ui/vnc-encoding-hextile.c (renamed from vnc-encoding-hextile.c) | 0 | ||||
| -rw-r--r-- | ui/vnc-encoding-tight.c (renamed from vnc-encoding-tight.c) | 0 | ||||
| -rw-r--r-- | ui/vnc-encoding-tight.h (renamed from vnc-encoding-tight.h) | 0 | ||||
| -rw-r--r-- | ui/vnc-encoding-zlib.c (renamed from vnc-encoding-zlib.c) | 0 | ||||
| -rw-r--r-- | ui/vnc-tls.c (renamed from vnc-tls.c) | 0 | ||||
| -rw-r--r-- | ui/vnc-tls.h (renamed from vnc-tls.h) | 0 | ||||
| -rw-r--r-- | ui/vnc.c (renamed from vnc.c) | 0 | ||||
| -rw-r--r-- | ui/vnc.h (renamed from vnc.h) | 0 | ||||
| -rw-r--r-- | ui/vnc_keysym.h (renamed from vnc_keysym.h) | 0 | ||||
| -rw-r--r-- | ui/vnchextile.h (renamed from vnchextile.h) | 0 | ||||
| -rw-r--r-- | ui/x_keymap.c (renamed from x_keymap.c) | 0 | ||||
| -rw-r--r-- | ui/x_keymap.h (renamed from x_keymap.h) | 0 |
31 files changed, 18 insertions, 44 deletions
@@ -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 fsdev/*.o fsdev/*.d + rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d fsdev/*.o fsdev/*.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 \ @@ -345,4 +317,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 67f1b215b1..43b4e169e3 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -102,16 +102,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 @@ -2864,7 +2864,7 @@ done # for target in $targets if test "$source_path_used" = "yes" ; then DIRS="tests tests/cris slirp audio block net pc-bios/optionrom" DIRS="$DIRS roms/seabios roms/vgabios" - DIRS="$DIRS fsdev" + DIRS="$DIRS fsdev ui" FILES="Makefile tests/Makefile" FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit" FILES="$FILES tests/test-mmap.c" diff --git a/curses.c b/ui/curses.c index ed3165e45e..ed3165e45e 100644 --- a/curses.c +++ b/ui/curses.c diff --git a/curses_keys.h b/ui/curses_keys.h index 1decd1119d..1decd1119d 100644 --- a/curses_keys.h +++ b/ui/curses_keys.h diff --git a/keymaps.c b/ui/keymaps.c index 78c7ea375c..78c7ea375c 100644 --- a/keymaps.c +++ b/ui/keymaps.c diff --git a/keymaps.h b/ui/keymaps.h index a7600d5751..a7600d5751 100644 --- a/keymaps.h +++ b/ui/keymaps.h diff --git a/sdl_keysym.h b/ui/sdl_keysym.h index ee904805da..ee904805da 100644 --- a/sdl_keysym.h +++ b/ui/sdl_keysym.h diff --git a/sdl_zoom.c b/ui/sdl_zoom.c index a986c7c14c..a986c7c14c 100644 --- a/sdl_zoom.c +++ b/ui/sdl_zoom.c diff --git a/sdl_zoom.h b/ui/sdl_zoom.h index 74955bc944..74955bc944 100644 --- a/sdl_zoom.h +++ b/ui/sdl_zoom.h diff --git a/sdl_zoom_template.h b/ui/sdl_zoom_template.h index 64bbca849b..64bbca849b 100644 --- a/sdl_zoom_template.h +++ b/ui/sdl_zoom_template.h diff --git a/vnc-auth-sasl.c b/ui/vnc-auth-sasl.c index a51ddc8a18..a51ddc8a18 100644 --- a/vnc-auth-sasl.c +++ b/ui/vnc-auth-sasl.c diff --git a/vnc-auth-sasl.h b/ui/vnc-auth-sasl.h index fd9b18a8fe..fd9b18a8fe 100644 --- a/vnc-auth-sasl.h +++ b/ui/vnc-auth-sasl.h diff --git a/vnc-auth-vencrypt.c b/ui/vnc-auth-vencrypt.c index 07c169186a..07c169186a 100644 --- a/vnc-auth-vencrypt.c +++ b/ui/vnc-auth-vencrypt.c diff --git a/vnc-auth-vencrypt.h b/ui/vnc-auth-vencrypt.h index 9f674c5173..9f674c5173 100644 --- a/vnc-auth-vencrypt.h +++ b/ui/vnc-auth-vencrypt.h diff --git a/vnc-encoding-hextile.c b/ui/vnc-encoding-hextile.c index 728f25e5d8..728f25e5d8 100644 --- a/vnc-encoding-hextile.c +++ b/ui/vnc-encoding-hextile.c diff --git a/vnc-encoding-tight.c b/ui/vnc-encoding-tight.c index c1a292bdd2..c1a292bdd2 100644 --- a/vnc-encoding-tight.c +++ b/ui/vnc-encoding-tight.c diff --git a/vnc-encoding-tight.h b/ui/vnc-encoding-tight.h index 9b0910c79a..9b0910c79a 100644 --- a/vnc-encoding-tight.h +++ b/ui/vnc-encoding-tight.h diff --git a/vnc-encoding-zlib.c b/ui/vnc-encoding-zlib.c index a99bc387dc..a99bc387dc 100644 --- a/vnc-encoding-zlib.c +++ b/ui/vnc-encoding-zlib.c diff --git a/vnc-tls.c b/ui/vnc-tls.c index dec626c539..dec626c539 100644 --- a/vnc-tls.c +++ b/ui/vnc-tls.c diff --git a/vnc-tls.h b/ui/vnc-tls.h index 2b93633896..2b93633896 100644 --- a/vnc-tls.h +++ b/ui/vnc-tls.h diff --git a/vnc_keysym.h b/ui/vnc_keysym.h index 55cb87edec..55cb87edec 100644 --- a/vnc_keysym.h +++ b/ui/vnc_keysym.h diff --git a/vnchextile.h b/ui/vnchextile.h index b9f9f5ef89..b9f9f5ef89 100644 --- a/vnchextile.h +++ b/ui/vnchextile.h diff --git a/x_keymap.c b/ui/x_keymap.c index b9b0944180..b9b0944180 100644 --- a/x_keymap.c +++ b/ui/x_keymap.c diff --git a/x_keymap.h b/ui/x_keymap.h index 2042ce0ed2..2042ce0ed2 100644 --- a/x_keymap.h +++ b/ui/x_keymap.h |