Build: Add architecture rule for libshared.a.
- As suggested by Ingo, add libshared.a to the architecture name map. This allows it to be linked by its short name like other frequently used libraries. - Adjust all Jamfiles referencing the lib accordingly.
This commit is contained in:
Rene Gollent
@@ -198,6 +198,8 @@ rule ArchitectureSetup architecture
|
||||
}
|
||||
HAIKU_LIBRARY_NAME_MAP_$(architecture)_localestub
|
||||
= <$(architecture)>liblocalestub.a ;
|
||||
HAIKU_LIBRARY_NAME_MAP_$(architecture)_shared
|
||||
= <$(architecture)>libshared.a ;
|
||||
if $(architecture) = $(HAIKU_PACKAGING_ARCHS[1]) {
|
||||
HAIKU_LIBRARY_NAME_MAP_$(architecture)_input_server
|
||||
= <nogrist>input_server ;
|
||||
|
||||
@@ -39,7 +39,7 @@ for lib in [ HaikuImageGetSystemLibs ] $(developmentLibs) {
|
||||
|
||||
# static libraries
|
||||
AddFilesToPackage develop lib : libcolumnlistview.a
|
||||
<$(architecture)>liblocalestub.a libshared.a ;
|
||||
<$(architecture)>liblocalestub.a <$(architecture)>libshared.a ;
|
||||
|
||||
# the POSIX error code mapper library
|
||||
AddFilesToPackage develop lib : libposix_error_mapper.a ;
|
||||
|
||||
@@ -13,7 +13,7 @@ Addon <disk_system>bfs :
|
||||
|
||||
bfs_disk_system.cpp
|
||||
|
||||
: be localestub [ TargetLibsupc++ ] libshared.a
|
||||
: be localestub [ TargetLibsupc++ ] shared
|
||||
;
|
||||
|
||||
DoCatalogs <disk_system>bfs :
|
||||
|
||||
@@ -11,7 +11,7 @@ Addon <disk_system>fat :
|
||||
FATAddOn.cpp
|
||||
InitializeParameterEditor.cpp
|
||||
|
||||
: be localestub [ TargetLibsupc++ ] libshared.a
|
||||
: be localestub [ TargetLibsupc++ ] shared
|
||||
;
|
||||
|
||||
DoCatalogs <disk_system>fat :
|
||||
|
||||
@@ -23,7 +23,7 @@ Addon <disk_system>intel :
|
||||
# kernel sources
|
||||
PartitionMap.cpp
|
||||
|
||||
: be libshared.a localestub [ TargetLibsupc++ ]
|
||||
: be shared localestub [ TargetLibsupc++ ]
|
||||
;
|
||||
|
||||
DoCatalogs <disk_system>intel :
|
||||
|
||||
@@ -11,7 +11,7 @@ Addon <disk_system>ntfs :
|
||||
NTFSAddOn.cpp
|
||||
InitializeParameterEditor.cpp
|
||||
|
||||
: be localestub [ TargetLibsupc++ ] libshared.a
|
||||
: be localestub [ TargetLibsupc++ ] shared
|
||||
;
|
||||
|
||||
DoCatalogs <disk_system>ntfs :
|
||||
|
||||
@@ -14,7 +14,7 @@ Addon <input>keyboard :
|
||||
TeamMonitorWindow.cpp
|
||||
TeamListItem.cpp
|
||||
|
||||
: input_server be libshared.a localestub [ TargetLibsupc++ ] ;
|
||||
: input_server be shared localestub [ TargetLibsupc++ ] ;
|
||||
|
||||
DoCatalogs <input>keyboard :
|
||||
x-vnd.Haiku-KeyboardInputServerDevice
|
||||
|
||||
@@ -14,6 +14,6 @@ Addon <input>virtualkeyboard :
|
||||
VirtualKeyboardInputDevice.cpp
|
||||
VirtualKeyboardWindow.cpp
|
||||
|
||||
: be tracker input_server localestub libshared.a $(TARGET_LIBSTDC++)
|
||||
: be tracker input_server localestub shared $(TARGET_LIBSTDC++)
|
||||
;
|
||||
|
||||
|
||||
@@ -20,6 +20,6 @@ Application authentication_server
|
||||
AuthenticationPanel.cpp
|
||||
AuthenticationServer.cpp
|
||||
Panel.cpp
|
||||
: be [ TargetLibsupc++ ] libshared.a
|
||||
: be [ TargetLibsupc++ ] shared
|
||||
: authentication_server.rdef
|
||||
;
|
||||
|
||||
@@ -88,5 +88,5 @@ Addon netfs
|
||||
VolumeManager.cpp
|
||||
|
||||
: be libuserlandfs_beos_kernel.so
|
||||
$(TARGET_NETWORK_LIBS) [ TargetLibsupc++ ] libshared.a
|
||||
$(TARGET_NETWORK_LIBS) [ TargetLibsupc++ ] shared
|
||||
;
|
||||
|
||||
@@ -84,7 +84,7 @@ Application netfs_server
|
||||
Volume.cpp
|
||||
VolumeManager.cpp
|
||||
:
|
||||
be $(TARGET_NETWORK_LIBS) [ TargetLibsupc++ ] libshared.a
|
||||
be $(TARGET_NETWORK_LIBS) [ TargetLibsupc++ ] shared
|
||||
:
|
||||
netfs_server.rdef
|
||||
;
|
||||
|
||||
@@ -29,5 +29,5 @@ SharedLibrary libuserlandfs_fuse.so
|
||||
FUSEVolume.cpp
|
||||
|
||||
:
|
||||
<nogrist>userlandfs_server libshared.a be [ TargetLibsupc++ ]
|
||||
<nogrist>userlandfs_server shared be [ TargetLibsupc++ ]
|
||||
;
|
||||
|
||||
@@ -45,7 +45,7 @@ Addon IMAP
|
||||
$(sources)
|
||||
:
|
||||
be libmail.so localestub $(TARGET_NETWORK_LIBS) libbnetapi.so
|
||||
libshared.a [ TargetLibsupc++ ] [ TargetLibstdc++ ]
|
||||
shared [ TargetLibsupc++ ] [ TargetLibstdc++ ]
|
||||
;
|
||||
|
||||
SEARCH on [ FGristFiles Commands.cpp Protocol.cpp Response.cpp ]
|
||||
|
||||
@@ -9,7 +9,7 @@ AddResources FTPService : FTPService.rdef ;
|
||||
Addon FTPService :
|
||||
FTPServiceAddOn.cpp
|
||||
|
||||
: be bnetapi libshared.a <nogrist>Network [ TargetLibsupc++ ]
|
||||
: be bnetapi shared <nogrist>Network [ TargetLibsupc++ ]
|
||||
[ TargetLibstdc++ ] localestub
|
||||
;
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ AddResources IPv4Interface : IPv4Interface.rdef ;
|
||||
Addon IPv4Interface :
|
||||
IPv4InterfaceAddOn.cpp
|
||||
|
||||
: be bnetapi libshared.a <nogrist>Network [ TargetLibsupc++ ]
|
||||
: be bnetapi shared <nogrist>Network [ TargetLibsupc++ ]
|
||||
[ TargetLibstdc++ ] localestub
|
||||
;
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ AddResources IPv6Interface : IPv6Interface.rdef ;
|
||||
Addon IPv6Interface :
|
||||
IPv6InterfaceAddOn.cpp
|
||||
|
||||
: be bnetapi libshared.a <nogrist>Network [ TargetLibsupc++ ]
|
||||
: be bnetapi shared <nogrist>Network [ TargetLibsupc++ ]
|
||||
[ TargetLibstdc++ ] localestub
|
||||
;
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ AddResources SSHService : SSHService.rdef ;
|
||||
Addon SSHService :
|
||||
SSHServiceAddOn.cpp
|
||||
|
||||
: be bnetapi libshared.a <nogrist>Network [ TargetLibsupc++ ]
|
||||
: be bnetapi shared <nogrist>Network [ TargetLibsupc++ ]
|
||||
[ TargetLibstdc++ ] localestub
|
||||
;
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ AddResources TelnetService : TelnetService.rdef ;
|
||||
Addon TelnetService :
|
||||
TelnetServiceAddOn.cpp
|
||||
|
||||
: be bnetapi libshared.a <nogrist>Network [ TargetLibsupc++ ]
|
||||
: be bnetapi shared <nogrist>Network [ TargetLibsupc++ ]
|
||||
[ TargetLibstdc++ ] localestub
|
||||
;
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ Addon IPP :
|
||||
Socket.o
|
||||
SocketStream.o
|
||||
DbgMsg.o
|
||||
: libshared.a be $(TARGET_NETAPI_LIB) $(TARGET_NETWORK_LIBS) [ TargetLibstdc++ ]
|
||||
: shared be $(TARGET_NETAPI_LIB) $(TARGET_NETWORK_LIBS) [ TargetLibstdc++ ]
|
||||
;
|
||||
|
||||
ObjectReferences
|
||||
|
||||
@@ -9,5 +9,5 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits print ] ;
|
||||
Addon USB\ Port :
|
||||
USBTransport.cpp
|
||||
PrintTransportAddOn.cpp
|
||||
: libshared.a libdevice.so be [ TargetLibsupc++ ]
|
||||
: shared libdevice.so be [ TargetLibsupc++ ]
|
||||
;
|
||||
|
||||
@@ -10,7 +10,7 @@ Application ActivityMonitor :
|
||||
SettingsWindow.cpp
|
||||
SystemInfo.cpp
|
||||
SystemInfoHandler.cpp
|
||||
: be tracker media libbnetapi.so libshared.a [ TargetLibstdc++ ]
|
||||
: be tracker media libbnetapi.so shared [ TargetLibstdc++ ]
|
||||
$(TARGET_NETWORK_LIBS) localestub
|
||||
: ActivityMonitor.rdef
|
||||
;
|
||||
|
||||
@@ -27,7 +27,7 @@ Application DebugAnalyzer
|
||||
<nogrist>DebugAnalyzer_model_loader.o
|
||||
<nogrist>DebugAnalyzer_util.o
|
||||
|
||||
libcolumnlistview.a libshared.a libdebug.so be
|
||||
libcolumnlistview.a shared libdebug.so be
|
||||
[ TargetLibstdc++ ]
|
||||
:
|
||||
DebugAnalyzer.rdef
|
||||
|
||||
@@ -415,7 +415,7 @@ Application Debugger :
|
||||
libudis86.a
|
||||
<bin>debug_utils.a
|
||||
libcolumnlistview.a
|
||||
libshared.a
|
||||
shared
|
||||
|
||||
[ TargetLibstdc++ ]
|
||||
be package tracker libbsd.so libdebug.so
|
||||
|
||||
@@ -14,7 +14,7 @@ SubDirC++Flags -DDB_ADDONS
|
||||
local targetLib ;
|
||||
local targetSource ;
|
||||
|
||||
targetLib = libshared.a ;
|
||||
targetLib = shared ;
|
||||
targetSource = CalendarMenuWindow.cpp ;
|
||||
SubDirC++Flags -D_SHOW_CALENDAR_MENU_WINDOW=1 -DMOUNT_MENU_IN_DESKBAR=1 ;
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ Application DeskCalc :
|
||||
ExpressionTextView.cpp
|
||||
InputTextView.cpp
|
||||
: be [ TargetLibstdc++ ] localestub media libexpression_parser.a
|
||||
libmapm.a libshared.a
|
||||
libmapm.a shared
|
||||
: DeskCalc.rdef
|
||||
;
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ Application DiskUsage :
|
||||
Snapshot.cpp
|
||||
StatusView.cpp
|
||||
VolumeView.cpp
|
||||
: be libshared.a localestub [ TargetLibstdc++ ]
|
||||
: be shared localestub [ TargetLibstdc++ ]
|
||||
: DiskUsage.rdef
|
||||
;
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ Preference DriveSetup :
|
||||
PartitionList.cpp
|
||||
Support.cpp
|
||||
|
||||
: be localestub libcolumnlistview.a libshared.a
|
||||
: be localestub libcolumnlistview.a shared
|
||||
[ TargetLibsupc++ ]
|
||||
: DriveSetup.rdef
|
||||
;
|
||||
|
||||
@@ -9,7 +9,7 @@ Application FirstBootPrompt :
|
||||
BootPromptWindow.cpp
|
||||
Keymap.cpp
|
||||
KeymapListItem.cpp
|
||||
: be translation libshared.a [ TargetLibstdc++ ] localestub
|
||||
: be translation shared [ TargetLibstdc++ ] localestub
|
||||
: BootPrompt.rdef
|
||||
;
|
||||
|
||||
|
||||
@@ -81,7 +81,7 @@ Application HaikuDepot :
|
||||
# text view stuff
|
||||
$(textDocumentSources)
|
||||
|
||||
: be package bnetapi translation libcolumnlistview.a libshared.a
|
||||
: be package bnetapi translation libcolumnlistview.a shared
|
||||
[ TargetLibstdc++ ] [ TargetLibsupc++ ] localestub
|
||||
: HaikuDepot.rdef
|
||||
;
|
||||
@@ -107,5 +107,5 @@ Application TextDocumentTest :
|
||||
TextDocumentTest.cpp
|
||||
$(textDocumentSources)
|
||||
|
||||
: be translation libshared.a [ TargetLibsupc++ ]
|
||||
: be translation shared [ TargetLibsupc++ ]
|
||||
;
|
||||
|
||||
@@ -298,7 +298,7 @@ Application Icon-O-Matic :
|
||||
MainWindow.cpp
|
||||
Util.cpp
|
||||
|
||||
: be tracker translation libshared.a libagg.a
|
||||
: be tracker translation shared libagg.a
|
||||
[ BuildFeatureAttribute expat : library ]
|
||||
[ TargetLibstdc++ ] localestub
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ Application Installer :
|
||||
# From launch_daemon
|
||||
Utility.cpp
|
||||
|
||||
: be tracker translation libshared.a [ TargetLibstdc++ ]
|
||||
: be tracker translation shared [ TargetLibstdc++ ]
|
||||
localestub
|
||||
: Installer.rdef
|
||||
;
|
||||
|
||||
@@ -11,7 +11,7 @@ Application LaunchBox :
|
||||
PadView.cpp
|
||||
Panel.cpp
|
||||
support.cpp
|
||||
: be translation libshared.a [ TargetLibsupc++ ] localestub
|
||||
: be translation shared [ TargetLibsupc++ ] localestub
|
||||
: LaunchBox.rdef
|
||||
;
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@ Application Mail :
|
||||
AutoCompleterDefaultImpl.cpp
|
||||
TextViewCompleter.cpp
|
||||
|
||||
: libshared.a be tracker [ TargetLibstdc++ ] [ TargetLibsupc++ ]
|
||||
: shared be tracker [ TargetLibstdc++ ] [ TargetLibsupc++ ]
|
||||
localestub libmail.so libtextencoding.so
|
||||
: Mail.rdef
|
||||
;
|
||||
|
||||
@@ -114,7 +114,7 @@ Application MediaPlayer :
|
||||
VideoView.cpp
|
||||
|
||||
: be game media tracker translation textencoding [ TargetLibstdc++ ]
|
||||
localestub libshared.a
|
||||
localestub shared
|
||||
: MediaPlayer.rdef
|
||||
;
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ Application MusicCollection :
|
||||
NodeMonitorHandler.cpp
|
||||
:
|
||||
be libalm.so localestub [ TargetLibsupc++ ]
|
||||
[ TargetLibstdc++ ] libshared.a
|
||||
[ TargetLibstdc++ ] shared
|
||||
:
|
||||
MusicCollection.rdef
|
||||
;
|
||||
|
||||
@@ -17,7 +17,7 @@ Application NetworkStatus :
|
||||
RadioView.cpp
|
||||
WirelessNetworkMenuItem.cpp
|
||||
|
||||
: be libshared.a localestub $(icon_libs) $(TARGET_NETWORK_LIBS)
|
||||
: be shared localestub $(icon_libs) $(TARGET_NETWORK_LIBS)
|
||||
libbnetapi.so [ TargetLibstdc++ ]
|
||||
: NetworkStatus.rdef NetworkStatusIcons.rdef
|
||||
;
|
||||
|
||||
@@ -13,7 +13,7 @@ Application PowerStatus :
|
||||
PowerStatusWindow.cpp
|
||||
PowerStatusView.cpp
|
||||
PowerStatus.cpp
|
||||
: be translation libshared.a [ TargetLibsupc++ ] localestub
|
||||
: be translation shared [ TargetLibsupc++ ] localestub
|
||||
: PowerStatus.rdef
|
||||
;
|
||||
DoCatalogs PowerStatus :
|
||||
|
||||
@@ -21,7 +21,7 @@ Application ProcessController :
|
||||
ThreadBarMenu.cpp
|
||||
ThreadBarMenuItem.cpp
|
||||
Utilities.cpp
|
||||
: be libshared.a [ TargetLibsupc++ ] localestub
|
||||
: be shared [ TargetLibsupc++ ] localestub
|
||||
: ProcessController.rdef
|
||||
;
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ Application ShowImage :
|
||||
ShowImageView.cpp
|
||||
ShowImageWindow.cpp
|
||||
ToolBarIcons.cpp
|
||||
: libshared.a be tracker translation localestub
|
||||
: shared be tracker translation localestub
|
||||
[ TargetLibstdc++ ] [ TargetLibsupc++ ]
|
||||
: ShowImage.rdef
|
||||
;
|
||||
|
||||
@@ -22,7 +22,7 @@ Application StyledEdit :
|
||||
StyledEditApp.cpp
|
||||
StyledEditView.cpp
|
||||
StyledEditWindow.cpp
|
||||
: libshared.a be translation tracker libtextencoding.so localestub
|
||||
: shared be translation tracker libtextencoding.so localestub
|
||||
[ TargetLibsupc++ ]
|
||||
: $(styled_edit_rsrc)
|
||||
;
|
||||
|
||||
@@ -12,6 +12,6 @@ Application Switcher :
|
||||
WindowsView.cpp
|
||||
|
||||
: be translation [ TargetLibstdc++ ] [ TargetLibsupc++ ]
|
||||
localestub libshared.a
|
||||
localestub shared
|
||||
: Switcher.rdef
|
||||
;
|
||||
|
||||
@@ -24,7 +24,7 @@ Application TextSearch :
|
||||
|
||||
$(additionalBeOSSources)
|
||||
|
||||
: be localestub tracker textencoding libshared.a
|
||||
: be localestub tracker textencoding shared
|
||||
[ TargetLibsupc++ ]
|
||||
: TextSearch.rdef
|
||||
;
|
||||
|
||||
@@ -73,8 +73,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
|
||||
$(sources)
|
||||
:
|
||||
[ BuildFeatureAttribute webkit : libraries ]
|
||||
[ TargetLibstdc++ ] localestub
|
||||
[ MultiArchDefaultGristFiles libshared.a ]
|
||||
[ TargetLibstdc++ ] localestub shared
|
||||
[ MultiArchDefaultGristFiles libcolumnlistview.a ]
|
||||
be network bnetapi tracker translation
|
||||
:
|
||||
|
||||
@@ -7,7 +7,7 @@ UsePrivateHeaders app interface shared ;
|
||||
|
||||
Application Workspaces :
|
||||
Workspaces.cpp
|
||||
: be libshared.a localestub [ TargetLibsupc++ ]
|
||||
: be shared localestub [ TargetLibsupc++ ]
|
||||
: Workspaces.rdef
|
||||
;
|
||||
|
||||
|
||||
+1
-1
@@ -132,7 +132,7 @@ StdBinCommands
|
||||
# standard commands that need libbe.so, libsupc++.so, and libshared.a
|
||||
StdBinCommands
|
||||
ramdisk.cpp
|
||||
: libshared.a be [ TargetLibsupc++ ] : $(haiku-utils_rsrc) ;
|
||||
: shared be [ TargetLibsupc++ ] : $(haiku-utils_rsrc) ;
|
||||
|
||||
# standard commands that need libbe.so, libbnetapi.solibsupc++.so
|
||||
StdBinCommands
|
||||
|
||||
@@ -5,5 +5,5 @@ UseHeaders [ FDirName $(HAIKU_TOP) src apps terminal ] ;
|
||||
|
||||
Application consoled :
|
||||
consoled.cpp
|
||||
: be libshared.a [ TargetLibsupc++ ]
|
||||
: be shared [ TargetLibsupc++ ]
|
||||
;
|
||||
|
||||
@@ -6,5 +6,5 @@ UsePrivateHeaders shared storage ;
|
||||
BinCommand keymap :
|
||||
main.cpp
|
||||
Keymap.cpp
|
||||
: be libshared.a [ TargetLibsupc++ ]
|
||||
: be shared [ TargetLibsupc++ ]
|
||||
: keymap.rdef ;
|
||||
|
||||
@@ -20,6 +20,6 @@ BinCommand pkgman :
|
||||
PackageManager.cpp
|
||||
pkgman.cpp
|
||||
:
|
||||
libshared.a package be
|
||||
shared package be
|
||||
[ TargetLibsupc++ ] [ TargetLibstdc++ ]
|
||||
;
|
||||
|
||||
@@ -155,7 +155,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
|
||||
OneElementLayouter.cpp
|
||||
SimpleLayouter.cpp
|
||||
|
||||
: [ MultiArchDefaultGristFiles libshared.a ]
|
||||
: <$(architecture)>libshared.a
|
||||
;
|
||||
|
||||
StaticLibrary [ MultiArchDefaultGristFiles libcolumnlistview.a ] :
|
||||
|
||||
@@ -58,8 +58,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
|
||||
SharedLibrary $(libmail) :
|
||||
$(sources)
|
||||
:
|
||||
be bnetapi textencoding tracker
|
||||
[ MultiArchDefaultGristFiles libshared.a ]
|
||||
be bnetapi textencoding tracker shared
|
||||
[ TargetLibstdc++ ]
|
||||
$(TARGET_NETWORK_LIBS)
|
||||
$(TARGET_SELECT_UNAME_ETC_LIB)
|
||||
|
||||
@@ -101,10 +101,9 @@ for architectureObject in [ MultiArchSubDirSetup ] {
|
||||
UrlSynchronousRequest.cpp
|
||||
|
||||
:
|
||||
be $(TARGET_NETWORK_LIBS) [ TargetLibstdc++ ] [ TargetLibsupc++ ]
|
||||
[ BuildFeatureAttribute openssl : libraries ]
|
||||
be shared $(TARGET_NETWORK_LIBS) [ TargetLibstdc++ ]
|
||||
[ TargetLibsupc++ ] [ BuildFeatureAttribute openssl : libraries ]
|
||||
[ BuildFeatureAttribute icu : libraries ]
|
||||
[ MultiArchDefaultGristFiles libshared.a ]
|
||||
;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -128,7 +128,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
|
||||
SolverRepository.cpp
|
||||
SolverResult.cpp
|
||||
:
|
||||
[ MultiArchDefaultGristFiles libshared.a ]
|
||||
shared
|
||||
be
|
||||
[ BuildFeatureAttribute curl : library ]
|
||||
[ TargetLibstdc++ ]
|
||||
|
||||
@@ -26,7 +26,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
|
||||
UsePrivateSystemHeaders ;
|
||||
UsePrivateHeaders kernel libroot ;
|
||||
|
||||
StaticLibrary [ MultiArchDefaultGristFiles libshared.a ] :
|
||||
StaticLibrary <$(architecture)>libshared.a :
|
||||
AboutMenuItem.cpp
|
||||
ArgumentVector.cpp
|
||||
AttributeUtilities.cpp
|
||||
|
||||
@@ -100,9 +100,8 @@ for architectureObject in [ MultiArchSubDirSetup ] {
|
||||
WidgetAttributeText.cpp
|
||||
|
||||
:
|
||||
be localestub translation $(vectorIconLibs)
|
||||
be localestub shared translation $(vectorIconLibs)
|
||||
[ TargetLibstdc++ ] [ TargetLibsupc++ ]
|
||||
[ MultiArchDefaultGristFiles libshared.a ]
|
||||
[ MultiArchDefaultGristFiles libshortcuts_shared.a ]
|
||||
;
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ Preference DataTranslations :
|
||||
DataTranslationsSettings.cpp
|
||||
TranslatorListView.cpp
|
||||
|
||||
: be translation [ TargetLibsupc++ ] localestub libshared.a
|
||||
: be translation [ TargetLibsupc++ ] localestub shared
|
||||
: DataTranslations.rdef
|
||||
;
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ Preference Keymap :
|
||||
KeymapWindow.cpp
|
||||
ModifierKeysWindow.cpp
|
||||
|
||||
: be tracker localestub libshared.a [ TargetLibstdc++ ]
|
||||
: be tracker localestub shared [ TargetLibstdc++ ]
|
||||
: Keymap.rdef
|
||||
;
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ local sources =
|
||||
|
||||
Preference Locale
|
||||
: $(sources)
|
||||
: be [ TargetLibstdc++ ] [ TargetLibsupc++ ] libshared.a
|
||||
: be [ TargetLibstdc++ ] [ TargetLibsupc++ ] shared
|
||||
localestub
|
||||
: Locale.rdef
|
||||
;
|
||||
|
||||
@@ -27,7 +27,7 @@ Preference Network :
|
||||
# from ifconfig
|
||||
MediaTypes.cpp
|
||||
|
||||
: be bnetapi libshared.a [ TargetLibstdc++ ] localestub
|
||||
: be bnetapi shared [ TargetLibstdc++ ] localestub
|
||||
: Network.rdef InterfaceIcons.rdef
|
||||
;
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ Includes [ FGristFiles $(sources) ] : [ BuildFeatureAttribute icu : headers ] ;
|
||||
|
||||
Preference Time
|
||||
: $(sources)
|
||||
: be libshared.a [ TargetLibstdc++ ] localestub $(HAIKU_NETWORK_LIBS)
|
||||
: be shared [ TargetLibstdc++ ] localestub $(HAIKU_NETWORK_LIBS)
|
||||
: Time.rdef
|
||||
;
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ Preference VirtualMemory :
|
||||
Settings.cpp
|
||||
$(DRIVER_SETTINGS)
|
||||
|
||||
: be libshared.a [ TargetLibstdc++ ] localestub
|
||||
: be shared [ TargetLibstdc++ ] localestub
|
||||
: VirtualMemory.rdef
|
||||
;
|
||||
|
||||
|
||||
@@ -103,7 +103,7 @@ Server app_server :
|
||||
libaslocal.a $(BROKEN_64)libasremote.a $(BROKEN_64)libashtml5.a
|
||||
libasdrawing.a libpainter.a libagg.a
|
||||
[ BuildFeatureAttribute freetype : library ]
|
||||
libstackandtile.a liblinprog.a libtextencoding.so libshared.a
|
||||
libstackandtile.a liblinprog.a libtextencoding.so shared
|
||||
[ TargetLibstdc++ ]
|
||||
|
||||
: app_server.rdef
|
||||
|
||||
@@ -14,7 +14,7 @@ Server debug_server
|
||||
:
|
||||
be
|
||||
libdebug.so
|
||||
libshared.a
|
||||
shared
|
||||
[ TargetLibstdc++ ]
|
||||
localestub
|
||||
;
|
||||
|
||||
@@ -26,7 +26,7 @@ Server launch_daemon
|
||||
InitSharedMemoryDirectoryJob.cpp
|
||||
InitTemporaryDirectoryJob.cpp
|
||||
:
|
||||
be network bnetapi libshared.a libmultiuser_utils.a [ TargetLibstdc++ ]
|
||||
be network bnetapi shared libmultiuser_utils.a [ TargetLibstdc++ ]
|
||||
:
|
||||
LaunchDaemon.rdef
|
||||
;
|
||||
|
||||
@@ -12,7 +12,7 @@ Server midi_server :
|
||||
# storage
|
||||
NodeMonitorHandler.cpp
|
||||
|
||||
: be midi2 libshared.a libicon.a [ TargetLibstdc++ ]
|
||||
: be midi2 shared libicon.a [ TargetLibstdc++ ]
|
||||
: midi_server.rdef
|
||||
;
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ Server net_server :
|
||||
DHCPClient.cpp
|
||||
Services.cpp
|
||||
|
||||
: be network bnetapi [ TargetLibstdc++ ] libshared.a
|
||||
: be network bnetapi [ TargetLibstdc++ ] shared
|
||||
# for PPP
|
||||
#libppp.a
|
||||
;
|
||||
|
||||
@@ -5,11 +5,11 @@ UsePrivateHeaders shared ;
|
||||
SimpleTest generate_hashs :
|
||||
generate_hashs.cpp
|
||||
AdaptiveBuffering.cpp
|
||||
: be [ TargetLibstdc++ ] libshared.a
|
||||
: be [ TargetLibstdc++ ] shared
|
||||
;
|
||||
|
||||
SimpleTest consistency_check :
|
||||
consistency_check.cpp
|
||||
AdaptiveBuffering.cpp
|
||||
: be [ TargetLibstdc++ ] libshared.a
|
||||
: be [ TargetLibstdc++ ] shared
|
||||
;
|
||||
|
||||
@@ -172,7 +172,7 @@ SharedLibrary libtestappserver.so :
|
||||
WorkspacesView.cpp
|
||||
|
||||
# libraries
|
||||
: be libpainter.a libagg.a libtextencoding.so libshared.a libstackandtile.a
|
||||
: be libpainter.a libagg.a libtextencoding.so shared libstackandtile.a
|
||||
liblinprog.a
|
||||
[ BuildFeatureAttribute freetype : library ]
|
||||
;
|
||||
|
||||
@@ -19,5 +19,5 @@ UnitTestLib liblaunch_daemontest.so :
|
||||
Conditions.cpp
|
||||
Utility.cpp
|
||||
|
||||
: be network bnetapi libshared.a [ TargetLibstdc++ ] [ TargetLibsupc++ ]
|
||||
: be network bnetapi shared [ TargetLibstdc++ ] [ TargetLibsupc++ ]
|
||||
;
|
||||
|
||||
Reference in New Issue
Block a user