i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* As the generated SystemKeymap source is used as a header, I renamed the

Browse Source 
generated file from SystemKeymap.cpp to SystemKeymap.h.
* The keymap was even compiled into the input_server twice, as it was also
  listed as source file.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17711 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-06-03 15:33:26 +00:00
parent 6d6ef7f7bd
commit 43d3560b25
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/input/InputServer.cpp
+1 -1
View File
@@ -29,7 +29,7 @@
#include <stdio.h> #include <stdio.h>
#include "SystemKeymap.cpp" #include "SystemKeymap.h"
// this is an automatically generated file // this is an automatically generated file
#include <ServerProtocol.h> #include <ServerProtocol.h>
src/servers/input/Jamfile
+6 -10
View File
@@ -6,8 +6,7 @@ if $(COMPILE_FOR_R5) {
SubDirC++Flags -DCOMPILE_FOR_R5 ; SubDirC++Flags -DCOMPILE_FOR_R5 ;
} }
rule MkKeymapHeader rule MkKeymapHeader {
{
local binary = $(1) ; local binary = $(1) ;
local source = $(2) ; local source = $(2) ;
@@ -19,13 +18,12 @@ rule MkKeymapHeader
LocalClean clean : $(binary) ; LocalClean clean : $(binary) ;
} }
actions MkKeymapHeader1 actions MkKeymapHeader1 {
{
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
$(2[1]) -o "$(1)" -h "$(2[2-])" ; $(2[1]) -o "$(1)" -h "$(2[2-])" ;
} }
MkKeymapHeader [ FGristFiles SystemKeymap.cpp ] : US-International.keymap ; MkKeymapHeader [ FGristFiles SystemKeymap.h ] : US-International.keymap ;
SEARCH on US-International.keymap SEARCH on US-International.keymap
+= [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) data etc keymaps ] ; += [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) data etc keymaps ] ;
@@ -60,8 +58,6 @@ Server input_server :
MouseSettings.cpp MouseSettings.cpp
KeyboardSettings.cpp KeyboardSettings.cpp
SystemKeymap.cpp
MethodReplicant.cpp MethodReplicant.cpp
MethodMenuItem.cpp MethodMenuItem.cpp
BottomlineWindow.cpp BottomlineWindow.cpp
@@ -79,8 +75,8 @@ SEARCH on [ FGristFiles AddOnMonitor.cpp
NodeMonitorHandler.cpp ] += [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) kits storage ] ; NodeMonitorHandler.cpp ] += [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) kits storage ] ;
Package haiku-inputkit-cvs : Package haiku-inputkit-cvs :
input_server : input_server :
boot beos system servers ; boot beos system servers ;
Packages haiku-inputkit-cvs : Packages haiku-inputkit-cvs :
README LICENSE install.sh ; README LICENSE install.sh ;