build: removed supplements support in Makefile

Change-Id: I318fe9b1033ab5fd43fa3ee46290c6c7bc6c2f75
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --git a/tizen/src/Makefile b/tizen/src/Makefile
index 7144bc5a5cf16e13640488382f812c1663a49d9e..a61325d09511359c98f8726888614c695ab89d5d 100755 (executable)
--- a/tizen/src/Makefile
+++ b/tizen/src/Makefile
@@ -16,19 +16,11 @@ endif
 ifneq ($(wildcard ../../config-host.mak),)
 include ../../config-host.mak
 
-TARGET_EXE += util/check-cam$(EXESUF)
-TARGET_EXE += util/check-net$(EXESUF)
-ifdef CONFIG_YAGL
-TARGET_EXE += util/check-gl$(EXESUF)
-endif
-ifndef CONFIG_LINUX
-TARGET_EXE += util/check-hax$(EXESUF)
-endif
-
+TARGET_EXE +=
 TARGET_DSO +=
 
 all: qemu skin_client $(TARGET_EXE) $(TARGET_DSO)
-qemu: $(TARGET_EXE) $(TARGET_DSO) build_info
+qemu: build_info
        cd ../../ && $(MAKE)
 qemu_clean:
        cd ../../ && $(MAKE) clean
@@ -58,13 +50,6 @@ util/check-net$(EXESUF): $(CHECK_NET_OBJS)
 $(CHECK_NET_OBJS): %.o: %.c
        $(CC) $< $(CHECK_NET_CFLAGS) -o $@
 
-# DIBS classpath for emulator-skin.jar
-ifdef CONFIG_WIN32
-DIBS_SWT_DIR=-Dclasspath.dibs=${MSYS_ROOTDIR}/swt/4.332
-else
-DIBS_SWT_DIR=-Dclasspath.dibs=${ROOTDIR}/swt/4.332
-endif
-
 # Building check-gl
 CHECK_GL_OBJS = util/check_gl.o util/check_gl_core.o
 CHECK_GL_CFLAGS = -c -I$(SRC_PATH)/hw/yagl/yagl_inc
@@ -170,8 +155,6 @@ install: all
        esac; \
        done
 
-       cp -pP ../../qemu-img$(EXESUF) $(EMUL_DIR)/bin
-
        cp -pP scripts/emulator.sh $(EMUL_DIR)/bin
 ifdef CONFIG_WIN32
        cp -pP scripts/emulator.cmd $(EMUL_DIR)/bin
@@ -190,11 +173,6 @@ ifdef CONFIG_DARWIN
 endif
 endif
 
-# check capabilities of OpenGL, Webcam and net
-       cp -pP util/check-gl$(EXESUF) $(EMUL_DIR)/bin
-       cp -pP util/check-cam$(EXESUF) $(EMUL_DIR)/bin
-       cp -pP util/check-net$(EXESUF) $(EMUL_DIR)/bin
-
 # Enable HW Virtualization on Linux
 ifdef CONFIG_LINUX
        cp -pP ../supplements/SDK/tizen-kvm $(EMUL_DIR)/etc
@@ -207,11 +185,6 @@ ifeq ($(CONFIG_LINUX)$(CONFIG_TIZENUSB),yy)
        cp -pP ../supplements/SDK/45-tizen-usb.rules $(EMUL_DIR)/etc
 endif
 
-# check HW Virtualization on Windows and MAC OS X.
-ifndef CONFIG_LINUX
-       cp -pP util/check-hax$(EXESUF) $(EMUL_DIR)/bin
-endif
-
 # give a title name for sdb terminal.
 ifdef CONFIG_DARWIN
        cp -pP scripts/sdbscript $(EMUL_DIR)/bin
@@ -243,27 +216,14 @@ ifdef CONFIG_LINUX
        cp -pP skin/client/native_src/clipboard.py $(EMUL_DIR)/bin
 endif
 
