Commit 8e98e2e8 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

build: kill libuser 



Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 76cad711

Makefile

+3 −5
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ $(SUBDIR_RULES): libqemustub.a 


$(filter %-softmmu,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) $(common-obj-y) $(extra-obj-y)



$(filter %-user,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) subdir-libuser

$(filter %-user,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) $(user-obj-y)



ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))

romsubdir-%:
@@ -224,8 +224,6 @@ $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN) 


qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(oslib-obj-y) $(trace-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y) libqemustub.a



QEMULIBS=libuser



clean:

# avoid old build problems by removing potentially incorrect old files

	rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
@@ -242,7 +240,7 @@ clean: 
	rm -rf qapi-generated

	rm -rf qga/qapi-generated

	$(MAKE) -C tests/tcg clean

	for d in $(ALL_SUBDIRS) $(QEMULIBS) libcacard; do \

	for d in $(ALL_SUBDIRS) libcacard; do \

	if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \

	rm -f $$d/qemu-options.def; \

        done
@@ -265,7 +263,7 @@ distclean: clean 
	rm -f config.log

	rm -f linux-headers/asm

	rm -f qemu-tech.info qemu-tech.aux qemu-tech.cp qemu-tech.dvi qemu-tech.fn qemu-tech.info qemu-tech.ky qemu-tech.log qemu-tech.pdf qemu-tech.pg qemu-tech.toc qemu-tech.tp qemu-tech.vr

	for d in $(TARGET_DIRS) $(QEMULIBS); do \

	for d in $(TARGET_DIRS); do \

	rm -rf $$d || exit 1 ; \

        done

	if test -f pixman/config.log; then make -C pixman distclean; fi

Makefile.objs

+2 −1
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ user-obj-y += tcg-runtime.o host-utils.o 
user-obj-y += cache-utils.o

user-obj-y += module.o

user-obj-y += qemu-user.o

user-obj-y += $(trace-obj-y)

user-obj-y += qom/



######################################################################
@@ -196,6 +195,8 @@ trace-obj-y += trace/control.o 


$(trace-obj-y): $(GENERATED_HEADERS)



universal-obj-y += $(trace-obj-y)



######################################################################

# smartcard

Makefile.target

+1 −2
Original line number Diff line number Diff line
@@ -155,9 +155,8 @@ all-obj-y += $(addprefix ../, $(universal-obj-y)) 


ifdef CONFIG_SOFTMMU

all-obj-y += $(addprefix ../, $(common-obj-y))

all-obj-y += $(addprefix ../, $(trace-obj-y))

else

all-obj-y += $(addprefix ../libuser/, $(user-obj-y))

all-obj-y += $(addprefix ../, $(user-obj-y))

endif #CONFIG_LINUX_USER



ifdef QEMU_PROGW

Makefile.user

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
# Makefile for qemu target independent user files.



include ../config-host.mak

include $(SRC_PATH)/rules.mak

-include config.mak



.PHONY: all



$(call set-vpath, $(SRC_PATH))



QEMU_CFLAGS+=-I..

QEMU_CFLAGS += -I$(SRC_PATH)/include

QEMU_CFLAGS += -DCONFIG_USER_ONLY



include $(SRC_PATH)/Makefile.objs



all: $(user-obj-y)

# Dummy command so that make thinks it has done something

	@true



clean:

	for d in . trace; do \

	rm -f $$d/*.o $$d/*.d $$d/*.a $$d/*~; \

	done

configure

+0 −3
Original line number Diff line number Diff line
@@ -4212,9 +4212,6 @@ for rom in seabios vgabios ; do 
    echo "LD=$ld" >> $config_mak

done



d=libuser

symlink "$source_path/Makefile.user" "$d/Makefile"



if test "$docs" = "yes" ; then

  mkdir -p QMP

fi