OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Fix out of tree builds. 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1814 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
pbrook 2006-04-16 12:41:07 +00:00
parent 115defd163
commit ad06484063
3 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile
View File

@ -1,6 +1,6 @@
-include config-host.mak include config-host.mak
CFLAGS=-Wall -O2 -g -fno-strict-aliasing CFLAGS=-Wall -O2 -g -fno-strict-aliasing -I.
ifdef CONFIG_DARWIN ifdef CONFIG_DARWIN
CFLAGS+= -mdynamic-no-pic CFLAGS+= -mdynamic-no-pic
endif endif
@ -47,18 +47,19 @@ install: all
mkdir -p "$(DESTDIR)$(bindir)" mkdir -p "$(DESTDIR)$(bindir)"
install -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" install -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
mkdir -p "$(DESTDIR)$(datadir)" mkdir -p "$(DESTDIR)$(datadir)"
install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \ for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
pc-bios/vgabios-cirrus.bin \ video.x proll.elf linux_boot.bin; do \
pc-bios/ppc_rom.bin pc-bios/video.x \ install -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
pc-bios/proll.elf \ done
pc-bios/linux_boot.bin "$(DESTDIR)$(datadir)"
mkdir -p "$(DESTDIR)$(docdir)" mkdir -p "$(DESTDIR)$(docdir)"
install -m 644 qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)" install -m 644 qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)"
ifndef CONFIG_WIN32 ifndef CONFIG_WIN32
mkdir -p "$(DESTDIR)$(mandir)/man1" mkdir -p "$(DESTDIR)$(mandir)/man1"
install qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1" install qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
mkdir -p "$(DESTDIR)$(datadir)/keymaps" mkdir -p "$(DESTDIR)$(datadir)/keymaps"
install -m 644 $(addprefix keymaps/,$(KEYMAPS)) "$(DESTDIR)$(datadir)/keymaps" for x in $(KEYMAPS); do \
install -m 644 $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \
done
endif endif
for d in $(TARGET_DIRS); do \ for d in $(TARGET_DIRS); do \
$(MAKE) -C $$d $@ || exit 1 ; \ $(MAKE) -C $$d $@ || exit 1 ; \
@ -81,11 +82,11 @@ cscope:
texi2html -monolithic -number $< texi2html -monolithic -number $<
qemu.1: qemu-doc.texi qemu.1: qemu-doc.texi
./texi2pod.pl $< qemu.pod $(SRC_PATH)/texi2pod.pl $< qemu.pod
pod2man --section=1 --center=" " --release=" " qemu.pod > $@ pod2man --section=1 --center=" " --release=" " qemu.pod > $@
qemu-img.1: qemu-img.texi qemu-img.1: qemu-img.texi
./texi2pod.pl $< qemu-img.pod $(SRC_PATH)/texi2pod.pl $< qemu-img.pod
pod2man --section=1 --center=" " --release=" " qemu-img.pod > $@ pod2man --section=1 --center=" " --release=" " qemu-img.pod > $@
FILE=qemu-$(shell cat VERSION) FILE=qemu-$(shell cat VERSION)

2
Makefile.target
View File

@ -12,7 +12,7 @@ TARGET_BASE_ARCH:=sparc
endif endif
TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH) TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH)
VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw:$(SRC_PATH)/audio VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw:$(SRC_PATH)/audio
DEFINES=-I. -I$(TARGET_PATH) -I$(SRC_PATH) DEFINES=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH)
ifdef CONFIG_USER_ONLY ifdef CONFIG_USER_ONLY
VPATH+=:$(SRC_PATH)/linux-user VPATH+=:$(SRC_PATH)/linux-user
DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH) DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)

18
configure vendored
View File

@ -139,14 +139,16 @@ if [ "$bsd" = "yes" ] ; then
fi fi
# find source path # find source path
# XXX: we assume an absolute path is given when launching configure, source_path=`dirname "$0"`
# except in './configure' case. if [ -z "$source_path" ]; then
source_path=${0%configure}
source_path=${source_path%/}
source_path_used="yes"
if test -z "$source_path" -o "$source_path" = "." ; then
source_path=`pwd` source_path=`pwd`
else
source_path=`cd "$source_path"; pwd`
fi
if test "$source_path" = `pwd` ; then
source_path_used="no" source_path_used="no"
else
source_path_used="yes"
fi fi
for opt do for opt do
@ -158,6 +160,7 @@ for opt do
--interp-prefix=*) interp_prefix=`echo $opt | cut -d '=' -f 2` --interp-prefix=*) interp_prefix=`echo $opt | cut -d '=' -f 2`
;; ;;
--source-path=*) source_path=`echo $opt | cut -d '=' -f 2` --source-path=*) source_path=`echo $opt | cut -d '=' -f 2`
source_path_used="yes"
;; ;;
--cross-prefix=*) cross_prefix=`echo $opt | cut -d '=' -f 2` --cross-prefix=*) cross_prefix=`echo $opt | cut -d '=' -f 2`
;; ;;
@ -615,6 +618,9 @@ head $source_path/VERSION >> $config_h
echo "\"" >> $config_h echo "\"" >> $config_h
echo "SRC_PATH=$source_path" >> $config_mak echo "SRC_PATH=$source_path" >> $config_mak
if [ "$source_path_used" = "yes" ]; then
echo "VPATH=$source_path" >> $config_mak
fi
echo "TARGET_DIRS=$target_list" >> $config_mak echo "TARGET_DIRS=$target_list" >> $config_mak
# XXX: suppress that # XXX: suppress that