From 72cc02533eb283d56af8fdbcf2694a9f1cdf5473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Tue, 8 Aug 2006 16:33:44 +0000 Subject: [PATCH] link input addon against /system/servers/input_server on non Haiku targets, map our input_server target to it git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18464 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/BuildSetup | 1 + src/add-ons/input_server/devices/keyboard/Jamfile | 8 +------- src/add-ons/input_server/devices/mouse/Jamfile | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup index 92d9538f8a..d447c4fa44 100644 --- a/build/jam/BuildSetup +++ b/build/jam/BuildSetup @@ -256,6 +256,7 @@ HAIKU_BUILD_DESCRIPTION ?= "Unknown Build" ; HAIKU_LIBRARY_NAME_MAP_$(i) = lib$(i).so ; } HAIKU_LIBRARY_NAME_MAP_libstdc++ = $(HAIKU_LIBSTDC++) ; + HAIKU_LIBRARY_NAME_MAP_/system/servers/input_server = input_server ; } diff --git a/src/add-ons/input_server/devices/keyboard/Jamfile b/src/add-ons/input_server/devices/keyboard/Jamfile index d6084abd45..3852f14b77 100644 --- a/src/add-ons/input_server/devices/keyboard/Jamfile +++ b/src/add-ons/input_server/devices/keyboard/Jamfile @@ -13,13 +13,7 @@ Addon keyboard : input_server/devices : TMListItem.cpp : false - : input_server ; - -if $(COMPILE_FOR_R5) { - LinkAgainst keyboard : be ; -} else { - LinkAgainst keyboard : libroot.so libbe.so ; -} + : /system/servers/input_server be ; Package haiku-inputkit-cvs : keyboard : diff --git a/src/add-ons/input_server/devices/mouse/Jamfile b/src/add-ons/input_server/devices/mouse/Jamfile index 92baa766f0..aa1848813c 100644 --- a/src/add-ons/input_server/devices/mouse/Jamfile +++ b/src/add-ons/input_server/devices/mouse/Jamfile @@ -7,7 +7,7 @@ UsePrivateHeaders input ; Addon mouse : input_server/devices : MouseInputDevice.cpp : false - : be input_server ; + : be /system/servers/input_server ; Package haiku-inputkit-cvs : mouse :