Commit 57c83dac authored by Stefan Weil's avatar Stefan Weil Committed by malc
Browse files

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: default avatarStefan Weil <sw@weilnetz.de>
Signed-off-by: default avatarmalc <av1474@comtv.ru>
parent 7a65c8cc

Makefile

+0 −2
Original line number Diff line number Diff line
@@ -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

Makefile.hw

+0 −1
Original line number Diff line number Diff line
@@ -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

Makefile.objs

+0 −2
Original line number Diff line number Diff line
@@ -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

Makefile.target

+0 −1
Original line number Diff line number Diff line
@@ -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

libcacard/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -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