diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-20 22:18:37 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-20 23:01:03 -0500 |
| commit | 14015304b662e8f8ccce46c5a6927af6a14c510b (patch) | |
| tree | 1d250e8bcefea6b6e3f40887fbc60e262bd6d241 | |
| parent | 0ac543de94f4f5e7e79d59a56df60937cdd3cd24 (diff) | |
Make glib mandatory and fixup utils appropriately
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | Makefile.objs | 3 | ||||
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | libcacard/Makefile | 4 | ||||
| -rw-r--r-- | qemu-common.h | 1 |
4 files changed, 7 insertions, 4 deletions
diff --git a/Makefile.objs b/Makefile.objs index 16eef384f6..77950d5835 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -400,4 +400,5 @@ vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS) -vl.o: QEMU_CFLAGS+=$(GLIB_CFLAGS) +QEMU_CFLAGS+=$(GLIB_CFLAGS) + @@ -1848,8 +1848,7 @@ fi if $pkg_config --modversion gthread-2.0 > /dev/null 2>&1 ; then glib_cflags=`$pkg_config --cflags gthread-2.0 2>/dev/null` glib_libs=`$pkg_config --libs gthread-2.0 2>/dev/null` - libs_softmmu="$glib_libs $libs_softmmu" - libs_tools="$glib_libs $libs_tools" + LIBS="$glib_libs $LIBS" else echo "glib-2.0 required to compile QEMU" exit 1 diff --git a/libcacard/Makefile b/libcacard/Makefile index 5cd759444b..f72781ef25 100644 --- a/libcacard/Makefile +++ b/libcacard/Makefile @@ -15,10 +15,12 @@ QEMU_OBJS_LIB=$(addsuffix .lo,$(basename $(QEMU_OBJS))) QEMU_CFLAGS+=-I../ +QEMU_CFLAGS+=$(GLIB_CFLAGS) + libcacard.lib-y=$(addsuffix .lo,$(basename $(libcacard-y))) vscclient: $(libcacard-y) $(QEMU_OBJS) vscclient.o - $(call quiet-command,$(CC) $(libcacard_libs) -lrt -o $@ $^," LINK $@") + $(call quiet-command,$(CC) $(libcacard_libs) $(LIBS) -lrt -o $@ $^," LINK $@") clean: rm -f *.o */*.o *.d */*.d *.a */*.a *~ */*~ vscclient *.lo .libs/* *.la *.pc diff --git a/qemu-common.h b/qemu-common.h index 74d5c4b962..c1d4126439 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -37,6 +37,7 @@ typedef struct Monitor Monitor; #include <sys/time.h> #include <assert.h> #include <signal.h> +#include <glib.h> #ifdef _WIN32 #include "qemu-os-win32.h" |