remote: modified export position in configure file

removed unnecessary file
restored Makefile.in in virt-viewer

Change-Id: I8f0a899cad8b2d10344364bdcbbfb328e782662f
Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>

diff --git a/configure b/configure
index f1def8d78a9725b27b27056e00ec26def1e9cfda..d78e2e159da53ba8590cf6b13023a71d8c9ad26e 100755 (executable)
--- a/configure
+++ b/configure
@@ -3073,8 +3073,6 @@ if test "$spice" != "no" ; then
 #include <spice.h>
 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 95131045618326e9f5d728d3b836e8020ad6a0d0..efa07c113132d5a832cbcbec70d509817c7bcec9 100755 (executable)
--- 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 (file)
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 afe9d07232979c835abd73f3585f9474d84746ff..c8275281587b0b7be73c7b8f511701ff34415ea6 100644 (file)
--- 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 5c60f923d85de9fdc96cadf1de7d14bb97ce3c3d..e523b5bb7a731ba03273b434020a1c6ffbfe9d37 100755 (executable)
--- 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 \