From: Igor Mitsyanko Date: Thu, 28 Jun 2012 14:35:05 +0000 (+0400) Subject: Makefile.tizen: remove duplicates X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1405^2~82 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e3f4d3229a5fd1e5885816f9e6ff43b4553bb888;p=sdk%2Femulator%2Fqemu.git Makefile.tizen: remove duplicates Simplify Makefile by removing duplicate target-specific includes. Signed-off-by: Igor Mitsyanko --- diff --git a/tizen/src/Makefile.tizen b/tizen/src/Makefile.tizen index b1615c5232..6d9414a505 100755 --- a/tizen/src/Makefile.tizen +++ b/tizen/src/Makefile.tizen @@ -70,14 +70,18 @@ obj-y += debug_ch.o # maru hardware obj-i386-y += maru_board.o obj-i386-y += maru_overlay.o -obj-i386-y += maru_codec.o obj-i386-y += maru_pm.o obj-i386-y += maru_vga.o -obj-i386-y += maru_brightness.o -obj-i386-y += maru_touchscreen.o -obj-i386-$(CONFIG_PCI) += maru_camera_common_pci.o -obj-i386-$(CONFIG_LINUX) += maru_camera_linux_pci.o -obj-i386-$(CONFIG_WIN32) += maru_camera_win32_pci.o +obj-arm-y += maru_arm.o +obj-arm-y += maru_arm_board.o +obj-arm-y += maru_arm_vpci.o +obj-arm-y += maru_arm_pmu.o +obj-y += maru_brightness.o +obj-y += maru_touchscreen.o +obj-y += maru_codec.o +obj-$(CONFIG_PCI) += maru_camera_common_pci.o +obj-$(CONFIG_LINUX) += maru_camera_linux_pci.o +obj-$(CONFIG_WIN32) += maru_camera_win32_pci.o ifdef CONFIG_LINUX # libs for maru camera on linux host LIBS += -lv4l2 -lv4lconvert endif @@ -86,25 +90,11 @@ ifdef CONFIG_WIN32 # libs for maru camera on windows host LIBS += -lole32 -loleaut32 -luuid -lstrmiids endif -obj-arm-y += maru_arm.o -obj-arm-y += maru_arm_board.o -obj-arm-y += maru_codec.o -obj-arm-y += maru_brightness.o -obj-arm-y += maru_touchscreen.o -obj-arm-y += maru_arm_vpci.o -obj-arm-y += maru_arm_pmu.o -obj-arm-y += maru_camera_common_pci.o -obj-arm-$(CONFIG_LINUX) += maru_camera_linux_pci.o -obj-arm-$(CONFIG_WIN32) += maru_camera_win32_pci.o - - # maru skin -obj-i386-y += maruskin_client.o maruskin_server.o maruskin_operation.o maruskin_keymap.o -obj-arm-y += maruskin_client.o maruskin_server.o maruskin_operation.o maruskin_keymap.o +obj-y += maruskin_client.o maruskin_server.o maruskin_operation.o maruskin_keymap.o # guest server -obj-i386-y += guest_server.o -obj-arm-y += guest_server.o +obj-y += guest_server.o ifndef CONFIG_WIN32 ###########################################################