build: move libqemuutil.a components to util/

Signed-off-by: Paolo Bonzini <[email protected]>
stefanha · Jan 12, 2013 · baacf04 · baacf04
1 parent f157ebb
commit baacf04
Show file tree

Hide file tree

Showing 31 changed files with 15 additions and 13 deletions.
diff --git a/Makefile.objs b/Makefile.objs
@@ -29,16 +29,7 @@ universal-obj-y += $(hw-core-obj-y)
 
 #######################################################################
 # util-obj-y is code depending on the OS (win32 vs posix)
-util-obj-y = osdep.o cutils.o qemu-timer-common.o
-util-obj-$(CONFIG_WIN32) += oslib-win32.o qemu-thread-win32.o event_notifier-win32.o
-util-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-thread-posix.o event_notifier-posix.o
-util-obj-y += envlist.o path.o host-utils.o cache-utils.o module.o
-util-obj-y += bitmap.o bitops.o
-util-obj-y += acl.o
-util-obj-y += error.o qemu-error.o
-util-obj-$(CONFIG_POSIX) += compatfd.o
-util-obj-y += iov.o aes.o qemu-config.o qemu-sockets.o uri.o notify.o
-util-obj-y += qemu-option.o qemu-progress.o
+util-obj-y += util/
 
 #######################################################################
 # coroutines
@@ -177,6 +168,7 @@ QEMU_CFLAGS+=$(GLIB_CFLAGS)
 
 nested-vars += \
 	stub-obj-y \
+	util-obj-y \
 	qga-obj-y \
 	qom-obj-y \
 	qapi-obj-y \

diff --git a/libcacard/Makefile b/libcacard/Makefile
@@ -4,9 +4,9 @@ TOOLS += vscclient$(EXESUF)
 
 # objects linked into a shared library, built with libtool with -fPIC if required
 libcacard-obj-y = $(trace-obj-y) $(stub-obj-y) $(libcacard-y)
-libcacard-obj-y += osdep.o cutils.o qemu-timer-common.o error.o
-libcacard-obj-$(CONFIG_WIN32) += oslib-win32.o qemu-thread-win32.o
-libcacard-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-thread-posix.o
+libcacard-obj-y += util/osdep.o util/cutils.o util/qemu-timer-common.o util/error.o
+libcacard-obj-$(CONFIG_WIN32) += util/oslib-win32.o util/qemu-thread-win32.o
+libcacard-obj-$(CONFIG_POSIX) += util/oslib-posix.o util/qemu-thread-posix.o
 
 libcacard-lobj-y=$(patsubst %.o,%.lo,$(libcacard-obj-y))
 

diff --git a/util/Makefile.objs b/util/Makefile.objs
@@ -0,0 +1,10 @@
+util-obj-y = osdep.o cutils.o qemu-timer-common.o
+util-obj-$(CONFIG_WIN32) += oslib-win32.o qemu-thread-win32.o event_notifier-win32.o
+util-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-thread-posix.o event_notifier-posix.o
+util-obj-y += envlist.o path.o host-utils.o cache-utils.o module.o
+util-obj-y += bitmap.o bitops.o
+util-obj-y += acl.o
+util-obj-y += error.o qemu-error.o
+util-obj-$(CONFIG_POSIX) += compatfd.o
+util-obj-y += iov.o aes.o qemu-config.o qemu-sockets.o uri.o notify.o
+util-obj-y += qemu-option.o qemu-progress.o
diff --git a/acl.c → util/acl.c b/acl.c → util/acl.c
diff --git a/aes.c → util/aes.c b/aes.c → util/aes.c
diff --git a/bitmap.c → util/bitmap.c b/bitmap.c → util/bitmap.c
diff --git a/bitops.c → util/bitops.c b/bitops.c → util/bitops.c
diff --git a/cache-utils.c → util/cache-utils.c b/cache-utils.c → util/cache-utils.c
diff --git a/compatfd.c → util/compatfd.c b/compatfd.c → util/compatfd.c
diff --git a/cutils.c → util/cutils.c b/cutils.c → util/cutils.c
diff --git a/envlist.c → util/envlist.c b/envlist.c → util/envlist.c
diff --git a/error.c → util/error.c b/error.c → util/error.c
diff --git a/event_notifier-posix.c → util/event_notifier-posix.c b/event_notifier-posix.c → util/event_notifier-posix.c
diff --git a/event_notifier-win32.c → util/event_notifier-win32.c b/event_notifier-win32.c → util/event_notifier-win32.c
diff --git a/host-utils.c → util/host-utils.c b/host-utils.c → util/host-utils.c
diff --git a/iov.c → util/iov.c b/iov.c → util/iov.c
diff --git a/module.c → util/module.c b/module.c → util/module.c
diff --git a/notify.c → util/notify.c b/notify.c → util/notify.c
diff --git a/osdep.c → util/osdep.c b/osdep.c → util/osdep.c
diff --git a/oslib-posix.c → util/oslib-posix.c b/oslib-posix.c → util/oslib-posix.c
diff --git a/oslib-win32.c → util/oslib-win32.c b/oslib-win32.c → util/oslib-win32.c
diff --git a/path.c → util/path.c b/path.c → util/path.c
diff --git a/qemu-config.c → util/qemu-config.c b/qemu-config.c → util/qemu-config.c
diff --git a/qemu-error.c → util/qemu-error.c b/qemu-error.c → util/qemu-error.c
diff --git a/qemu-option.c → util/qemu-option.c b/qemu-option.c → util/qemu-option.c
diff --git a/qemu-progress.c → util/qemu-progress.c b/qemu-progress.c → util/qemu-progress.c
diff --git a/qemu-sockets.c → util/qemu-sockets.c b/qemu-sockets.c → util/qemu-sockets.c
diff --git a/qemu-thread-posix.c → util/qemu-thread-posix.c b/qemu-thread-posix.c → util/qemu-thread-posix.c
diff --git a/qemu-thread-win32.c → util/qemu-thread-win32.c b/qemu-thread-win32.c → util/qemu-thread-win32.c
diff --git a/qemu-timer-common.c → util/qemu-timer-common.c b/qemu-timer-common.c → util/qemu-timer-common.c
diff --git a/uri.c → util/uri.c b/uri.c → util/uri.c