more qemu/Makefile* cleanup
This commit is contained in:
parent
cdd9340113
commit
dd28727e99
|
@ -55,8 +55,6 @@ configure: ;
|
|||
|
||||
$(call set-vpath, $(SRC_PATH))
|
||||
|
||||
LIBS+=-lz $(LIBS_TOOLS)
|
||||
|
||||
SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory) BUILD_DIR=$(BUILD_DIR)
|
||||
SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS))
|
||||
SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_DIRS))
|
||||
|
|
|
@ -12,20 +12,11 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/include
|
|||
|
||||
# system emulator name
|
||||
QEMU_PROG=qemu-system-$(TARGET_NAME)$(EXESUF)
|
||||
ifneq (,$(findstring -mwindows,$(libs_softmmu)))
|
||||
# Terminate program name with a 'w' because the linker builds a windows executable.
|
||||
QEMU_PROGW=qemu-system-$(TARGET_NAME)w$(EXESUF)
|
||||
QEMU_PROG_BUILD = $(QEMU_PROGW)
|
||||
else
|
||||
QEMU_PROG_BUILD = $(QEMU_PROG)
|
||||
endif
|
||||
|
||||
PROGS=$(QEMU_PROG) $(QEMU_PROGW)
|
||||
|
||||
config-target.h: config-target.h-timestamp
|
||||
config-target.h-timestamp: config-target.mak
|
||||
|
||||
all: $(PROGS)
|
||||
all: $(QEMU_PROG)
|
||||
|
||||
#########################################################
|
||||
# cpu emulator library
|
||||
|
@ -40,7 +31,6 @@ obj-y += cpus.o ioport.o
|
|||
obj-y += hw/
|
||||
obj-y += memory.o cputlb.o
|
||||
obj-y += memory_mapping.o
|
||||
LIBS+=$(libs_softmmu)
|
||||
|
||||
# Hardware support
|
||||
ifeq ($(TARGET_NAME), sparc64)
|
||||
|
@ -83,10 +73,10 @@ endif
|
|||
endif
|
||||
|
||||
# build either PROG or PROGW
|
||||
$(QEMU_PROG_BUILD): $(all-obj-y)
|
||||
$(QEMU_PROG): $(all-obj-y)
|
||||
|
||||
clean:
|
||||
rm -f *.a *~ $(PROGS)
|
||||
rm -f *.a *~ $(QEMU_PROG)
|
||||
rm -f $(shell find . -name '*.[od]')
|
||||
|
||||
GENERATED_HEADERS += config-target.h
|
||||
|
|
|
@ -139,7 +139,6 @@ cpu=""
|
|||
static="no"
|
||||
cross_prefix=""
|
||||
host_cc="cc"
|
||||
libs_softmmu=""
|
||||
cc_i386=i386-pc-linux-gnu-gcc
|
||||
debug_info="yes"
|
||||
stack_protector=""
|
||||
|
@ -996,11 +995,6 @@ elif compile_prog "" "$pthread_lib -lrt" ; then
|
|||
LIBS="$LIBS -lrt"
|
||||
fi
|
||||
|
||||
if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaris" != yes -a \
|
||||
"$aix" != "yes" -a "$haiku" != "yes" ; then
|
||||
libs_softmmu="-lutil $libs_softmmu"
|
||||
fi
|
||||
|
||||
########################################
|
||||
# check if we have valgrind/valgrind.h
|
||||
|
||||
|
@ -1113,7 +1107,6 @@ echo >> $config_host_mak
|
|||
echo all: >> $config_host_mak
|
||||
echo "extra_cflags=$EXTRA_CFLAGS" >> $config_host_mak
|
||||
echo "extra_ldflags=$EXTRA_LDFLAGS" >> $config_host_mak
|
||||
echo "libs_softmmu=$libs_softmmu" >> $config_host_mak
|
||||
|
||||
echo "ARCH=$ARCH" >> $config_host_mak
|
||||
|
||||
|
|
Loading…
Reference in New Issue