build: set library path

set "TIZEN_SDK_DEV" variable.
remove "distrib" path.
use tab indent.

Change-Id: I4913ccae1234779be83ed10818a240bde0fd215f
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>

diff --git a/package/build.macos-64 b/package/build.macos-64
index 0954881a3912b21a13983c8e4c98a5afe04df732..f436b2c7a069e3a12531c69ed3e469470be0fa16 100755 (executable)
--- a/package/build.macos-64
+++ b/package/build.macos-64
@@ -4,11 +4,13 @@ clean()
 {
     prepare
 
+       TIZEN_SDK_DEV_PATH=${ROOTDIR}
+
     cd $SRCDIR/tizen
     if test -e "Makefile"
     then
-        ./emulator_configure.sh x86 -e "$BUILD_CFLAGS $BUILD_LDFLAGS"
-        make distclean
+        TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ./emulator_configure.sh x86
+        make clean
     fi
     rm -rf $SRCDIR/*.zip
     rm -rf $SRCDIR/*.tar.gz
@@ -24,11 +26,6 @@ prepare()
         echo "as a system environment variable on your PC!!"
         exit 1
     fi
-
-    export PKG_CONFIG_PATH=$ROOTDIR/libav/lib/pkgconfig:$ROOTDIR/lib/pkgconfig:$PKG_CONFIG_PATH
-
-    BUILD_CFLAGS="--extra-cflags=-I$ROOTDIR/libiconv/include "
-    BUILD_LDFLAGS="--extra-ldflags=-L$ROOTDIR/libiconv/lib "
 }
 
 modify_files(){

diff --git a/package/build.ubuntu-32 b/package/build.ubuntu-32
index 4c207109ae25f96a949163c0df3ac75363417895..53e3c693e8f6fac081fc2b9128d4aa97c5ec8c73 100755 (executable)
--- a/package/build.ubuntu-32
+++ b/package/build.ubuntu-32
@@ -4,13 +4,13 @@ clean()
 {
        prepare
 
-       export PKG_CONFIG_PATH=${ROOTDIR}/lib/pkgconfig:${ROOTDIR}/remote/lib/pkgconfig:${ROOTDIR}/libav/lib/pkgconfig:${PKG_CONFIG_PATH}
+       TIZEN_SDK_DEV_PATH=${ROOTDIR}
 
        cd $SRCDIR/tizen
        if test -e "Makefile"
        then
-               ./emulator_configure.sh x86
-               make distclean
+               TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ./emulator_configure.sh x86
+               make clean
        fi
        rm -rf $SRCDIR/*.zip
        rm -rf $SRCDIR/*.tar.gz

diff --git a/package/build.ubuntu-64 b/package/build.ubuntu-64
index 4c207109ae25f96a949163c0df3ac75363417895..53e3c693e8f6fac081fc2b9128d4aa97c5ec8c73 100755 (executable)
--- a/package/build.ubuntu-64
+++ b/package/build.ubuntu-64
@@ -4,13 +4,13 @@ clean()
 {
        prepare
 
-       export PKG_CONFIG_PATH=${ROOTDIR}/lib/pkgconfig:${ROOTDIR}/remote/lib/pkgconfig:${ROOTDIR}/libav/lib/pkgconfig:${PKG_CONFIG_PATH}
+       TIZEN_SDK_DEV_PATH=${ROOTDIR}
 
        cd $SRCDIR/tizen
        if test -e "Makefile"
        then
-               ./emulator_configure.sh x86
-               make distclean
+               TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ./emulator_configure.sh x86
+               make clean
        fi
        rm -rf $SRCDIR/*.zip
        rm -rf $SRCDIR/*.tar.gz

diff --git a/package/build.windows-32 b/package/build.windows-32
index 0235a469f5361c5a7d12e1362f2fe2fbc9986173..70432d583b44405ed22bef29679a79551a4b953c 100755 (executable)
--- a/package/build.windows-32
+++ b/package/build.windows-32
@@ -4,11 +4,13 @@ clean()
 {
        prepare
 
+       TIZEN_SDK_DEV_PATH=${ROOTDIR}
+
        cd $SRCDIR/tizen
        if test -e "Makefile"
        then
-               ./emulator_configure.sh x86 -e "$BUILD_CFLAGS $BUILD_LDFLAGS"
-               make distclean
+               TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ./emulator_configure.sh x86
+               make clean
        fi
        rm -rf $SRCDIR/*.zip
        rm -rf $SRCDIR/*.tar.gz
@@ -20,8 +22,8 @@ prepare()
        if [ "$JAVA_HOME" = "" ]
        then
                echo "Make sure that you have installed JDK"
-        echo "and then set installed JDK/bin path into JAVA_HOME"
-        echo "as a system environment variable on your PC!!"
+               echo "and then set installed JDK/bin path into JAVA_HOME"
+               echo "as a system environment variable on your PC!!"
                exit 1
        fi
 
@@ -29,7 +31,7 @@ prepare()
        if [ "$PYTHON_DIR" = "" ]
        then
                echo "Make sure that you have installed Python 2.x version"
-        echo "and then set installed Python/bin path into PATH system variable on your PC!"
+               echo "and then set installed Python/bin path into PATH system variable on your PC!"
                exit 1
        fi
 

diff --git a/tizen/src/skin/client/build.xml b/tizen/src/skin/client/build.xml
index bc3fd2932106149ad081ca463b3eb8ed1e2eb307..2a7124fd84d9cddf0f35bf017ca3d65d09d56d84 100644 (file)
--- a/tizen/src/skin/client/build.xml
+++ b/tizen/src/skin/client/build.xml
@@ -26,7 +26,7 @@
        <property name="swt.file" value="swt-4.5.jar" />
 
        <path id="classpath">
-               <pathelement location="${env.TIZEN_SDK_DEV_PATH}/distrib/lib/${swt.file}" />
+               <pathelement location="${env.TIZEN_SDK_DEV_PATH}/lib/${swt.file}" />
                <pathelement location="lib/${swt.file}" />
                <pathelement location="build/" />
                <pathelement location="${classpath.dibs}/${swt.file}" />