diff options
| author | Stefan Weil <sw@weilnetz.de> | 2012-02-08 22:41:37 +0100 |
|---|---|---|
| committer | malc <av1474@comtv.ru> | 2012-02-09 20:44:38 +0400 |
| commit | 57c83dacfe179bf061b8fa79d9553ebabe4d2ff4 (patch) | |
| tree | 5a95e263dccb31a6e105971e903ac66159bb0808 | |
| parent | 7a65c8cc315c76bde6d692845c12e7ba06f44f89 (diff) | |
make: Remove duplicate use of GLIB_CFLAGS
Makefile, Makefile.hw, Makefile.target and libcacard/Makefile
added GLIB_CFLAGS to QEMU_CFLAGS.
Makefile.objs does this, too, and is included by all other
Makefiles, so GLIB_CFLAGS were added twice (reported by malc).
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: malc <av1474@comtv.ru>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | Makefile.hw | 1 | ||||
| -rw-r--r-- | Makefile.objs | 2 | ||||
| -rw-r--r-- | Makefile.target | 1 | ||||
| -rw-r--r-- | libcacard/Makefile | 2 |
5 files changed, 0 insertions, 8 deletions
@@ -114,8 +114,6 @@ audio/audio.o audio/fmodaudio.o: QEMU_CFLAGS += $(FMOD_CFLAGS) QEMU_CFLAGS+=$(CURL_CFLAGS) -QEMU_CFLAGS+=$(GLIB_CFLAGS) - QEMU_CFLAGS += -I$(SRC_PATH)/include ui/cocoa.o: ui/cocoa.m diff --git a/Makefile.hw b/Makefile.hw index 7b8d068c9..33f1ab018 100644 --- a/Makefile.hw +++ b/Makefile.hw @@ -10,7 +10,6 @@ include $(SRC_PATH)/rules.mak $(call set-vpath, $(SRC_PATH):$(SRC_PATH)/hw) QEMU_CFLAGS+=-I.. -QEMU_CFLAGS += $(GLIB_CFLAGS) QEMU_CFLAGS += -I$(SRC_PATH)/include include $(SRC_PATH)/Makefile.objs diff --git a/Makefile.objs b/Makefile.objs index ec35320ff..391e52452 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -323,8 +323,6 @@ hw-obj-$(CONFIG_SOUND) += $(sound-obj-y) 9pfs-nested-$(CONFIG_VIRTFS) += virtio-9p-proxy.o hw-obj-$(CONFIG_REALLY_VIRTFS) += $(addprefix 9pfs/, $(9pfs-nested-y)) -$(addprefix 9pfs/, $(9pfs-nested-y)): QEMU_CFLAGS+=$(GLIB_CFLAGS) - ###################################################################### # libdis diff --git a/Makefile.target b/Makefile.target index 7ed497942..29fde6e98 100644 --- a/Makefile.target +++ b/Makefile.target @@ -215,7 +215,6 @@ QEMU_CFLAGS += $(VNC_TLS_CFLAGS) QEMU_CFLAGS += $(VNC_SASL_CFLAGS) QEMU_CFLAGS += $(VNC_JPEG_CFLAGS) QEMU_CFLAGS += $(VNC_PNG_CFLAGS) -QEMU_CFLAGS += $(GLIB_CFLAGS) # xen support obj-$(CONFIG_XEN) += xen-all.o xen_machine_pv.o xen_domainbuild.o xen-mapcache.o diff --git a/libcacard/Makefile b/libcacard/Makefile index a14556904..c6a896a73 100644 --- a/libcacard/Makefile +++ b/libcacard/Makefile @@ -15,8 +15,6 @@ 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 |