-# for emulator-supplements
-qemu-img:
-       cd ../../ && $(MAKE) qemu-img$(EXESUF)
-
-build_supplements: qemu-img $(TARGET_EXE)
-
-install_supplements: build_supplements
-       mkdir -p $(EMUL_DIR)/bin
-       cp -pP ../../qemu-img$(EXESUF) $(EMUL_DIR)/bin
-
-# check capabilities of OpenGL, Webcam and net
-       cp -pP util/check-gl$(EXESUF) $(EMUL_DIR)/bin
-       cp -pP util/check-cam$(EXESUF) $(EMUL_DIR)/bin
-       cp -pP util/check-net$(EXESUF) $(EMUL_DIR)/bin
-
-# check HW Virtualization on Windows and MAC OS X.
-ifndef CONFIG_LINUX
-       cp -pP util/check-hax$(EXESUF) $(EMUL_DIR)/bin
+####### for dibs system...
+# DIBS classpath for emulator-skin.jar
+ifdef CONFIG_WIN32
+DIBS_SWT_DIR=-Dclasspath.dibs=${MSYS_ROOTDIR}/swt/4.332
+else
+DIBS_SWT_DIR=-Dclasspath.dibs=${ROOTDIR}/swt/4.332
 endif
 
-# for dibs system...
 all_dibs: qemu skin_client_dibs
 skin_client_dibs:
 ifdef CONFIG_JAVA_UI
@@ -305,8 +265,6 @@ install_dibs: all_dibs
        esac; \
        done
 
-       cp -pP ../../qemu-img$(EXESUF) $(DIBS_COMMON_DIR)/bin
-
        cp -pP scripts/emulator.sh $(DIBS_COMMON_DIR)/bin
 ifdef CONFIG_WIN32
        cp -pP scripts/emulator.cmd $(DIBS_COMMON_DIR)/bin
@@ -334,11 +292,6 @@ endif
        cp -pPR ui/resource/skins/tv $(DIBS_SKINS_DIR)
 endif
 
-# check capabilities of OpenGL, Webcam and proxy
-       cp -pP util/check-gl$(EXESUF) $(DIBS_COMMON_DIR)/bin
-       cp -pP util/check-cam$(EXESUF) $(DIBS_COMMON_DIR)/bin
-       cp -pP util/check-net$(EXESUF) $(DIBS_COMMON_DIR)/bin
-
 # Enable HW Virtualization on Linux
 ifdef CONFIG_LINUX
        cp -pP ../supplements/SDK/tizen-kvm $(DIBS_X86_DIR)/etc
@@ -351,11 +304,6 @@ ifeq ($(CONFIG_LINUX)$(CONFIG_TIZENUSB),yy)
        cp -pP ../supplements/SDK/45-tizen-usb.rules $(DIBS_X86_DIR)/etc
 endif
 
-# check HW Virtualization on Windows and MAC OS X.
-ifndef CONFIG_LINUX
-       cp -pP util/check-hax$(EXESUF) $(DIBS_COMMON_DIR)/bin
-endif
-
 # give a title name for sdb terminal.
 ifdef CONFIG_DARWIN
        cp -pP scripts/sdbscript $(DIBS_COMMON_DIR)/bin
@@ -389,20 +337,7 @@ endif
 
 # change loading path of dynamic shared libraries on MAC OS X
 ifdef CONFIG_DARWIN
