Merge remote-tracking branch 'remotes/bonzini/configure' into staging
* remotes/bonzini/configure: libcacard: remove libcacard-specific CFLAGS and LIBS from global vars build: simplify and fix fix-obj-vars build: convert some obj-specific CFLAGS to use new foo.o-cflags syntax build: add support for per-object -cflags and -libs to all rules Makefile: use $(INSTALL_LIB) for modules not $(INSTALL_PROG) Makefile.target: use $(INSTALL_PROG) for installing, not $(INSTALL) Makefile: strip tools and modules too build: simplify Makefile.target around unnest-vars invocations build: simplify Makefile.target a bit, use just one rule for softmmu build: Fix per-object variables for Makefile.target Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
41a3f3c1bc
22
Makefile
22
Makefile
@ -148,10 +148,6 @@ endif
|
|||||||
|
|
||||||
all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules
|
all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules
|
||||||
|
|
||||||
vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
|
|
||||||
|
|
||||||
vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS)
|
|
||||||
|
|
||||||
config-host.h: config-host.h-timestamp
|
config-host.h: config-host.h-timestamp
|
||||||
config-host.h-timestamp: config-host.mak
|
config-host.h-timestamp: config-host.mak
|
||||||
qemu-options.def: $(SRC_PATH)/qemu-options.hx
|
qemu-options.def: $(SRC_PATH)/qemu-options.hx
|
||||||
@ -195,8 +191,6 @@ ALL_SUBDIRS=$(TARGET_DIRS) $(patsubst %,pc-bios/%, $(ROMS))
|
|||||||
|
|
||||||
recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)
|
recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)
|
||||||
|
|
||||||
bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS)
|
|
||||||
|
|
||||||
$(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc $(BUILD_DIR)/config-host.h | $(BUILD_DIR)/version.lo
|
$(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc $(BUILD_DIR)/config-host.h | $(BUILD_DIR)/version.lo
|
||||||
$(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<," RC version.o")
|
$(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<," RC version.o")
|
||||||
$(BUILD_DIR)/version.lo: $(SRC_PATH)/version.rc $(BUILD_DIR)/config-host.h
|
$(BUILD_DIR)/version.lo: $(SRC_PATH)/version.rc $(BUILD_DIR)/config-host.h
|
||||||
@ -384,17 +378,25 @@ install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \
|
|||||||
install-datadir install-localstatedir
|
install-datadir install-localstatedir
|
||||||
$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
|
$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
|
||||||
ifneq ($(TOOLS),)
|
ifneq ($(TOOLS),)
|
||||||
$(INSTALL_PROG) $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)"
|
$(INSTALL_PROG) $(TOOLS) "$(DESTDIR)$(bindir)"
|
||||||
|
ifneq ($(STRIP),)
|
||||||
|
$(STRIP) $(TOOLS:%="$(DESTDIR)$(bindir)/%")
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
ifneq ($(CONFIG_MODULES),)
|
ifneq ($(CONFIG_MODULES),)
|
||||||
$(INSTALL_DIR) "$(DESTDIR)$(qemu_moddir)"
|
$(INSTALL_DIR) "$(DESTDIR)$(qemu_moddir)"
|
||||||
for s in $(patsubst %.mo,%$(DSOSUF),$(modules-m)); do \
|
for s in $(modules-m:.mo=$(DSOSUF)); do \
|
||||||
$(INSTALL_PROG) $(STRIP_OPT) $$s "$(DESTDIR)$(qemu_moddir)/$$(echo $$s | tr / -)"; \
|
t="$(DESTDIR)$(qemu_moddir)/$$(echo $$s | tr / -)"; \
|
||||||
|
$(INSTALL_LIB) $$s "$$t"; \
|
||||||
|
test -z "$(STRIP)" || $(STRIP) "$$t"; \
|
||||||
done
|
done
|
||||||
endif
|
endif
|
||||||
ifneq ($(HELPERS-y),)
|
ifneq ($(HELPERS-y),)
|
||||||
$(INSTALL_DIR) "$(DESTDIR)$(libexecdir)"
|
$(INSTALL_DIR) "$(DESTDIR)$(libexecdir)"
|
||||||
$(INSTALL_PROG) $(STRIP_OPT) $(HELPERS-y) "$(DESTDIR)$(libexecdir)"
|
$(INSTALL_PROG) $(HELPERS-y) "$(DESTDIR)$(libexecdir)"
|
||||||
|
ifneq ($(STRIP),)
|
||||||
|
$(STRIP) $(HELPERS-y:%="$(DESTDIR)$(libexecdir)/%")
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
ifneq ($(BLOBS),)
|
ifneq ($(BLOBS),)
|
||||||
set -e; for x in $(BLOBS); do \
|
set -e; for x in $(BLOBS); do \
|
||||||
|
@ -31,6 +31,8 @@ libcacard-y += libcacard/vcard_emul_nss.o
|
|||||||
libcacard-y += libcacard/vcard_emul_type.o
|
libcacard-y += libcacard/vcard_emul_type.o
|
||||||
libcacard-y += libcacard/card_7816.o
|
libcacard-y += libcacard/card_7816.o
|
||||||
libcacard-y += libcacard/vcardt.o
|
libcacard-y += libcacard/vcardt.o
|
||||||
|
libcacard/vcard_emul_nss.o-cflags := $(NSS_CFLAGS)
|
||||||
|
libcacard/vcard_emul_nss.o-libs := $(NSS_LIBS)
|
||||||
|
|
||||||
######################################################################
|
######################################################################
|
||||||
# Target independent part of system emulation. The long term path is to
|
# Target independent part of system emulation. The long term path is to
|
||||||
@ -64,9 +66,11 @@ common-obj-y += hw/
|
|||||||
|
|
||||||
common-obj-y += ui/
|
common-obj-y += ui/
|
||||||
common-obj-y += bt-host.o bt-vhci.o
|
common-obj-y += bt-host.o bt-vhci.o
|
||||||
|
bt-host.o-cflags := $(BLUEZ_CFLAGS)
|
||||||
|
|
||||||
common-obj-y += dma-helpers.o
|
common-obj-y += dma-helpers.o
|
||||||
common-obj-y += vl.o
|
common-obj-y += vl.o
|
||||||
|
vl.o-cflags := $(GPROF_CFLAGS) $(SDL_CFLAGS)
|
||||||
common-obj-y += tpm.o
|
common-obj-y += tpm.o
|
||||||
|
|
||||||
common-obj-$(CONFIG_SLIRP) += slirp/
|
common-obj-$(CONFIG_SLIRP) += slirp/
|
||||||
|
@ -16,19 +16,22 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/include
|
|||||||
ifdef CONFIG_USER_ONLY
|
ifdef CONFIG_USER_ONLY
|
||||||
# user emulator name
|
# user emulator name
|
||||||
QEMU_PROG=qemu-$(TARGET_NAME)
|
QEMU_PROG=qemu-$(TARGET_NAME)
|
||||||
|
QEMU_PROG_BUILD = $(QEMU_PROG)
|
||||||
else
|
else
|
||||||
# system emulator name
|
# system emulator name
|
||||||
|
QEMU_PROG=qemu-system-$(TARGET_NAME)$(EXESUF)
|
||||||
ifneq (,$(findstring -mwindows,$(libs_softmmu)))
|
ifneq (,$(findstring -mwindows,$(libs_softmmu)))
|
||||||
# Terminate program name with a 'w' because the linker builds a windows executable.
|
# Terminate program name with a 'w' because the linker builds a windows executable.
|
||||||
QEMU_PROGW=qemu-system-$(TARGET_NAME)w$(EXESUF)
|
QEMU_PROGW=qemu-system-$(TARGET_NAME)w$(EXESUF)
|
||||||
endif # windows executable
|
$(QEMU_PROG): $(QEMU_PROGW)
|
||||||
QEMU_PROG=qemu-system-$(TARGET_NAME)$(EXESUF)
|
$(call quiet-command,$(OBJCOPY) --subsystem console $(QEMU_PROGW) $(QEMU_PROG)," GEN $(TARGET_DIR)$(QEMU_PROG)")
|
||||||
|
QEMU_PROG_BUILD = $(QEMU_PROGW)
|
||||||
|
else
|
||||||
|
QEMU_PROG_BUILD = $(QEMU_PROG)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
PROGS=$(QEMU_PROG)
|
PROGS=$(QEMU_PROG) $(QEMU_PROGW)
|
||||||
ifdef QEMU_PROGW
|
|
||||||
PROGS+=$(QEMU_PROGW)
|
|
||||||
endif
|
|
||||||
STPFILES=
|
STPFILES=
|
||||||
|
|
||||||
config-target.h: config-target.h-timestamp
|
config-target.h: config-target.h-timestamp
|
||||||
@ -140,10 +143,7 @@ endif # CONFIG_SOFTMMU
|
|||||||
%/translate.o: QEMU_CFLAGS += $(TRANSLATE_OPT_CFLAGS)
|
%/translate.o: QEMU_CFLAGS += $(TRANSLATE_OPT_CFLAGS)
|
||||||
|
|
||||||
dummy := $(call unnest-vars,,obj-y)
|
dummy := $(call unnest-vars,,obj-y)
|
||||||
|
all-obj-y := $(obj-y)
|
||||||
# we are making another call to unnest-vars with different vars, protect obj-y,
|
|
||||||
# it can be overriden in subdir Makefile.objs
|
|
||||||
obj-y-save := $(obj-y)
|
|
||||||
|
|
||||||
block-obj-y :=
|
block-obj-y :=
|
||||||
common-obj-y :=
|
common-obj-y :=
|
||||||
@ -153,27 +153,16 @@ dummy := $(call unnest-vars,.., \
|
|||||||
block-obj-m \
|
block-obj-m \
|
||||||
common-obj-y \
|
common-obj-y \
|
||||||
common-obj-m)
|
common-obj-m)
|
||||||
|
all-obj-y += $(common-obj-y)
|
||||||
# Now restore obj-y
|
|
||||||
obj-y := $(obj-y-save)
|
|
||||||
|
|
||||||
all-obj-y = $(obj-y) $(common-obj-y)
|
|
||||||
all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y)
|
all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y)
|
||||||
|
|
||||||
ifndef CONFIG_HAIKU
|
ifndef CONFIG_HAIKU
|
||||||
LIBS+=-lm
|
LIBS+=-lm
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef QEMU_PROGW
|
# build either PROG or PROGW
|
||||||
# The linker builds a windows executable. Make also a console executable.
|
$(QEMU_PROG_BUILD): $(all-obj-y) ../libqemuutil.a ../libqemustub.a
|
||||||
$(QEMU_PROGW): $(all-obj-y) ../libqemuutil.a ../libqemustub.a
|
|
||||||
$(call LINK,$^)
|
$(call LINK,$^)
|
||||||
$(QEMU_PROG): $(QEMU_PROGW)
|
|
||||||
$(call quiet-command,$(OBJCOPY) --subsystem console $(QEMU_PROGW) $(QEMU_PROG)," GEN $(TARGET_DIR)$(QEMU_PROG)")
|
|
||||||
else
|
|
||||||
$(QEMU_PROG): $(all-obj-y) ../libqemuutil.a ../libqemustub.a
|
|
||||||
$(call LINK,$^)
|
|
||||||
endif
|
|
||||||
|
|
||||||
gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh
|
gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh
|
||||||
$(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES)," GEN $(TARGET_DIR)$@")
|
$(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES)," GEN $(TARGET_DIR)$@")
|
||||||
@ -194,9 +183,9 @@ endif
|
|||||||
|
|
||||||
install: all
|
install: all
|
||||||
ifneq ($(PROGS),)
|
ifneq ($(PROGS),)
|
||||||
$(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
|
$(INSTALL_PROG) $(PROGS) "$(DESTDIR)$(bindir)"
|
||||||
ifneq ($(STRIP),)
|
ifneq ($(STRIP),)
|
||||||
$(STRIP) $(patsubst %,"$(DESTDIR)$(bindir)/%",$(PROGS))
|
$(STRIP) $(PROGS:%="$(DESTDIR)$(bindir)/%")
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifdef CONFIG_TRACE_SYSTEMTAP
|
ifdef CONFIG_TRACE_SYSTEMTAP
|
||||||
|
@ -14,4 +14,4 @@ common-obj-$(CONFIG_AUDIO_WIN_INT) += audio_win_int.o
|
|||||||
common-obj-y += wavcapture.o
|
common-obj-y += wavcapture.o
|
||||||
|
|
||||||
$(obj)/audio.o $(obj)/fmodaudio.o: QEMU_CFLAGS += $(FMOD_CFLAGS)
|
$(obj)/audio.o $(obj)/fmodaudio.o: QEMU_CFLAGS += $(FMOD_CFLAGS)
|
||||||
$(obj)/sdlaudio.o: QEMU_CFLAGS += $(SDL_CFLAGS)
|
sdlaudio.o-cflags := $(SDL_CFLAGS)
|
||||||
|
@ -3,6 +3,6 @@ common-obj-$(CONFIG_POSIX) += rng-random.o
|
|||||||
|
|
||||||
common-obj-y += msmouse.o
|
common-obj-y += msmouse.o
|
||||||
common-obj-$(CONFIG_BRLAPI) += baum.o
|
common-obj-$(CONFIG_BRLAPI) += baum.o
|
||||||
$(obj)/baum.o: QEMU_CFLAGS += $(SDL_CFLAGS)
|
baum.o-cflags := $(SDL_CFLAGS)
|
||||||
|
|
||||||
common-obj-$(CONFIG_TPM) += tpm.o
|
common-obj-$(CONFIG_TPM) += tpm.o
|
||||||
|
17
configure
vendored
17
configure
vendored
@ -3470,10 +3470,10 @@ if test "$smartcard_nss" != "no"; then
|
|||||||
#include <pk11pub.h>
|
#include <pk11pub.h>
|
||||||
int main(void) { PK11_FreeSlot(0); return 0; }
|
int main(void) { PK11_FreeSlot(0); return 0; }
|
||||||
EOF
|
EOF
|
||||||
smartcard_includes="-I\$(SRC_PATH)/libcacard"
|
# FIXME: do not include $glib_* in here
|
||||||
libcacard_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs"
|
nss_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs"
|
||||||
libcacard_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags"
|
nss_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags"
|
||||||
test_cflags="$libcacard_cflags"
|
test_cflags="$nss_cflags"
|
||||||
# The header files in nss < 3.13.3 have a bug which causes them to
|
# The header files in nss < 3.13.3 have a bug which causes them to
|
||||||
# emit a warning. If we're going to compile QEMU with -Werror, then
|
# emit a warning. If we're going to compile QEMU with -Werror, then
|
||||||
# test that the headers don't have this bug. Otherwise we would pass
|
# test that the headers don't have this bug. Otherwise we would pass
|
||||||
@ -3483,11 +3483,8 @@ EOF
|
|||||||
fi
|
fi
|
||||||
if test -n "$libtool" &&
|
if test -n "$libtool" &&
|
||||||
$pkg_config --atleast-version=3.12.8 nss && \
|
$pkg_config --atleast-version=3.12.8 nss && \
|
||||||
compile_prog "$test_cflags" "$libcacard_libs"; then
|
compile_prog "$test_cflags" "$nss_libs"; then
|
||||||
smartcard_nss="yes"
|
smartcard_nss="yes"
|
||||||
QEMU_CFLAGS="$QEMU_CFLAGS $libcacard_cflags"
|
|
||||||
QEMU_INCLUDES="$QEMU_INCLUDES $smartcard_includes"
|
|
||||||
libs_softmmu="$libcacard_libs $libs_softmmu"
|
|
||||||
else
|
else
|
||||||
if test "$smartcard_nss" = "yes"; then
|
if test "$smartcard_nss" = "yes"; then
|
||||||
feature_not_found "nss"
|
feature_not_found "nss"
|
||||||
@ -4501,8 +4498,8 @@ fi
|
|||||||
|
|
||||||
if test "$smartcard_nss" = "yes" ; then
|
if test "$smartcard_nss" = "yes" ; then
|
||||||
echo "CONFIG_SMARTCARD_NSS=y" >> $config_host_mak
|
echo "CONFIG_SMARTCARD_NSS=y" >> $config_host_mak
|
||||||
echo "libcacard_libs=$libcacard_libs" >> $config_host_mak
|
echo "NSS_LIBS=$nss_libs" >> $config_host_mak
|
||||||
echo "libcacard_cflags=$libcacard_cflags" >> $config_host_mak
|
echo "NSS_CFLAGS=$nss_cflags" >> $config_host_mak
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$libusb" = "yes" ; then
|
if test "$libusb" = "yes" ; then
|
||||||
|
@ -4,7 +4,7 @@ common-obj-$(CONFIG_ARM_DIS) += arm.o
|
|||||||
common-obj-$(CONFIG_ARM_A64_DIS) += arm-a64.o
|
common-obj-$(CONFIG_ARM_A64_DIS) += arm-a64.o
|
||||||
common-obj-$(CONFIG_ARM_A64_DIS) += libvixl/
|
common-obj-$(CONFIG_ARM_A64_DIS) += libvixl/
|
||||||
libvixldir = $(SRC_PATH)/disas/libvixl
|
libvixldir = $(SRC_PATH)/disas/libvixl
|
||||||
$(obj)/arm-a64.o: QEMU_CFLAGS += -I$(libvixldir)
|
arm-a64.o-cflags := -I$(libvixldir)
|
||||||
common-obj-$(CONFIG_CRIS_DIS) += cris.o
|
common-obj-$(CONFIG_CRIS_DIS) += cris.o
|
||||||
common-obj-$(CONFIG_HPPA_DIS) += hppa.o
|
common-obj-$(CONFIG_HPPA_DIS) += hppa.o
|
||||||
common-obj-$(CONFIG_I386_DIS) += i386.o
|
common-obj-$(CONFIG_I386_DIS) += i386.o
|
||||||
|
@ -24,6 +24,7 @@ ifeq ($(CONFIG_USB_SMARTCARD),y)
|
|||||||
common-obj-y += dev-smartcard-reader.o
|
common-obj-y += dev-smartcard-reader.o
|
||||||
common-obj-y += ccid-card-passthru.o
|
common-obj-y += ccid-card-passthru.o
|
||||||
common-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o
|
common-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o
|
||||||
|
ccid-card-emulated.o-cflags := -I$(SRC_PATH)/libcacard
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_POSIX),y)
|
ifeq ($(CONFIG_POSIX),y)
|
||||||
|
@ -25,7 +25,6 @@ vscclient$(EXESUF): libcacard/vscclient.o libcacard.la
|
|||||||
|
|
||||||
libcacard.la: LDFLAGS += -rpath $(libdir) -no-undefined \
|
libcacard.la: LDFLAGS += -rpath $(libdir) -no-undefined \
|
||||||
-export-syms $(SRC_PATH)/libcacard/libcacard.syms
|
-export-syms $(SRC_PATH)/libcacard/libcacard.syms
|
||||||
libcacard.la: LIBS = $(libcacard_libs)
|
|
||||||
libcacard.la: $(libcacard-lobj-y)
|
libcacard.la: $(libcacard-lobj-y)
|
||||||
$(call LINK,$^)
|
$(call LINK,$^)
|
||||||
|
|
||||||
|
23
rules.mak
23
rules.mak
@ -45,7 +45,7 @@ LINK = $(call quiet-command,$(LINKPROG) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $
|
|||||||
else
|
else
|
||||||
LIBTOOL += $(if $(V),,--quiet)
|
LIBTOOL += $(if $(V),,--quiet)
|
||||||
%.lo: %.c
|
%.lo: %.c
|
||||||
$(call quiet-command,$(LIBTOOL) --mode=compile --tag=CC $(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," lt CC $@")
|
$(call quiet-command,$(LIBTOOL) --mode=compile --tag=CC $(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $($*.o-cflags) -c -o $@ $<," lt CC $@")
|
||||||
%.lo: %.rc
|
%.lo: %.rc
|
||||||
$(call quiet-command,$(LIBTOOL) --mode=compile --tag=RC $(WINDRES) -I. -o $@ $<,"lt RC $(TARGET_DIR)$@")
|
$(call quiet-command,$(LIBTOOL) --mode=compile --tag=RC $(WINDRES) -I. -o $@ $<,"lt RC $(TARGET_DIR)$@")
|
||||||
%.lo: %.dtrace
|
%.lo: %.dtrace
|
||||||
@ -57,7 +57,7 @@ LINK = $(call quiet-command,\
|
|||||||
$(call expand-objs,$1) \
|
$(call expand-objs,$1) \
|
||||||
$(if $(filter %.lo %.la,$1),$(version-lobj-y),$(version-obj-y)) \
|
$(if $(filter %.lo %.la,$1),$(version-lobj-y),$(version-obj-y)) \
|
||||||
$(if $(filter %.lo %.la,$1),$(LIBTOOLFLAGS)) \
|
$(if $(filter %.lo %.la,$1),$(LIBTOOLFLAGS)) \
|
||||||
$(call extract-libs,$1) $(LIBS),$(if $(filter %.lo %.la,$1),"lt LINK ", " LINK ")"$(TARGET_DIR)$@")
|
$(call extract-libs,$(1:.lo=.o)) $(LIBS),$(if $(filter %.lo %.la,$1),"lt LINK ", " LINK ")"$(TARGET_DIR)$@")
|
||||||
endif
|
endif
|
||||||
|
|
||||||
%.asm: %.S
|
%.asm: %.S
|
||||||
@ -67,13 +67,13 @@ endif
|
|||||||
$(call quiet-command,$(AS) $(ASFLAGS) -o $@ $<," AS $(TARGET_DIR)$@")
|
$(call quiet-command,$(AS) $(ASFLAGS) -o $@ $<," AS $(TARGET_DIR)$@")
|
||||||
|
|
||||||
%.o: %.cc
|
%.o: %.cc
|
||||||
$(call quiet-command,$(CXX) $(QEMU_INCLUDES) $(QEMU_CXXFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," CXX $(TARGET_DIR)$@")
|
$(call quiet-command,$(CXX) $(QEMU_INCLUDES) $(QEMU_CXXFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $($@-cflags) -c -o $@ $<," CXX $(TARGET_DIR)$@")
|
||||||
|
|
||||||
%.o: %.cpp
|
%.o: %.cpp
|
||||||
$(call quiet-command,$(CXX) $(QEMU_INCLUDES) $(QEMU_CXXFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," CXX $(TARGET_DIR)$@")
|
$(call quiet-command,$(CXX) $(QEMU_INCLUDES) $(QEMU_CXXFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $($@-cflags) -c -o $@ $<," CXX $(TARGET_DIR)$@")
|
||||||
|
|
||||||
%.o: %.m
|
%.o: %.m
|
||||||
$(call quiet-command,$(OBJCC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," OBJC $(TARGET_DIR)$@")
|
$(call quiet-command,$(OBJCC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $($@-cflags) -c -o $@ $<," OBJC $(TARGET_DIR)$@")
|
||||||
|
|
||||||
%.o: %.dtrace
|
%.o: %.dtrace
|
||||||
$(call quiet-command,dtrace -o $@ -G -s $<, " GEN $(TARGET_DIR)$@")
|
$(call quiet-command,dtrace -o $@ -G -s $<, " GEN $(TARGET_DIR)$@")
|
||||||
@ -175,16 +175,16 @@ $(eval save-$2-$1 :=)
|
|||||||
endef
|
endef
|
||||||
|
|
||||||
define fix-obj-vars
|
define fix-obj-vars
|
||||||
$(foreach v,$($1), \
|
$(if $2, $(foreach v,$($1), \
|
||||||
$(if $($v-cflags), \
|
$(if $($v-cflags), \
|
||||||
$(eval $2$v-cflags := $($v-cflags)) \
|
$(eval $2/$v-cflags := $($v-cflags)) \
|
||||||
$(eval $v-cflags := )) \
|
$(eval $v-cflags := )) \
|
||||||
$(if $($v-libs), \
|
$(if $($v-libs), \
|
||||||
$(eval $2$v-libs := $($v-libs)) \
|
$(eval $2/$v-libs := $($v-libs)) \
|
||||||
$(eval $v-libs := )) \
|
$(eval $v-libs := )) \
|
||||||
$(if $($v-objs), \
|
$(if $($v-objs), \
|
||||||
$(eval $2$v-objs := $(addprefix $2,$($v-objs))) \
|
$(eval $2/$v-objs := $(addprefix $2/,$($v-objs))) \
|
||||||
$(eval $v-objs := )))
|
$(eval $v-objs := ))))
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define unnest-dir
|
define unnest-dir
|
||||||
@ -192,7 +192,7 @@ $(foreach var,$(nested-vars),$(call push-var,$(var),$1/))
|
|||||||
$(eval obj-parent-$1 := $(obj))
|
$(eval obj-parent-$1 := $(obj))
|
||||||
$(eval obj := $(if $(obj),$(obj)/$1,$1))
|
$(eval obj := $(if $(obj),$(obj)/$1,$1))
|
||||||
$(eval include $(SRC_PATH)/$1/Makefile.objs)
|
$(eval include $(SRC_PATH)/$1/Makefile.objs)
|
||||||
$(foreach v,$(nested-vars),$(call fix-obj-vars,$v,$(if $(obj),$(obj)/)))
|
$(foreach v,$(nested-vars),$(call fix-obj-vars,$v,$(obj)))
|
||||||
$(eval obj := $(obj-parent-$1))
|
$(eval obj := $(obj-parent-$1))
|
||||||
$(eval obj-parent-$1 := )
|
$(eval obj-parent-$1 := )
|
||||||
$(foreach var,$(nested-vars),$(call pop-var,$(var),$1/))
|
$(foreach var,$(nested-vars),$(call pop-var,$(var),$1/))
|
||||||
@ -228,6 +228,7 @@ endef
|
|||||||
define unnest-vars
|
define unnest-vars
|
||||||
$(eval obj := $1)
|
$(eval obj := $1)
|
||||||
$(eval nested-vars := $2)
|
$(eval nested-vars := $2)
|
||||||
|
$(foreach v,$(nested-vars),$(call fix-obj-vars,$v,$(obj)))
|
||||||
$(eval old-nested-dirs := )
|
$(eval old-nested-dirs := )
|
||||||
$(call unnest-vars-1)
|
$(call unnest-vars-1)
|
||||||
$(if $1,$(foreach v,$(nested-vars),$(eval \
|
$(if $1,$(foreach v,$(nested-vars),$(eval \
|
||||||
|
@ -17,4 +17,4 @@ common-obj-$(CONFIG_GTK) += gtk.o x_keymap.o
|
|||||||
|
|
||||||
$(obj)/sdl.o $(obj)/sdl_zoom.o $(obj)/sdl2.o: QEMU_CFLAGS += $(SDL_CFLAGS)
|
$(obj)/sdl.o $(obj)/sdl_zoom.o $(obj)/sdl2.o: QEMU_CFLAGS += $(SDL_CFLAGS)
|
||||||
|
|
||||||
$(obj)/gtk.o: QEMU_CFLAGS += $(GTK_CFLAGS) $(VTE_CFLAGS)
|
gtk.o-cflags := $(GTK_CFLAGS) $(VTE_CFLAGS)
|
||||||
|
Loading…
Reference in New Issue
Block a user