From: sungmin ha Date: Tue, 24 Dec 2013 09:29:17 +0000 (+0900) Subject: remote: modified export position in configure file X-Git-Tag: TizenStudio_2.0_p2.3~406 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a092249d455da93500fb2a662421fe8a461c7fc2;p=sdk%2Femulator%2Fqemu.git remote: modified export position in configure file removed unnecessary file restored Makefile.in in virt-viewer Change-Id: I8f0a899cad8b2d10344364bdcbbfb328e782662f Signed-off-by: sungmin ha --- diff --git a/configure b/configure index f1def8d..d78e2e1 100755 --- a/configure +++ b/configure @@ -3073,8 +3073,6 @@ if test "$spice" != "no" ; then #include int main(void) { spice_server_new(); return 0; } EOF - echo ${PWD} - export PKG_CONFIG_PATH=${PWD}/tizen/distrib/remote/output/lib/pkgconfig:${PKG_CONFIG_PATH} spice_cflags=$($pkg_config --cflags spice-protocol spice-server 2>/dev/null) spice_libs=$($pkg_config --libs spice-protocol spice-server 2>/dev/null) if $pkg_config --atleast-version=0.12.0 spice-server >/dev/null 2>&1 && \ diff --git a/tizen/distrib/remote/build_linux.sh b/tizen/distrib/remote/build_linux.sh index 9513104..efa07c1 100755 --- a/tizen/distrib/remote/build_linux.sh +++ b/tizen/distrib/remote/build_linux.sh @@ -48,7 +48,7 @@ cd ${SPICE_GTK_PATH} cd ../../ cd ${VIRT_VIEWER_PATH} -./configure --prefix=$PREFIX --exec_prefix=$PREFIX --libdir=$PREFIX/lib && make -j$NUMCPU && make install +./configure --prefix=$PREFIX && make -j$NUMCPU && make install cd ../../ mkdir -p ../../emulator/remote/bin diff --git a/tizen/distrib/remote/client/spice-gtk-0.19/gtk/.channel-inputs.h.swo b/tizen/distrib/remote/client/spice-gtk-0.19/gtk/.channel-inputs.h.swo deleted file mode 100644 index 34532e4..0000000 Binary files a/tizen/distrib/remote/client/spice-gtk-0.19/gtk/.channel-inputs.h.swo and /dev/null differ diff --git a/tizen/distrib/remote/client/virt-viewer-0.5.3/Makefile.in b/tizen/distrib/remote/client/virt-viewer-0.5.3/Makefile.in index afe9d07..c827528 100644 --- a/tizen/distrib/remote/client/virt-viewer-0.5.3/Makefile.in +++ b/tizen/distrib/remote/client/virt-viewer-0.5.3/Makefile.in @@ -366,8 +366,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status -# $(SHELL) ./config.status --recheck + $(SHELL) ./config.status --recheck $(top_srcdir)/configure: $(am__configure_deps) $(am__cd) $(srcdir) && $(AUTOCONF) diff --git a/tizen/emulator_configure.sh b/tizen/emulator_configure.sh index 5c60f92..e523b5b 100755 --- a/tizen/emulator_configure.sh +++ b/tizen/emulator_configure.sh @@ -231,6 +231,7 @@ cd .. echo "" echo "##### QEMU configuring for emulator" echo "##### QEMU configure append:" $CONFIGURE_APPEND +export PKG_CONFIG_PATH=${PWD}/tizen/distrib/remote/output/lib/pkgconfig:${PKG_CONFIG_PATH} exec ./configure \ --enable-werror \ --audio-drv-list=alsa \