From d820b0ec87b7bf02995c255c4a212c1744531a0d Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 10 Jul 2002 17:58:20 +0000 Subject: [PATCH] Adjusted some Jamfiles to reflect the new tree structure and moved AddResources before the respective building rules. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@47 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/prefs/Jamfile | 8 +++++--- src/prefs/keyboard/Jamfile | 6 +++--- src/prefs/menu/Jamfile | 6 +++--- src/prefs/mouse/Jamfile | 6 +++--- src/prefs/screen/Jamfile | 6 +++--- src/prefs/workspaces/Jamfile | 6 +++--- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/prefs/Jamfile b/src/prefs/Jamfile index 860dd93d40..5f5bfcfa02 100644 --- a/src/prefs/Jamfile +++ b/src/prefs/Jamfile @@ -1,3 +1,5 @@ -SubInclude OBOS_TOP sources os kits interface prefs menu ; -SubInclude OBOS_TOP sources os kits interface prefs screen ; -SubInclude OBOS_TOP sources os kits interface prefs workspaces ; +SubDir OBOS_TOP src prefs ; + +SubInclude OBOS_TOP src prefs menu ; +SubInclude OBOS_TOP src prefs screen ; +SubInclude OBOS_TOP src prefs workspaces ; diff --git a/src/prefs/keyboard/Jamfile b/src/prefs/keyboard/Jamfile index 4841522d77..fc651a7db6 100644 --- a/src/prefs/keyboard/Jamfile +++ b/src/prefs/keyboard/Jamfile @@ -1,7 +1,7 @@ -SubDir OBOS_TOP sources os kits input prefs keyboard ; +SubDir OBOS_TOP src prefs keyboard ; + +AddResources Keyboard : Keyboard.rsrc ; Preference Keyboard : Keyboard.cpp KeyboardSettings.cpp KeyboardView.cpp KeyboardWindow.cpp ; LinkSharedOSLibs Keyboard : translation be root ; - -AddResources Keyboard : Keyboard.rsrc ; diff --git a/src/prefs/menu/Jamfile b/src/prefs/menu/Jamfile index 7274c539f0..0f3a503ef4 100644 --- a/src/prefs/menu/Jamfile +++ b/src/prefs/menu/Jamfile @@ -1,7 +1,7 @@ -SubDir OBOS_TOP sources os kits interface prefs menu ; +SubDir OBOS_TOP src prefs menu ; + +AddResources Menu : Menu.rsrc ; Preference Menu : BitmapMenuItem.cpp ColorPicker.cpp ColorWindow.cpp FontMenu.cpp FontSizeMenu.cpp MenuApp.cpp MenuBar.cpp MenuWindow.cpp ; LinkSharedOSLibs Menu : translation be root ; - -AddResources Menu : Menu.rsrc ; diff --git a/src/prefs/mouse/Jamfile b/src/prefs/mouse/Jamfile index 39e5dfcba6..648d958577 100644 --- a/src/prefs/mouse/Jamfile +++ b/src/prefs/mouse/Jamfile @@ -1,7 +1,7 @@ -SubDir OBOS_TOP sources os kits input prefs mouse ; +SubDir OBOS_TOP src prefs mouse ; + +AddResources Mouse : Mouse.rsrc ; Preference Mouse : Mouse.cpp MouseSettings.cpp MouseView.cpp MouseWindow.cpp ; LinkSharedOSLibs Mouse : translation be root ; - -AddResources Mouse : Mouse.rsrc ; diff --git a/src/prefs/screen/Jamfile b/src/prefs/screen/Jamfile index 8e46788238..e94563dcdd 100644 --- a/src/prefs/screen/Jamfile +++ b/src/prefs/screen/Jamfile @@ -1,7 +1,7 @@ -SubDir OBOS_TOP sources os kits interface prefs screen ; +SubDir OBOS_TOP src prefs screen ; + +AddResources Screen : Screen.rsrc ; Preference Screen : AlertView.cpp AlertWindow.cpp RefreshSlider.cpp RefreshView.cpp RefreshWindow.cpp Screen.cpp ScreenDrawView.cpp ScreenSettings.cpp ScreenView.cpp ScreenWindow.cpp ; LinkSharedOSLibs Screen : be root ; - -AddResources Screen : Screen.rsrc ; diff --git a/src/prefs/workspaces/Jamfile b/src/prefs/workspaces/Jamfile index 764de9ccc9..b147b50f8e 100644 --- a/src/prefs/workspaces/Jamfile +++ b/src/prefs/workspaces/Jamfile @@ -1,7 +1,7 @@ -SubDir OBOS_TOP sources os kits interface prefs workspaces ; +SubDir OBOS_TOP src prefs workspaces ; + +AddResources Workspaces : Workspaces.rsrc ; Preference Workspaces : Workspaces.cpp ; LinkSharedOSLibs Workspaces : be root ; - -AddResources Workspaces : Workspaces.rsrc ;