-       @BIN_ARR=(qemu-img check-gl check-net); \
-       LIB_LIST="libgthread-2.0.0.dylib libglib-2.0.0.dylib libintl.8.dylib libgcc_s.1.dylib libz.1.dylib libcurl.4.dylib libgcc_s.1.dylib libcurl.4.dylib libx264.142.dylib libncurses.5.dylib libpixman-1.0.dylib libpng16.16.dylib QtOpenGL QtWidgets QtGui QtCore"; \
-       for bin in $${BIN_ARR[@]}; do \
-               LIB_ARR=( $$(otool -L $(DIBS_COMMON_DIR)/bin/$$bin | awk '/\opt\/local\/lib/ { split($$1, lib, "/"); print lib[5]}') ); \
-               for lib in $${LIB_ARR[@]}; do \
-                       [[ $$LIB_LIST =~ $$lib ]] && IS_LIB=true || IS_LIB=false; \
-                       if [ "$$IS_LIB" == "true" ] ; then \
-                               install_name_tool -change /opt/local/lib/$$lib @loader_path/$$lib $(DIBS_COMMON_DIR)/bin/$$bin; \
-                               echo "$$bin: the loading path of $$lib is changed."; \
-                       else \
-                               echo "$$bin: $$lib does not exit in the loading path."; \
-                       fi; \
-               done \
-       done ; \
+       @LIB_LIST="libgthread-2.0.0.dylib libglib-2.0.0.dylib libintl.8.dylib libgcc_s.1.dylib libz.1.dylib libcurl.4.dylib libgcc_s.1.dylib libcurl.4.dylib libx264.142.dylib libncurses.5.dylib libpixman-1.0.dylib libpng16.16.dylib QtOpenGL QtWidgets QtGui QtCore"; \
        for target in $(TARGET_DIRS); do \
        case "$$target" in \
        i386-softmmu) \
@@ -415,7 +350,7 @@ ifdef CONFIG_DARWIN
                                        install_name_tool -change /opt/local/lib/$$lib @loader_path/$$lib $(DIBS_X86_DIR)/bin/$$bin; \
                                        echo "$$bin: the loading path of $$lib is changed."; \
                                else \
-                                       echo "$$bin: $$lib does not exit in the loading path."; \
+                                       echo "$$bin: $$lib does not exist in the loading path."; \
                                fi; \
                        done ; \
                        LIB_ARR=( $$(otool -L $(DIBS_X86_DIR)/bin/$$bin | awk '/\opt\/local\/Library/ { split($$1, lib, "/"); print lib[9]}') ); \
@@ -425,7 +360,7 @@ ifdef CONFIG_DARWIN
                                        install_name_tool -change /opt/local/Library/Frameworks/$$lib.framework/Versions/5/$$lib @loader_path/$$lib $(DIBS_X86_DIR)/bin/$$bin ; \
                                        echo "$$bin: the loading path of $$lib is changed."; \
                                else \
-                                       echo "$$bin: $$lib does not exit in the loading path."; \
+                                       echo "$$bin: $$lib does not exist in the loading path."; \
                                fi; \
                        done \
                done \
@@ -441,37 +376,3 @@ all:
        @echo "Please call configure before running make!"
        @exit 1
 endif
-
-install_supplements_dibs: build_supplements
-       mkdir -p $(DIBS_COMMON_DIR)/bin
-       cp -pP ../../qemu-img$(EXESUF) $(DIBS_COMMON_DIR)/bin
-
-# check capabilities of OpenGL, Webcam and proxy
-       cp -pP util/check-gl$(EXESUF) $(DIBS_COMMON_DIR)/bin
-       cp -pP util/check-cam$(EXESUF) $(DIBS_COMMON_DIR)/bin
-       cp -pP util/check-net$(EXESUF) $(DIBS_COMMON_DIR)/bin
-
-# check HW Virtualization on Windows and MAC OS X.
-ifndef CONFIG_LINUX
-       cp -pP util/check-hax$(EXESUF) $(DIBS_COMMON_DIR)/bin
-endif
-
-# change loading path of dynamic shared libraries on MAC OS X
-ifdef CONFIG_DARWIN
-       @BIN_ARR=(qemu-img check-gl check-net); \
-       for bin in $${BIN_ARR[@]}; do \
-               LIB_ARR=( $$(otool -L $(DIBS_COMMON_DIR)/bin/$$bin | awk '/\opt\/local\/lib/ { split($$1, lib, "/"); print lib[5]}') ); \
-               for lib in $${LIB_ARR[@]}; do \
-                       echo "$$bin: the loading path of $$lib is changed."; \
-                       install_name_tool -change /opt/local/lib/$$lib @loader_path/$$lib $(DIBS_COMMON_DIR)/bin/$$bin; \
-               done \
-       done
-       @for target in $(TARGET_DIRS); do \
-       case "$$target" in \
-       i386-softmmu) \
-               ;; \
-       arm-softmmu) \
-               ;; \
-       esac; \
-       done
-endif