diff --git a/Jamfile b/Jamfile index 4d17047bd5..583ffd27df 100644 --- a/Jamfile +++ b/Jamfile @@ -30,18 +30,27 @@ AddHaikuImagePackages [ FFilterByBuildFeatures mesa mesa_devel mesa_swrast sed sharutils tar tiff wget which }@ ] ; -# secondary architectures -local architectureObject ; -for architectureObject - in [ MultiArchSubDirSetup $(HAIKU_PACKAGING_ARCHS[2-]) ] { - on $(architectureObject) { - AddHaikuImagePackages [ FFilterByBuildFeatures - curl freetype icu libsolv zlib +if $(HAIKU_PACKAGING_ARCHS[1]) != x86_gcc2 { + AddHaikuImagePackages [ FFilterByBuildFeatures gcc_syslibs ] ; +} - regular_image @{ - ffmpeg glu jpeg libpng mesa - }@ - ] ; +if $(HAIKU_PACKAGING_ARCHS[2]) { + # secondary architectures + local architectureObject ; + for architectureObject + in [ MultiArchSubDirSetup $(HAIKU_PACKAGING_ARCHS[2-]) ] { + on $(architectureObject) { + AddHaikuImagePackages [ FFilterByBuildFeatures + curl freetype icu libsolv zlib + + regular_image @{ + ffmpeg glu jpeg libpng mesa + }@ + ] ; + if $(TARGET_PACKAGING_ARCH) != x86_gcc2 { + AddHaikuImagePackages [ FFilterByBuildFeatures gcc_syslibs ] ; + } + } } } diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules index 449aca49be..d18159b958 100644 --- a/build/jam/ArchitectureRules +++ b/build/jam/ArchitectureRules @@ -466,8 +466,7 @@ rule KernelArchitectureSetup architecture # kernel add-on glue code HAIKU_KERNEL_ADDON_BEGIN_GLUE_CODE = <$(architecture)>crtbeginS.o haiku_version_glue.o ; - HAIKU_KERNEL_ADDON_END_GLUE_CODE - = $(HAIKU_GCC_LIBGCC_$(architecture)) <$(architecture)>crtendS.o ; + HAIKU_KERNEL_ADDON_END_GLUE_CODE = <$(architecture)>crtendS.o ; } diff --git a/build/jam/BootRules b/build/jam/BootRules index 88e1c995e1..c45f268270 100644 --- a/build/jam/BootRules +++ b/build/jam/BootRules @@ -54,9 +54,11 @@ rule BootLd # libsupc++ is opt-out. local libs ; if ! [ on $(1) return $(HAIKU_NO_LIBSUPC++) ] { - libs += $(TARGET_BOOT_LIBSUPC++) ; + libs += [ TargetBootLibsupc++ true ] ; + Depends $(1) : [ TargetBootLibsupc++ ] ; } - LINKLIBS on $(1) = $(libs) $(TARGET_BOOT_LIBGCC) ; + LINKLIBS on $(1) = $(libs) [ TargetBootLibgcc true ] ; + Depends $(1) : [ TargetBootLibgcc ] ; # TODO: Do we really want to invoke SetupBoot here? The objects should # have been compiled with BootObjects anyway, so we're doing that twice. diff --git a/build/jam/KernelRules b/build/jam/KernelRules index 8fa5ab39f4..7fc8b47762 100644 --- a/build/jam/KernelRules +++ b/build/jam/KernelRules @@ -48,9 +48,11 @@ rule KernelLd # libsupc++ is opt-out. local libs ; if ! [ on $(1) return $(HAIKU_NO_LIBSUPC++) ] { - libs += $(TARGET_KERNEL_LIBSUPC++) ; + libs += [ TargetKernelLibsupc++ true ] ; + Depends $(1) : [ TargetKernelLibsupc++ ] ; } - LINKLIBS on $(1) = $(libs) $(TARGET_KERNEL_LIBGCC) ; + LINKLIBS on $(1) = $(libs) [ TargetKernelLibgcc true ] ; + Depends $(1) : [ TargetKernelLibgcc ] ; HAIKU_TARGET_IS_EXECUTABLE on $(1) = 1 ; @@ -119,7 +121,8 @@ rule KernelAddon if $(PLATFORM) = haiku { kernel = kernel.so ; beginGlue = $(HAIKU_KERNEL_ADDON_BEGIN_GLUE_CODE) ; - endGlue = $(HAIKU_KERNEL_ADDON_END_GLUE_CODE) ; + endGlue + = [ TargetKernelLibgcc ] $(HAIKU_KERNEL_ADDON_END_GLUE_CODE) ; } else if $(PLATFORM) = haiku_host { kernel = /boot/develop/lib/x86/kernel.so ; beginGlue = $(HAIKU_KERNEL_ADDON_BEGIN_GLUE_CODE) ; diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules index 6ca4674126..94af57a186 100644 --- a/build/jam/MainBuildRules +++ b/build/jam/MainBuildRules @@ -8,7 +8,8 @@ rule AddSharedObjectGlueCode on $(1) { platform = $(PLATFORM) ; if $(platform) = haiku { - local stdLibs = [ MultiArchDefaultGristFiles libroot.so ] ; + local stdLibs = [ MultiArchDefaultGristFiles libroot.so ] + [ TargetLibgcc ] ; local type = EXECUTABLE ; if $(2) != true { type = LIBRARY ; diff --git a/build/jam/images/definitions/minimum b/build/jam/images/definitions/minimum index 42a1e8bfef..725332fe8b 100644 --- a/build/jam/images/definitions/minimum +++ b/build/jam/images/definitions/minimum @@ -89,8 +89,7 @@ rule HaikuImageGetSystemLibs return # libs with special grist [ MultiArchDefaultGristFiles libroot.so : revisioned ] - $(HAIKU_SHARED_LIBSTDC++_$(TARGET_PACKAGING_ARCH)) - $(HAIKU_SHARED_LIBSUPC++_$(TARGET_PACKAGING_ARCH)) + [ Libstdc++ForImage ] # libs with standard grist [ MultiArchDefaultGristFiles [ FFilterByBuildFeatures libbe.so libbsd.so libbnetapi.so diff --git a/build/jam/images/definitions/regular b/build/jam/images/definitions/regular index b5d5ef1936..36afa5513d 100644 --- a/build/jam/images/definitions/regular +++ b/build/jam/images/definitions/regular @@ -62,8 +62,7 @@ rule HaikuImageGetSystemLibs return # libs with special grist [ MultiArchDefaultGristFiles libroot.so : revisioned ] - $(HAIKU_SHARED_LIBSTDC++_$(TARGET_PACKAGING_ARCH)) - $(HAIKU_SHARED_LIBSUPC++_$(TARGET_PACKAGING_ARCH)) + [ Libstdc++ForImage ] # libs with standard grist [ MultiArchDefaultGristFiles [ FFilterByBuildFeatures libalm.so diff --git a/build/jam/packages/HaikuCrossDevel b/build/jam/packages/HaikuCrossDevel index 83eb297e1f..b5c6c4cef5 100644 --- a/build/jam/packages/HaikuCrossDevel +++ b/build/jam/packages/HaikuCrossDevel @@ -48,8 +48,8 @@ for stage in _stage1 "" { [ MultiArchDefaultGristFiles libbsd.so ] [ MultiArchDefaultGristFiles libroot.so : revisioned ] [ MultiArchDefaultGristFiles libnetwork.so ] - $(HAIKU_SHARED_LIBSTDC++_$(architecture)) - $(HAIKU_SHARED_LIBSUPC++_$(architecture)) + [ TargetLibstdc++ ] + [ TargetLibsupc++ ] $(additionalLibraries$(stage)) ; diff --git a/src/add-ons/accelerants/radeon_hd/Jamfile b/src/add-ons/accelerants/radeon_hd/Jamfile index efab9f9709..615b8bf6ca 100644 --- a/src/add-ons/accelerants/radeon_hd/Jamfile +++ b/src/add-ons/accelerants/radeon_hd/Jamfile @@ -24,5 +24,5 @@ Addon radeon_hd.accelerant : mode.cpp pll.cpp ringqueue.cpp - : be libaccelerantscommon.a $(TARGET_LIBSUPC++) + : be libaccelerantscommon.a [ TargetLibsupc++ ] ; diff --git a/src/add-ons/decorators/BeDecorator/Jamfile b/src/add-ons/decorators/BeDecorator/Jamfile index 2d74287d53..c992ae57d4 100644 --- a/src/add-ons/decorators/BeDecorator/Jamfile +++ b/src/add-ons/decorators/BeDecorator/Jamfile @@ -17,5 +17,5 @@ Includes [ FGristFiles BeDecorator.cpp ] Addon BeDecorator : BeDecorator.cpp - : be app_server $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++) + : be app_server [ TargetLibstdc++ ] [ TargetLibsupc++ ] ; diff --git a/src/add-ons/decorators/MacDecorator/Jamfile b/src/add-ons/decorators/MacDecorator/Jamfile index 70cb2d1e16..66226c5524 100644 --- a/src/add-ons/decorators/MacDecorator/Jamfile +++ b/src/add-ons/decorators/MacDecorator/Jamfile @@ -17,5 +17,5 @@ Includes [ FGristFiles MacDecorator.cpp ] Addon MacDecorator : MacDecorator.cpp - : be app_server $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++) + : be app_server [ TargetLibstdc++ ] [ TargetLibsupc++ ] ; diff --git a/src/add-ons/decorators/WinDecorator/Jamfile b/src/add-ons/decorators/WinDecorator/Jamfile index b94f121f50..8b261c09ff 100644 --- a/src/add-ons/decorators/WinDecorator/Jamfile +++ b/src/add-ons/decorators/WinDecorator/Jamfile @@ -17,5 +17,5 @@ Includes [ FGristFiles WinDecorator.cpp ] Addon WinDecorator : WinDecorator.cpp - : be app_server $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++) + : be app_server [ TargetLibstdc++ ] [ TargetLibsupc++ ] ; diff --git a/src/add-ons/disk_systems/bfs/Jamfile b/src/add-ons/disk_systems/bfs/Jamfile index 9540539e83..4eb777bd54 100644 --- a/src/add-ons/disk_systems/bfs/Jamfile +++ b/src/add-ons/disk_systems/bfs/Jamfile @@ -13,7 +13,7 @@ Addon bfs : bfs_disk_system.cpp - : be localestub $(TARGET_LIBSUPC++) libshared.a + : be localestub [ TargetLibsupc++ ] libshared.a ; DoCatalogs bfs : diff --git a/src/add-ons/disk_systems/gpt/Jamfile b/src/add-ons/disk_systems/gpt/Jamfile index 5174bc5cbd..48406f7ecc 100644 --- a/src/add-ons/disk_systems/gpt/Jamfile +++ b/src/add-ons/disk_systems/gpt/Jamfile @@ -18,5 +18,5 @@ Addon gpt : crc32.cpp utility.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; diff --git a/src/add-ons/disk_systems/intel/Jamfile b/src/add-ons/disk_systems/intel/Jamfile index 99a6f9d037..097985aaad 100644 --- a/src/add-ons/disk_systems/intel/Jamfile +++ b/src/add-ons/disk_systems/intel/Jamfile @@ -23,7 +23,7 @@ Addon intel : # kernel sources PartitionMap.cpp - : be libshared.a localestub $(TARGET_LIBSUPC++) + : be libshared.a localestub [ TargetLibsupc++ ] ; DoCatalogs intel : diff --git a/src/add-ons/disk_systems/ntfs/Jamfile b/src/add-ons/disk_systems/ntfs/Jamfile index 9dc3ab3d21..c6e675abe7 100644 --- a/src/add-ons/disk_systems/ntfs/Jamfile +++ b/src/add-ons/disk_systems/ntfs/Jamfile @@ -11,7 +11,7 @@ Addon ntfs : NTFSAddOn.cpp InitializeParameterEditor.cpp - : be localestub $(TARGET_LIBSUPC++) libshared.a + : be localestub [ TargetLibsupc++ ] libshared.a ; DoCatalogs ntfs : diff --git a/src/add-ons/index_server/audiotags/Jamfile b/src/add-ons/index_server/audiotags/Jamfile index 8273c72ce4..2eafed01a5 100644 --- a/src/add-ons/index_server/audiotags/Jamfile +++ b/src/add-ons/index_server/audiotags/Jamfile @@ -16,7 +16,7 @@ Includes [ FGristFiles $(sources) ] : $(HAIKU_TAGLIB_HEADERS_DEPENDENCY) ; Addon AudioTagAnalyser : $(sources) : - be $(HAIKU_TAGLIB_LIBS) $(TARGET_LIBSTDC++) + be $(HAIKU_TAGLIB_LIBS) [ TargetLibstdc++ ] ; SEARCH on [ FGristFiles IndexServerAddOn.cpp ] diff --git a/src/add-ons/index_server/fulltext/Jamfile b/src/add-ons/index_server/fulltext/Jamfile index 3de659ac9f..e32f0fe2a3 100644 --- a/src/add-ons/index_server/fulltext/Jamfile +++ b/src/add-ons/index_server/fulltext/Jamfile @@ -17,7 +17,7 @@ Includes [ FGristFiles $(sources) ] : $(HAIKU_CLUCENE_HEADERS_DEPENDENCY) ; Addon FullTextAnalyser : $(sources) : - be $(HAIKU_CLUCENE_LIBS) $(TARGET_LIBSTDC++) + be $(HAIKU_CLUCENE_LIBS) [ TargetLibstdc++ ] ; SEARCH on [ FGristFiles IndexServerAddOn.cpp ] diff --git a/src/add-ons/input_server/devices/keyboard/Jamfile b/src/add-ons/input_server/devices/keyboard/Jamfile index d0a21bdb93..0fc8cb2893 100644 --- a/src/add-ons/input_server/devices/keyboard/Jamfile +++ b/src/add-ons/input_server/devices/keyboard/Jamfile @@ -14,7 +14,7 @@ Addon keyboard : TeamMonitorWindow.cpp TeamListItem.cpp - : input_server be libshared.a localestub $(TARGET_LIBSUPC++) ; + : input_server be libshared.a localestub [ TargetLibsupc++ ] ; DoCatalogs keyboard : x-vnd.Haiku-KeyboardInputServerDevice diff --git a/src/add-ons/input_server/devices/mouse/Jamfile b/src/add-ons/input_server/devices/mouse/Jamfile index a174911e78..b4eebaee60 100644 --- a/src/add-ons/input_server/devices/mouse/Jamfile +++ b/src/add-ons/input_server/devices/mouse/Jamfile @@ -6,4 +6,4 @@ UsePrivateHeaders input shared ; Addon mouse : MouseInputDevice.cpp - : be input_server $(TARGET_LIBSUPC++) ; + : be input_server [ TargetLibsupc++ ] ; diff --git a/src/add-ons/input_server/devices/tablet/Jamfile b/src/add-ons/input_server/devices/tablet/Jamfile index be5cd131f9..4b402efabe 100644 --- a/src/add-ons/input_server/devices/tablet/Jamfile +++ b/src/add-ons/input_server/devices/tablet/Jamfile @@ -6,4 +6,4 @@ UsePrivateHeaders input ; Addon tablet : TabletInputDevice.cpp - : be input_server $(TARGET_LIBSUPC++) ; + : be input_server [ TargetLibsupc++ ] ; diff --git a/src/add-ons/input_server/devices/wacom/Jamfile b/src/add-ons/input_server/devices/wacom/Jamfile index ce9c39f09c..90046679b2 100644 --- a/src/add-ons/input_server/devices/wacom/Jamfile +++ b/src/add-ons/input_server/devices/wacom/Jamfile @@ -10,4 +10,4 @@ Addon wacom : PointingDevice.cpp PointingDeviceFactory.cpp TabletDevice.cpp - : be input_server $(TARGET_LIBSUPC++) ; + : be input_server [ TargetLibsupc++ ] ; diff --git a/src/add-ons/input_server/filters/screen_saver/Jamfile b/src/add-ons/input_server/filters/screen_saver/Jamfile index bc3146124e..08a8a7492d 100644 --- a/src/add-ons/input_server/filters/screen_saver/Jamfile +++ b/src/add-ons/input_server/filters/screen_saver/Jamfile @@ -6,4 +6,4 @@ UsePrivateHeaders screen_saver ; Addon screen_saver : ScreenSaverFilter.cpp - : be libscreensaver.so input_server $(TARGET_LIBSUPC++) ; + : be libscreensaver.so input_server [ TargetLibsupc++ ] ; diff --git a/src/add-ons/input_server/filters/shortcut_catcher/Jamfile b/src/add-ons/input_server/filters/shortcut_catcher/Jamfile index 53aa742deb..3a213a5444 100644 --- a/src/add-ons/input_server/filters/shortcut_catcher/Jamfile +++ b/src/add-ons/input_server/filters/shortcut_catcher/Jamfile @@ -23,4 +23,4 @@ Addon shortcut_catcher : CommandExecutor.cpp KeyCommandMap.cpp ShortcutsServerFilter.cpp - : be game input_server libshortcuts_shared.a $(TARGET_LIBSUPC++) ; + : be game input_server libshortcuts_shared.a [ TargetLibsupc++ ] ; diff --git a/src/add-ons/input_server/filters/vmware_mouse/Jamfile b/src/add-ons/input_server/filters/vmware_mouse/Jamfile index 3644d46ab4..5e02ffce13 100644 --- a/src/add-ons/input_server/filters/vmware_mouse/Jamfile +++ b/src/add-ons/input_server/filters/vmware_mouse/Jamfile @@ -2,4 +2,4 @@ SubDir HAIKU_TOP src add-ons input_server filters vmware_mouse ; SetSubDirSupportedPlatformsBeOSCompatible ; -Addon vmware_mouse : VMWareMouse.cpp : be input_server $(TARGET_LIBSUPC++) ; +Addon vmware_mouse : VMWareMouse.cpp : be input_server [ TargetLibsupc++ ] ; diff --git a/src/add-ons/input_server/methods/canna/Jamfile b/src/add-ons/input_server/methods/canna/Jamfile index 59c70508b6..90e48671ee 100644 --- a/src/add-ons/input_server/methods/canna/Jamfile +++ b/src/add-ons/input_server/methods/canna/Jamfile @@ -17,7 +17,7 @@ Addon canna : CannaMethod.cpp KouhoWindow.cpp PaletteWindow.cpp - : be textencoding input_server libcanna.a librk.a $(TARGET_LIBSUPC++) ; + : be textencoding input_server libcanna.a librk.a [ TargetLibsupc++ ] ; SubInclude HAIKU_TOP src add-ons input_server methods canna lib ; SubInclude HAIKU_TOP src add-ons input_server methods canna rk ; diff --git a/src/add-ons/kernel/busses/virtio/Jamfile b/src/add-ons/kernel/busses/virtio/Jamfile index f37c1e911b..650b1fe414 100644 --- a/src/add-ons/kernel/busses/virtio/Jamfile +++ b/src/add-ons/kernel/busses/virtio/Jamfile @@ -6,6 +6,4 @@ UsePrivateHeaders kernel virtio ; KernelAddon virtio_pci : virtio_pci.cpp - - : $(TARGET_KERNEL_LIBSUPC++) ; diff --git a/src/add-ons/kernel/file_systems/bindfs/Jamfile b/src/add-ons/kernel/file_systems/bindfs/Jamfile index 351bf9dbef..99d5eef732 100644 --- a/src/add-ons/kernel/file_systems/bindfs/Jamfile +++ b/src/add-ons/kernel/file_systems/bindfs/Jamfile @@ -16,7 +16,6 @@ HAIKU_BIND_FS_SOURCES = KernelAddon bindfs : $(HAIKU_BIND_FS_SOURCES) - : $(TARGET_KERNEL_LIBSUPC++) ; diff --git a/src/add-ons/kernel/file_systems/netfs/authentication_server/Jamfile b/src/add-ons/kernel/file_systems/netfs/authentication_server/Jamfile index 0617324a63..1399974491 100644 --- a/src/add-ons/kernel/file_systems/netfs/authentication_server/Jamfile +++ b/src/add-ons/kernel/file_systems/netfs/authentication_server/Jamfile @@ -20,6 +20,6 @@ Application authentication_server AuthenticationPanel.cpp AuthenticationServer.cpp Panel.cpp - : be $(TARGET_LIBSUPC++) libshared.a + : be [ TargetLibsupc++ ] libshared.a : authentication_server.rdef ; diff --git a/src/add-ons/kernel/file_systems/netfs/client/Jamfile b/src/add-ons/kernel/file_systems/netfs/client/Jamfile index 7d20e9e58b..2d97577abe 100644 --- a/src/add-ons/kernel/file_systems/netfs/client/Jamfile +++ b/src/add-ons/kernel/file_systems/netfs/client/Jamfile @@ -88,5 +88,5 @@ Addon netfs VolumeManager.cpp : be libuserlandfs_beos_kernel.so - $(TARGET_NETWORK_LIBS) $(TARGET_LIBSUPC++) libshared.a + $(TARGET_NETWORK_LIBS) [ TargetLibsupc++ ] libshared.a ; diff --git a/src/add-ons/kernel/file_systems/netfs/server/Jamfile b/src/add-ons/kernel/file_systems/netfs/server/Jamfile index 8251f843d4..6c9ca6d6f2 100644 --- a/src/add-ons/kernel/file_systems/netfs/server/Jamfile +++ b/src/add-ons/kernel/file_systems/netfs/server/Jamfile @@ -84,7 +84,7 @@ Application netfs_server Volume.cpp VolumeManager.cpp : - be $(TARGET_NETWORK_LIBS) $(TARGET_LIBSUPC++) libshared.a + be $(TARGET_NETWORK_LIBS) [ TargetLibsupc++ ] libshared.a : netfs_server.rdef ; diff --git a/src/add-ons/kernel/file_systems/nfs4/idmapper/Jamfile b/src/add-ons/kernel/file_systems/nfs4/idmapper/Jamfile index f9f4bb2f20..67d249151c 100644 --- a/src/add-ons/kernel/file_systems/nfs4/idmapper/Jamfile +++ b/src/add-ons/kernel/file_systems/nfs4/idmapper/Jamfile @@ -6,7 +6,7 @@ Application nfs4_idmapper_server : be - $(TARGET_LIBSUPC++) + [ TargetLibsupc++ ] : nfs4_idmapper_server.rdef diff --git a/src/add-ons/kernel/file_systems/packagefs/Jamfile b/src/add-ons/kernel/file_systems/packagefs/Jamfile index 9766a8a193..be1f260527 100644 --- a/src/add-ons/kernel/file_systems/packagefs/Jamfile +++ b/src/add-ons/kernel/file_systems/packagefs/Jamfile @@ -6,7 +6,7 @@ UsePrivateKernelHeaders ; UsePrivateHeaders package shared storage support ; -local subDirs = +local subDirs = indices nodes package @@ -129,7 +129,7 @@ KernelAddon packagefs $(storageKitSources) $(supportKitSources) - : $(TARGET_KERNEL_LIBSUPC++) kernel_libz.a + : kernel_libz.a ; diff --git a/src/add-ons/kernel/file_systems/ramfs/Jamfile b/src/add-ons/kernel/file_systems/ramfs/Jamfile index 5e02b489d9..33bc97b911 100644 --- a/src/add-ons/kernel/file_systems/ramfs/Jamfile +++ b/src/add-ons/kernel/file_systems/ramfs/Jamfile @@ -44,6 +44,4 @@ KernelAddon ramfs SizeIndex.cpp SymLink.cpp Volume.cpp - - : $(TARGET_KERNEL_LIBSUPC++) ; diff --git a/src/add-ons/kernel/file_systems/reiserfs/Jamfile b/src/add-ons/kernel/file_systems/reiserfs/Jamfile index 90bb57effb..367f00de5c 100644 --- a/src/add-ons/kernel/file_systems/reiserfs/Jamfile +++ b/src/add-ons/kernel/file_systems/reiserfs/Jamfile @@ -27,6 +27,4 @@ KernelAddon reiserfs Tree.cpp VNode.cpp Volume.cpp - - : $(TARGET_KERNEL_LIBSUPC++) ; diff --git a/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/Jamfile b/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/Jamfile index c44b4b8a07..cffdbab259 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/Jamfile +++ b/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/Jamfile @@ -40,6 +40,4 @@ KernelAddon userlandfs Settings.cpp UserlandFS.cpp Volume.cpp - - : $(TARGET_KERNEL_LIBSUPC++) ; diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/Jamfile b/src/add-ons/kernel/file_systems/userlandfs/server/Jamfile index a4011d7f7b..875756b453 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/Jamfile +++ b/src/add-ons/kernel/file_systems/userlandfs/server/Jamfile @@ -43,7 +43,7 @@ Application userlandfs_server : be - $(TARGET_LIBSUPC++) + [ TargetLibsupc++ ] : userlandfs_server.rdef ; diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/beos/Jamfile b/src/add-ons/kernel/file_systems/userlandfs/server/beos/Jamfile index 0d01508c58..37868b1f90 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/beos/Jamfile +++ b/src/add-ons/kernel/file_systems/userlandfs/server/beos/Jamfile @@ -27,5 +27,5 @@ SharedLibrary libuserlandfs_beos_kernel.so : userlandfs_server - $(TARGET_LIBSUPC++) + [ TargetLibsupc++ ] ; diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/fuse/Jamfile b/src/add-ons/kernel/file_systems/userlandfs/server/fuse/Jamfile index ad2ea40d62..61badfa7f1 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/fuse/Jamfile +++ b/src/add-ons/kernel/file_systems/userlandfs/server/fuse/Jamfile @@ -29,5 +29,5 @@ SharedLibrary libuserlandfs_fuse.so FUSEVolume.cpp : - userlandfs_server libshared.a be $(TARGET_LIBSUPC++) + userlandfs_server libshared.a be [ TargetLibsupc++ ] ; diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/Jamfile b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/Jamfile index 52c74ea45b..a0fd48ca7b 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/Jamfile +++ b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/Jamfile @@ -52,7 +52,7 @@ SharedLibrary libuserlandfs_haiku_kernel.so : userlandfs_server be # for BLocker only - $(TARGET_LIBSUPC++) + [ TargetLibsupc++ ] ; diff --git a/src/add-ons/locale/catalogs/plaintext/Jamfile b/src/add-ons/locale/catalogs/plaintext/Jamfile index 4bee8a1fc3..a9661dce46 100644 --- a/src/add-ons/locale/catalogs/plaintext/Jamfile +++ b/src/add-ons/locale/catalogs/plaintext/Jamfile @@ -5,5 +5,5 @@ UsePrivateHeaders locale shared ; Addon plaintext : Catalog.cpp - : be $(TARGET_LIBSTDC++) + : be [ TargetLibstdc++ ] ; diff --git a/src/add-ons/locale/collators/Jamfile b/src/add-ons/locale/collators/Jamfile index 0919466f94..b822689a05 100644 --- a/src/add-ons/locale/collators/Jamfile +++ b/src/add-ons/locale/collators/Jamfile @@ -12,11 +12,11 @@ Depends LocaleKitCollatorAddons Addon GermanDIN-2 : GermanDIN-2.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; Addon French : French.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; diff --git a/src/add-ons/mail_daemon/inbound_filters/match_header/Jamfile b/src/add-ons/mail_daemon/inbound_filters/match_header/Jamfile index 347ee33f3c..b4545fc454 100644 --- a/src/add-ons/mail_daemon/inbound_filters/match_header/Jamfile +++ b/src/add-ons/mail_daemon/inbound_filters/match_header/Jamfile @@ -13,7 +13,7 @@ Addon MatchHeader RuleFilter.cpp StringMatcher.cpp : - be libmail.so $(TARGET_LIBSUPC++) localestub + be libmail.so [ TargetLibsupc++ ] localestub ; DoCatalogs MatchHeader diff --git a/src/add-ons/mail_daemon/inbound_filters/notifier/Jamfile b/src/add-ons/mail_daemon/inbound_filters/notifier/Jamfile index 68f2349888..f407acab9c 100644 --- a/src/add-ons/mail_daemon/inbound_filters/notifier/Jamfile +++ b/src/add-ons/mail_daemon/inbound_filters/notifier/Jamfile @@ -11,7 +11,7 @@ Addon NewMailNotification : filter.cpp ConfigView.cpp : - be libmail.so localestub $(TARGET_LIBSUPC++) + be libmail.so localestub [ TargetLibsupc++ ] ; DoCatalogs NewMailNotification : diff --git a/src/add-ons/mail_daemon/inbound_filters/spam_filter/Jamfile b/src/add-ons/mail_daemon/inbound_filters/spam_filter/Jamfile index e471ac764d..6d503f580a 100644 --- a/src/add-ons/mail_daemon/inbound_filters/spam_filter/Jamfile +++ b/src/add-ons/mail_daemon/inbound_filters/spam_filter/Jamfile @@ -12,7 +12,7 @@ Addon SpamFilter : SpamFilterConfig.cpp SpamFilter.cpp : - be libmail.so localestub $(TARGET_LIBSUPC++) + be libmail.so localestub [ TargetLibsupc++ ] ; DoCatalogs SpamFilter diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile index eeef1308be..d89f9221d2 100644 --- a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile +++ b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile @@ -43,7 +43,7 @@ Addon IMAP $(sources) : be libmail.so localestub $(TARGET_NETWORK_LIBS) libalm.so - libshared.a $(TARGET_LIBSUPC++) $(TARGET_LIBSTDC++) + libshared.a [ TargetLibsupc++ ] [ TargetLibstdc++ ] ; SEARCH on [ FGristFiles IMAPFolders.cpp IMAPHandler.cpp IMAPMailbox.cpp diff --git a/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile b/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile index 130a4b7f7a..710b85fa6f 100644 --- a/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile +++ b/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile @@ -34,7 +34,7 @@ AddResources POP3 : POP3.rdef ; Addon POP3 : $(sources) : be libbnetapi.so libmail.so localestub - [ BuildFeatureAttribute openssl : libraries ] $(TARGET_LIBSUPC++) + [ BuildFeatureAttribute openssl : libraries ] [ TargetLibsupc++ ] $(TARGET_NETWORK_LIBS) ; diff --git a/src/add-ons/mail_daemon/outbound_filters/fortune/Jamfile b/src/add-ons/mail_daemon/outbound_filters/fortune/Jamfile index c672ec2857..d80d0b537c 100644 --- a/src/add-ons/mail_daemon/outbound_filters/fortune/Jamfile +++ b/src/add-ons/mail_daemon/outbound_filters/fortune/Jamfile @@ -12,7 +12,7 @@ Addon Fortune : ConfigView.cpp filter.cpp : - be libmail.so localestub $(TARGET_LIBSUPC++) + be libmail.so localestub [ TargetLibsupc++ ] ; DoCatalogs Fortune : diff --git a/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile b/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile index a1b9c26f3a..361c0771dd 100644 --- a/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile +++ b/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile @@ -29,7 +29,7 @@ AddResources SMTP : SMTP.rdef ; Addon SMTP : $(sources) - : be libmail.so $(TARGET_NETWORK_LIBS) $(TARGET_LIBSTDC++) + : be libmail.so $(TARGET_NETWORK_LIBS) [ TargetLibstdc++ ] localestub [ BuildFeatureAttribute openssl : libraries ] ; diff --git a/src/add-ons/media/media-add-ons/dvb/Jamfile b/src/add-ons/media/media-add-ons/dvb/Jamfile index 0ff7b39584..9986b45312 100644 --- a/src/add-ons/media/media-add-ons/dvb/Jamfile +++ b/src/add-ons/media/media-add-ons/dvb/Jamfile @@ -19,7 +19,7 @@ Addon dvb.media_addon : PacketQueue.cpp pes.cpp TransportStreamDemux.cpp - : be media $(TARGET_LIBSUPC++) + : be media [ TargetLibsupc++ ] ; Includes [ FGristFiles MediaFormat.cpp ] diff --git a/src/add-ons/media/media-add-ons/equalizer/Jamfile b/src/add-ons/media/media-add-ons/equalizer/Jamfile index b39a0544e5..77e402f75c 100644 --- a/src/add-ons/media/media-add-ons/equalizer/Jamfile +++ b/src/add-ons/media/media-add-ons/equalizer/Jamfile @@ -6,5 +6,5 @@ Addon equalizer.media_addon : Equalizer.cpp EqualizerAddOn.cpp EqualizerNode.cpp - : be media $(TARGET_LIBSTDC++) + : be media [ TargetLibstdc++ ] ; diff --git a/src/add-ons/media/media-add-ons/esound_sink/Jamfile b/src/add-ons/media/media-add-ons/esound_sink/Jamfile index 6e45d95d48..460f075346 100644 --- a/src/add-ons/media/media-add-ons/esound_sink/Jamfile +++ b/src/add-ons/media/media-add-ons/esound_sink/Jamfile @@ -10,6 +10,6 @@ Addon esound_sink.media_addon : ESDEndpoint.cpp ESDSinkAddOn.cpp ESDSinkNode.cpp - : be media network $(TARGET_LIBSUPC++) + : be media network [ TargetLibsupc++ ] ; diff --git a/src/add-ons/media/media-add-ons/firewire_dv/Jamfile b/src/add-ons/media/media-add-ons/firewire_dv/Jamfile index 7e472975b6..7c539b7963 100644 --- a/src/add-ons/media/media-add-ons/firewire_dv/Jamfile +++ b/src/add-ons/media/media-add-ons/firewire_dv/Jamfile @@ -10,5 +10,5 @@ Addon firewire_dv.media_addon : FireWireCard.cpp FireWireDVAddOn.cpp FireWireDVNode.cpp - : be media $(TARGET_LIBSUPC++) + : be media [ TargetLibsupc++ ] ; diff --git a/src/add-ons/media/media-add-ons/legacy/Jamfile b/src/add-ons/media/media-add-ons/legacy/Jamfile index 70e0134c71..695cf5ebe7 100644 --- a/src/add-ons/media/media-add-ons/legacy/Jamfile +++ b/src/add-ons/media/media-add-ons/legacy/Jamfile @@ -7,5 +7,5 @@ Addon legacy.media_addon : LegacyAudioDevice.cpp LegacyAudioProducer.cpp LegacyMediaAddOn.cpp - : be media $(TARGET_LIBSUPC++) + : be media [ TargetLibsupc++ ] ; diff --git a/src/add-ons/media/media-add-ons/mixer/Jamfile b/src/add-ons/media/media-add-ons/mixer/Jamfile index dee9631fd7..93bf949dd2 100644 --- a/src/add-ons/media/media-add-ons/mixer/Jamfile +++ b/src/add-ons/media/media-add-ons/mixer/Jamfile @@ -15,7 +15,7 @@ Addon mixer.media_addon : MixerSettings.cpp MixerUtils.cpp Resampler.cpp - : be media $(TARGET_LIBSUPC++) localestub + : be media [ TargetLibsupc++ ] localestub ; DoCatalogs mixer.media_addon diff --git a/src/add-ons/media/media-add-ons/multi_audio/Jamfile b/src/add-ons/media/media-add-ons/multi_audio/Jamfile index a04fa165a4..7ad040e9e6 100644 --- a/src/add-ons/media/media-add-ons/multi_audio/Jamfile +++ b/src/add-ons/media/media-add-ons/multi_audio/Jamfile @@ -17,7 +17,7 @@ Addon hmulti_audio.media_addon : MultiAudioUtility.cpp Resampler.cpp TimeComputer.cpp - : be media $(TARGET_LIBSUPC++) localestub + : be media [ TargetLibsupc++ ] localestub ; DoCatalogs hmulti_audio.media_addon diff --git a/src/add-ons/media/media-add-ons/opensound/Jamfile b/src/add-ons/media/media-add-ons/opensound/Jamfile index c813623516..9f522b3af5 100644 --- a/src/add-ons/media/media-add-ons/opensound/Jamfile +++ b/src/add-ons/media/media-add-ons/opensound/Jamfile @@ -14,5 +14,5 @@ Addon opensound.media_addon : OpenSoundDeviceEngine.cpp OpenSoundDeviceMixer.cpp OpenSoundNode.cpp - : be media $(TARGET_LIBSUPC++) + : be media [ TargetLibsupc++ ] ; diff --git a/src/add-ons/media/media-add-ons/reader/Jamfile b/src/add-ons/media/media-add-ons/reader/Jamfile index 3b9135d449..1353d52e8e 100644 --- a/src/add-ons/media/media-add-ons/reader/Jamfile +++ b/src/add-ons/media/media-add-ons/reader/Jamfile @@ -10,5 +10,5 @@ Application reader.media_addon : MediaReader.cpp MediaReaderAddOn.cpp misc.cpp - : be media $(TARGET_LIBSUPC++) + : be media [ TargetLibsupc++ ] ; diff --git a/src/add-ons/media/media-add-ons/tone_producer_demo/Jamfile b/src/add-ons/media/media-add-ons/tone_producer_demo/Jamfile index d181b11336..06f0af7bc1 100644 --- a/src/add-ons/media/media-add-ons/tone_producer_demo/Jamfile +++ b/src/add-ons/media/media-add-ons/tone_producer_demo/Jamfile @@ -3,5 +3,5 @@ SubDir HAIKU_TOP src add-ons media media-add-ons tone_producer_demo ; Addon tone_producer_demo.media_addon : ToneProducerAddOn.cpp ToneProducer.cpp - : be media $(TARGET_LIBSUPC++) + : be media [ TargetLibsupc++ ] ; diff --git a/src/add-ons/media/media-add-ons/usb_vision/Jamfile b/src/add-ons/media/media-add-ons/usb_vision/Jamfile index e5d2648af0..7266cfc054 100644 --- a/src/add-ons/media/media-add-ons/usb_vision/Jamfile +++ b/src/add-ons/media/media-add-ons/usb_vision/Jamfile @@ -8,5 +8,5 @@ Addon usb_vision.media_addon : AddOn.cpp Producer.cpp TunerLocale.cpp - : be media $(TARGET_LIBSTDC++) + : be media [ TargetLibstdc++ ] ; diff --git a/src/add-ons/media/media-add-ons/usb_webcam/Jamfile b/src/add-ons/media/media-add-ons/usb_webcam/Jamfile index c8f5e3f1a2..bcf04ff0aa 100644 --- a/src/add-ons/media/media-add-ons/usb_webcam/Jamfile +++ b/src/add-ons/media/media-add-ons/usb_webcam/Jamfile @@ -95,7 +95,7 @@ Addon usb_webcam.media_addon : CamRoster.cpp CamSensor.cpp CamStreamingDeframer.cpp - : be media $(usbKitLibraryName) $(TARGET_LIBSUPC++) + : be media $(usbKitLibraryName) [ TargetLibsupc++ ] ; # force dependancies diff --git a/src/add-ons/media/media-add-ons/video_producer_demo/Jamfile b/src/add-ons/media/media-add-ons/video_producer_demo/Jamfile index 8dcd49bc84..a9da1b2843 100644 --- a/src/add-ons/media/media-add-ons/video_producer_demo/Jamfile +++ b/src/add-ons/media/media-add-ons/video_producer_demo/Jamfile @@ -3,5 +3,5 @@ SubDir HAIKU_TOP src add-ons media media-add-ons video_producer_demo ; Addon video_producer_demo.media_addon : AddOn.cpp Producer.cpp - : be media $(TARGET_LIBSUPC++) + : be media [ TargetLibsupc++ ] ; diff --git a/src/add-ons/media/media-add-ons/videowindow/Jamfile b/src/add-ons/media/media-add-ons/videowindow/Jamfile index b86ac006c7..16303fe535 100644 --- a/src/add-ons/media/media-add-ons/videowindow/Jamfile +++ b/src/add-ons/media/media-add-ons/videowindow/Jamfile @@ -5,5 +5,5 @@ Addon video_window_demo.media_addon : VideoNode.cpp VideoView.cpp VideoWindow.cpp - : be media $(TARGET_LIBSUPC++) + : be media [ TargetLibsupc++ ] ; diff --git a/src/add-ons/media/media-add-ons/vst_host/Jamfile b/src/add-ons/media/media-add-ons/vst_host/Jamfile index 803ea062ed..e852a39ddb 100644 --- a/src/add-ons/media/media-add-ons/vst_host/Jamfile +++ b/src/add-ons/media/media-add-ons/vst_host/Jamfile @@ -6,5 +6,5 @@ Addon vst_host.media_addon : VSTHost.cpp VSTAddOn.cpp VSTNode.cpp - : be media $(TARGET_LIBSTDC++) + : be media [ TargetLibstdc++ ] ; diff --git a/src/add-ons/media/plugins/ac3_decoder/Jamfile b/src/add-ons/media/plugins/ac3_decoder/Jamfile index 989c32e53d..3177573e0a 100644 --- a/src/add-ons/media/plugins/ac3_decoder/Jamfile +++ b/src/add-ons/media/plugins/ac3_decoder/Jamfile @@ -4,7 +4,7 @@ UsePrivateHeaders media ; Addon ac3_decoder : ac3_decoder.cpp - : liba52.a be libmedia.so $(TARGET_LIBSUPC++) + : liba52.a be libmedia.so [ TargetLibsupc++ ] ; SubIncludeGPL HAIKU_TOP src add-ons media plugins ac3_decoder liba52 ; diff --git a/src/add-ons/media/plugins/aiff_reader/Jamfile b/src/add-ons/media/plugins/aiff_reader/Jamfile index 55139da416..ac1775299d 100644 --- a/src/add-ons/media/plugins/aiff_reader/Jamfile +++ b/src/add-ons/media/plugins/aiff_reader/Jamfile @@ -6,4 +6,4 @@ UsePrivateHeaders media ; Addon aiff_reader : aiff_reader.cpp - : be libmedia.so $(TARGET_LIBSUPC++) ; + : be libmedia.so [ TargetLibsupc++ ] ; diff --git a/src/add-ons/media/plugins/ape_reader/Jamfile b/src/add-ons/media/plugins/ape_reader/Jamfile index 0f705724a0..0f9c9bbc3b 100644 --- a/src/add-ons/media/plugins/ape_reader/Jamfile +++ b/src/add-ons/media/plugins/ape_reader/Jamfile @@ -9,7 +9,7 @@ SubDirHdrs [ FDirName $(SUBDIR) MAClib ] ; Addon ape_reader : APEReader.cpp - : libMonkeysAudio.a MAClib.a be libmedia.so $(TARGET_LIBSUPC++) + : libMonkeysAudio.a MAClib.a be libmedia.so [ TargetLibsupc++ ] ; SubInclude HAIKU_TOP src add-ons media plugins ape_reader LibMonkeysAudio ; diff --git a/src/add-ons/media/plugins/asf_reader/Jamfile b/src/add-ons/media/plugins/asf_reader/Jamfile index 2b19a7366a..a73e83f350 100644 --- a/src/add-ons/media/plugins/asf_reader/Jamfile +++ b/src/add-ons/media/plugins/asf_reader/Jamfile @@ -12,7 +12,7 @@ Addon asf_reader : ASFIndex.cpp : libasfreader.a - be libmedia.so $(TARGET_LIBSTDC++) + be libmedia.so [ TargetLibstdc++ ] ; SubInclude HAIKU_TOP src add-ons media plugins asf_reader libasf ; diff --git a/src/add-ons/media/plugins/au_reader/Jamfile b/src/add-ons/media/plugins/au_reader/Jamfile index a5404f0862..a0c0971684 100644 --- a/src/add-ons/media/plugins/au_reader/Jamfile +++ b/src/add-ons/media/plugins/au_reader/Jamfile @@ -6,5 +6,5 @@ UsePrivateHeaders media ; Addon au_reader : au_reader.cpp - : be libmedia.so $(TARGET_LIBSUPC++) + : be libmedia.so [ TargetLibsupc++ ] ; diff --git a/src/add-ons/media/plugins/avi_reader/Jamfile b/src/add-ons/media/plugins/avi_reader/Jamfile index a84971e92c..e376043099 100644 --- a/src/add-ons/media/plugins/avi_reader/Jamfile +++ b/src/add-ons/media/plugins/avi_reader/Jamfile @@ -10,7 +10,7 @@ Addon avi_reader : avi_reader.cpp : libopendml.a - be libmedia.so $(TARGET_LIBSTDC++) + be libmedia.so [ TargetLibstdc++ ] ; SubInclude HAIKU_TOP src add-ons media plugins avi_reader libOpenDML ; diff --git a/src/add-ons/media/plugins/ffmpeg/Jamfile b/src/add-ons/media/plugins/ffmpeg/Jamfile index c328056e84..c3efdd0bcf 100644 --- a/src/add-ons/media/plugins/ffmpeg/Jamfile +++ b/src/add-ons/media/plugins/ffmpeg/Jamfile @@ -57,7 +57,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { be media - $(TARGET_LIBSUPC++) + [ TargetLibsupc++ ] ; } } diff --git a/src/add-ons/media/plugins/matroska/Jamfile b/src/add-ons/media/plugins/matroska/Jamfile index ed2cb69528..68bee23246 100644 --- a/src/add-ons/media/plugins/matroska/Jamfile +++ b/src/add-ons/media/plugins/matroska/Jamfile @@ -17,7 +17,7 @@ Addon matroska : # libmatroska.a libMatroskaParser.a [ BuildFeatureAttribute zlib : library ] - libmedia.so be $(TARGET_LIBSTDC++) + libmedia.so be [ TargetLibstdc++ ] ; # SubInclude HAIKU_TOP src add-ons media plugins matroska libebml ; diff --git a/src/add-ons/media/plugins/mov_reader/Jamfile b/src/add-ons/media/plugins/mov_reader/Jamfile index 16db530855..7566d44765 100644 --- a/src/add-ons/media/plugins/mov_reader/Jamfile +++ b/src/add-ons/media/plugins/mov_reader/Jamfile @@ -11,7 +11,7 @@ Addon mov_reader : : libmovreader.a [ BuildFeatureAttribute zlib : library ] - be libmedia.so $(TARGET_LIBSTDC++) + be libmedia.so [ TargetLibstdc++ ] ; SubInclude HAIKU_TOP src add-ons media plugins mov_reader libMOV ; diff --git a/src/add-ons/media/plugins/mp4_reader/Jamfile b/src/add-ons/media/plugins/mp4_reader/Jamfile index e1af968d98..99915e6d35 100644 --- a/src/add-ons/media/plugins/mp4_reader/Jamfile +++ b/src/add-ons/media/plugins/mp4_reader/Jamfile @@ -11,7 +11,7 @@ Addon mp4_reader : : libmp4reader.a [ BuildFeatureAttribute zlib : library ] - be libmedia.so $(TARGET_LIBSTDC++) + be libmedia.so [ TargetLibstdc++ ] ; SubInclude HAIKU_TOP src add-ons media plugins mp4_reader libMP4 ; diff --git a/src/add-ons/media/plugins/musepack/Jamfile b/src/add-ons/media/plugins/musepack/Jamfile index e5e0bc609c..058c359451 100644 --- a/src/add-ons/media/plugins/musepack/Jamfile +++ b/src/add-ons/media/plugins/musepack/Jamfile @@ -10,7 +10,7 @@ Addon musepack : MusePack.cpp MusePackReader.cpp MusePackDecoder.cpp - : libmusepack.a be libmedia.so $(TARGET_LIBSUPC++) + : libmusepack.a be libmedia.so [ TargetLibsupc++ ] ; SubInclude HAIKU_TOP src add-ons media plugins musepack mpc ; diff --git a/src/add-ons/media/plugins/raw_decoder/Jamfile b/src/add-ons/media/plugins/raw_decoder/Jamfile index 687e790ba9..c67c61c6c7 100644 --- a/src/add-ons/media/plugins/raw_decoder/Jamfile +++ b/src/add-ons/media/plugins/raw_decoder/Jamfile @@ -10,7 +10,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { Addon [ MultiArchDefaultGristFiles raw_decoder ] : AudioConversion.cpp RawDecoderPlugin.cpp - : be media $(TARGET_LIBSUPC++) + : be media [ TargetLibsupc++ ] ; } } diff --git a/src/add-ons/media/plugins/wav_reader/Jamfile b/src/add-ons/media/plugins/wav_reader/Jamfile index f56f20e565..66c2594382 100644 --- a/src/add-ons/media/plugins/wav_reader/Jamfile +++ b/src/add-ons/media/plugins/wav_reader/Jamfile @@ -6,5 +6,5 @@ UsePrivateHeaders media ; Addon wav_reader : WavReaderPlugin.cpp - : be libmedia.so $(TARGET_LIBSUPC++) + : be libmedia.so [ TargetLibsupc++ ] ; diff --git a/src/add-ons/print/drivers/canon_lips/lips3/Jamfile b/src/add-ons/print/drivers/canon_lips/lips3/Jamfile index 6d205670ee..20e3380595 100644 --- a/src/add-ons/print/drivers/canon_lips/lips3/Jamfile +++ b/src/add-ons/print/drivers/canon_lips/lips3/Jamfile @@ -11,5 +11,5 @@ Addon Canon\ LIPS3\ Compatible : Lips3.cpp Lips3Cap.cpp Compress3.cpp - : be libprint.a $(TARGET_LIBSTDC++) + : be libprint.a [ TargetLibstdc++ ] ; diff --git a/src/add-ons/print/drivers/canon_lips/lips4/Jamfile b/src/add-ons/print/drivers/canon_lips/lips4/Jamfile index 0951bae6cf..2a5c2822e0 100644 --- a/src/add-ons/print/drivers/canon_lips/lips4/Jamfile +++ b/src/add-ons/print/drivers/canon_lips/lips4/Jamfile @@ -10,5 +10,5 @@ Addon Canon\ LIPS4\ Compatible : Lips4Entry.cpp Lips4.cpp Lips4Cap.cpp - : be libprint.a $(TARGET_LIBSTDC++) + : be libprint.a [ TargetLibstdc++ ] ; diff --git a/src/add-ons/print/drivers/gutenprint/Jamfile b/src/add-ons/print/drivers/gutenprint/Jamfile index 6133abb033..101e5eaaca 100644 --- a/src/add-ons/print/drivers/gutenprint/Jamfile +++ b/src/add-ons/print/drivers/gutenprint/Jamfile @@ -27,5 +27,5 @@ Addon Gutenprint : be [ BuildFeatureAttribute gutenprint : library ] libprint.a - $(TARGET_LIBSTDC++) + [ TargetLibstdc++ ] ; diff --git a/src/add-ons/print/drivers/pcl5/Jamfile b/src/add-ons/print/drivers/pcl5/Jamfile index ca1b856c08..67809d26f1 100644 --- a/src/add-ons/print/drivers/pcl5/Jamfile +++ b/src/add-ons/print/drivers/pcl5/Jamfile @@ -10,5 +10,5 @@ Addon PCL5\ Compatible : PCL5Entry.cpp PCL5.cpp PCL5Cap.cpp - : be libprint.a $(TARGET_LIBSTDC++) + : be libprint.a [ TargetLibstdc++ ] ; diff --git a/src/add-ons/print/drivers/pcl6/Jamfile b/src/add-ons/print/drivers/pcl6/Jamfile index 2a74195a3a..d1c6349318 100644 --- a/src/add-ons/print/drivers/pcl6/Jamfile +++ b/src/add-ons/print/drivers/pcl6/Jamfile @@ -14,5 +14,5 @@ Addon PCL6\ Compatible : PCL6Rasterizer.cpp PCL6Writer.cpp Rasterizer.cpp - : be libprint.a $(TARGET_LIBSTDC++) + : be libprint.a [ TargetLibstdc++ ] ; diff --git a/src/add-ons/print/drivers/pdf/source/Jamfile b/src/add-ons/print/drivers/pdf/source/Jamfile index 635a9d7e5b..1478a1b598 100644 --- a/src/add-ons/print/drivers/pdf/source/Jamfile +++ b/src/add-ons/print/drivers/pdf/source/Jamfile @@ -48,5 +48,5 @@ Addon PDF\ Writer : libpdf.a libprint.a libprintutils.a - $(TARGET_LIBSUPC++) + [ TargetLibsupc++ ] ; diff --git a/src/add-ons/print/drivers/postscript/Jamfile b/src/add-ons/print/drivers/postscript/Jamfile index 5f8e07c484..14ea81104b 100644 --- a/src/add-ons/print/drivers/postscript/Jamfile +++ b/src/add-ons/print/drivers/postscript/Jamfile @@ -14,5 +14,5 @@ Addon PS\ Compatible : SelectPPDDlg.cpp PPDParser.cpp FilterIO.cpp - : be libprint.a $(TARGET_LIBSTDC++) + : be libprint.a [ TargetLibstdc++ ] ; diff --git a/src/add-ons/print/drivers/preview/Jamfile b/src/add-ons/print/drivers/preview/Jamfile index 908b21d7db..2212c04160 100644 --- a/src/add-ons/print/drivers/preview/Jamfile +++ b/src/add-ons/print/drivers/preview/Jamfile @@ -12,5 +12,5 @@ Addon Preview : Driver.cpp PrinterDriver.cpp PreviewDriver.cpp - : be libprint.a $(TARGET_LIBSTDC++) + : be libprint.a [ TargetLibstdc++ ] ; diff --git a/src/add-ons/print/transports/hp_jetdirect/Jamfile b/src/add-ons/print/transports/hp_jetdirect/Jamfile index ba312b14e5..796b1b9303 100644 --- a/src/add-ons/print/transports/hp_jetdirect/Jamfile +++ b/src/add-ons/print/transports/hp_jetdirect/Jamfile @@ -8,5 +8,5 @@ Addon HP\ JetDirect : print_transport.cpp HPJetDirectTransport.cpp SetupWindow.cpp - : be $(TARGET_NETWORK_LIBS) $(TARGET_NETAPI_LIB) $(TARGET_LIBSUPC++) + : be $(TARGET_NETWORK_LIBS) $(TARGET_NETAPI_LIB) [ TargetLibsupc++ ] ; diff --git a/src/add-ons/print/transports/ipp/Jamfile b/src/add-ons/print/transports/ipp/Jamfile index 435000ee1a..a9013ea6a6 100644 --- a/src/add-ons/print/transports/ipp/Jamfile +++ b/src/add-ons/print/transports/ipp/Jamfile @@ -17,7 +17,7 @@ Addon IPP : Socket.o SocketStream.o DbgMsg.o - : libshared.a be $(TARGET_NETAPI_LIB) $(TARGET_NETWORK_LIBS) $(TARGET_LIBSTDC++) + : libshared.a be $(TARGET_NETAPI_LIB) $(TARGET_NETWORK_LIBS) [ TargetLibstdc++ ] ; ObjectReferences diff --git a/src/add-ons/print/transports/lpr/Jamfile b/src/add-ons/print/transports/lpr/Jamfile index dcea7caf1c..02dd898726 100644 --- a/src/add-ons/print/transports/lpr/Jamfile +++ b/src/add-ons/print/transports/lpr/Jamfile @@ -18,7 +18,7 @@ Addon LPR : be libprint.a $(TARGET_NETWORK_LIBS) - $(TARGET_LIBSTDC++) + [ TargetLibstdc++ ] ; ObjectReferences diff --git a/src/add-ons/print/transports/parallel_port/Jamfile b/src/add-ons/print/transports/parallel_port/Jamfile index 6834d920da..8605041645 100644 --- a/src/add-ons/print/transports/parallel_port/Jamfile +++ b/src/add-ons/print/transports/parallel_port/Jamfile @@ -9,5 +9,5 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits print ] ; Addon Parallel\ Port : ParallelTransport.cpp PrintTransportAddOn.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; diff --git a/src/add-ons/print/transports/print_to_file/Jamfile b/src/add-ons/print/transports/print_to_file/Jamfile index 22f6195661..a1e4d40eee 100644 --- a/src/add-ons/print/transports/print_to_file/Jamfile +++ b/src/add-ons/print/transports/print_to_file/Jamfile @@ -8,5 +8,5 @@ SetSubDirSupportedPlatformsBeOSCompatible ; Addon Print\ To\ File : print_transport.cpp FileSelector.cpp - : be tracker $(TARGET_LIBSUPC++) + : be tracker [ TargetLibsupc++ ] ; diff --git a/src/add-ons/print/transports/serial_port/Jamfile b/src/add-ons/print/transports/serial_port/Jamfile index 287763f42d..cddfe3fd7b 100644 --- a/src/add-ons/print/transports/serial_port/Jamfile +++ b/src/add-ons/print/transports/serial_port/Jamfile @@ -9,5 +9,5 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits print ] ; Addon Serial\ Port : SerialTransport.cpp PrintTransportAddOn.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; diff --git a/src/add-ons/print/transports/usb_port/Jamfile b/src/add-ons/print/transports/usb_port/Jamfile index 67845732fd..30008f61e5 100644 --- a/src/add-ons/print/transports/usb_port/Jamfile +++ b/src/add-ons/print/transports/usb_port/Jamfile @@ -9,5 +9,5 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits print ] ; Addon USB\ Port : USBTransport.cpp PrintTransportAddOn.cpp - : libshared.a libdevice.so be $(TARGET_LIBSUPC++) + : libshared.a libdevice.so be [ TargetLibsupc++ ] ; diff --git a/src/add-ons/screen_savers/butterfly/Jamfile b/src/add-ons/screen_savers/butterfly/Jamfile index ef1ea4d569..260f3628df 100644 --- a/src/add-ons/screen_savers/butterfly/Jamfile +++ b/src/add-ons/screen_savers/butterfly/Jamfile @@ -7,7 +7,7 @@ AddResources Butterfly : Butterfly.rdef ; ScreenSaver Butterfly : Butterfly.cpp - : be screensaver localestub $(TARGET_LIBSUPC++) + : be screensaver localestub [ TargetLibsupc++ ] ; DoCatalogs Butterfly : diff --git a/src/add-ons/screen_savers/debugnow/Jamfile b/src/add-ons/screen_savers/debugnow/Jamfile index 0ed9f51437..2df4d61bc9 100644 --- a/src/add-ons/screen_savers/debugnow/Jamfile +++ b/src/add-ons/screen_savers/debugnow/Jamfile @@ -9,7 +9,7 @@ AddResources DebugNow : DebugNow.rdef ; ScreenSaver DebugNow : DebugNow.cpp : - be libscreensaver.so localestub $(TARGET_LIBSUPC++) + be libscreensaver.so localestub [ TargetLibsupc++ ] ; DoCatalogs DebugNow : diff --git a/src/add-ons/screen_savers/flurry/Jamfile b/src/add-ons/screen_savers/flurry/Jamfile index d491c5f019..38456681a5 100644 --- a/src/add-ons/screen_savers/flurry/Jamfile +++ b/src/add-ons/screen_savers/flurry/Jamfile @@ -21,7 +21,7 @@ Includes [ FGristFiles $(sources) ] : ScreenSaver Flurry : $(sources) : - be screensaver localestub $(TARGET_LIBSUPC++) + be screensaver localestub [ TargetLibsupc++ ] [ BuildFeatureAttribute glu : library ] [ BuildFeatureAttribute mesa : library ] ; diff --git a/src/add-ons/screen_savers/glife/Jamfile b/src/add-ons/screen_savers/glife/Jamfile index 06cfdf15bd..fe5e5e309d 100644 --- a/src/add-ons/screen_savers/glife/Jamfile +++ b/src/add-ons/screen_savers/glife/Jamfile @@ -25,7 +25,7 @@ AddResources GLife : GLife.rdef ; ScreenSaver GLife : $(sources) : - be screensaver localestub $(TARGET_LIBSUPC++) + be screensaver localestub [ TargetLibsupc++ ] [ BuildFeatureAttribute glu : library ] [ BuildFeatureAttribute mesa : library ] ; diff --git a/src/add-ons/screen_savers/gravity/Jamfile b/src/add-ons/screen_savers/gravity/Jamfile index 14de4b94c8..091425e0d8 100644 --- a/src/add-ons/screen_savers/gravity/Jamfile +++ b/src/add-ons/screen_savers/gravity/Jamfile @@ -28,7 +28,7 @@ Includes [ FGristFiles $(sources) ] : ScreenSaver Gravity : $(sources) : - be screensaver localestub $(TARGET_LIBSTDC++) + be screensaver localestub [ TargetLibstdc++ ] [ BuildFeatureAttribute glu : library ] [ BuildFeatureAttribute mesa : library ] ; diff --git a/src/add-ons/screen_savers/haiku/Jamfile b/src/add-ons/screen_savers/haiku/Jamfile index 3ee172e0bb..71c680eb7a 100644 --- a/src/add-ons/screen_savers/haiku/Jamfile +++ b/src/add-ons/screen_savers/haiku/Jamfile @@ -9,7 +9,7 @@ AddResources Haiku : ScreenSaver.rdef ; Addon Haiku : ScreenSaver.cpp - : be screensaver localestub $(TARGET_LIBSUPC++) + : be screensaver localestub [ TargetLibsupc++ ] ; DoCatalogs Haiku : diff --git a/src/add-ons/screen_savers/icons/Jamfile b/src/add-ons/screen_savers/icons/Jamfile index 887ce9790d..a916022b72 100644 --- a/src/add-ons/screen_savers/icons/Jamfile +++ b/src/add-ons/screen_savers/icons/Jamfile @@ -7,7 +7,7 @@ AddResources Icons : Icons.rdef ; ScreenSaver Icons : IconDisplay.cpp IconsSaver.cpp : - be libscreensaver.so localestub $(TARGET_LIBSUPC++) + be libscreensaver.so localestub [ TargetLibsupc++ ] ; DoCatalogs Icons : diff --git a/src/add-ons/screen_savers/ifs/Jamfile b/src/add-ons/screen_savers/ifs/Jamfile index 72a6816d10..d2a034d5ae 100644 --- a/src/add-ons/screen_savers/ifs/Jamfile +++ b/src/add-ons/screen_savers/ifs/Jamfile @@ -8,7 +8,7 @@ ScreenSaver IFS : IFS.cpp IFSSaver.cpp - : be libscreensaver.so localestub $(TARGET_LIBSUPC++) + : be libscreensaver.so localestub [ TargetLibsupc++ ] ; DoCatalogs IFS : diff --git a/src/add-ons/screen_savers/leaves/Jamfile b/src/add-ons/screen_savers/leaves/Jamfile index 3ce6e228fd..7ec991ef16 100644 --- a/src/add-ons/screen_savers/leaves/Jamfile +++ b/src/add-ons/screen_savers/leaves/Jamfile @@ -4,7 +4,7 @@ AddResources Leaves : Leaves.rdef ; ScreenSaver Leaves : Leaves.cpp : - be screensaver $(TARGET_LIBSUPC++) localestub + be screensaver [ TargetLibsupc++ ] localestub ; DoCatalogs Leaves : diff --git a/src/add-ons/screen_savers/message/Jamfile b/src/add-ons/screen_savers/message/Jamfile index c97a6895ae..595531a653 100644 --- a/src/add-ons/screen_savers/message/Jamfile +++ b/src/add-ons/screen_savers/message/Jamfile @@ -11,7 +11,7 @@ AddResources Message : Message.rdef ; ScreenSaver Message : Message.cpp : - be libscreensaver.so localestub $(TARGET_LIBSUPC++) ; + be libscreensaver.so localestub [ TargetLibsupc++ ] ; DoCatalogs Message : x-vnd.Haiku-MessageScreensaver diff --git a/src/add-ons/screen_savers/simpleclock/Jamfile b/src/add-ons/screen_savers/simpleclock/Jamfile index 63bf2220c2..71254909d6 100644 --- a/src/add-ons/screen_savers/simpleclock/Jamfile +++ b/src/add-ons/screen_savers/simpleclock/Jamfile @@ -7,7 +7,7 @@ AddResources Message : SimpleClock.rdef ; ScreenSaver SimpleClock : SimpleClock.cpp - : be libscreensaver.so localestub $(TARGET_LIBSUPC++) + : be libscreensaver.so localestub [ TargetLibsupc++ ] ; DoCatalogs SimpleClock : diff --git a/src/add-ons/screen_savers/slideshowsaver/Jamfile b/src/add-ons/screen_savers/slideshowsaver/Jamfile index 7f3ba6da10..57b953b753 100644 --- a/src/add-ons/screen_savers/slideshowsaver/Jamfile +++ b/src/add-ons/screen_savers/slideshowsaver/Jamfile @@ -13,7 +13,7 @@ ScreenSaver SlideShowSaver : SlideShowSaver.cpp SlideShowConfigView.cpp : - be screensaver $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++) tracker translation + be screensaver [ TargetLibstdc++ ] [ TargetLibsupc++ ] tracker translation ; DoCatalogs SlideShowSaver : diff --git a/src/add-ons/screen_savers/spider/Jamfile b/src/add-ons/screen_savers/spider/Jamfile index 6c27fb1e1f..7ff272979c 100644 --- a/src/add-ons/screen_savers/spider/Jamfile +++ b/src/add-ons/screen_savers/spider/Jamfile @@ -9,7 +9,7 @@ ScreenSaver Spider : PolygonQueue.cpp SpiderSaver.cpp - : be libscreensaver.so localestub $(TARGET_LIBSUPC++) + : be libscreensaver.so localestub [ TargetLibsupc++ ] ; DoCatalogs Spider : diff --git a/src/add-ons/tracker/iconvader/Jamfile b/src/add-ons/tracker/iconvader/Jamfile index 73785ab0c3..30325e68e9 100644 --- a/src/add-ons/tracker/iconvader/Jamfile +++ b/src/add-ons/tracker/iconvader/Jamfile @@ -19,5 +19,5 @@ AddResources IconVader : IconVader.rdef ; Addon IconVader : IconVader.cpp - : be tracker $(TARGET_LIBSTDC++) + : be tracker [ TargetLibstdc++ ] ; diff --git a/src/add-ons/tracker/mark_as/Jamfile b/src/add-ons/tracker/mark_as/Jamfile index f8492aafc7..58835fe865 100644 --- a/src/add-ons/tracker/mark_as/Jamfile +++ b/src/add-ons/tracker/mark_as/Jamfile @@ -9,10 +9,10 @@ AddResources Mark\ as\ Read : MarkAsRead.rdef ; Addon Mark\ as… : MarkAs.cpp - : be tracker $(TARGET_LIBSUPC++) libmail.so + : be tracker [ TargetLibsupc++ ] libmail.so ; Addon Mark\ as\ Read : MarkAsRead.cpp - : be tracker $(TARGET_LIBSUPC++) libmail.so + : be tracker [ TargetLibsupc++ ] libmail.so ; diff --git a/src/add-ons/tracker/opentargetfolder/Jamfile b/src/add-ons/tracker/opentargetfolder/Jamfile index 0fcc931ed7..c0a6a1dca8 100644 --- a/src/add-ons/tracker/opentargetfolder/Jamfile +++ b/src/add-ons/tracker/opentargetfolder/Jamfile @@ -3,6 +3,6 @@ SubDir HAIKU_TOP src add-ons tracker opentargetfolder ; Application Open\ Target\ Folder : opentargetfolder.cpp - : be tracker $(TARGET_LIBSUPC++) + : be tracker [ TargetLibsupc++ ] : opentargetfolder.rdef ; diff --git a/src/add-ons/tracker/openterminal/Jamfile b/src/add-ons/tracker/openterminal/Jamfile index 93a8d35437..7a464a211c 100644 --- a/src/add-ons/tracker/openterminal/Jamfile +++ b/src/add-ons/tracker/openterminal/Jamfile @@ -7,5 +7,5 @@ AddResources Open\ Terminal : OpenTerminal.rdef ; Addon Open\ Terminal : OpenTerminal.cpp - : be tracker $(TARGET_LIBSTDC++) + : be tracker [ TargetLibstdc++ ] ; diff --git a/src/add-ons/tracker/zipomatic/Jamfile b/src/add-ons/tracker/zipomatic/Jamfile index 04a82c7e42..fc871e8237 100644 --- a/src/add-ons/tracker/zipomatic/Jamfile +++ b/src/add-ons/tracker/zipomatic/Jamfile @@ -9,7 +9,7 @@ Application ZipOMatic : ZipOMaticWindow.cpp ZipperThread.cpp - : be tracker $(TARGET_LIBSUPC++) localestub + : be tracker [ TargetLibsupc++ ] localestub : ZipOMatic.rdef ; diff --git a/src/add-ons/translators/bmp/Jamfile b/src/add-ons/translators/bmp/Jamfile index 9da8879af4..2d89fd59c7 100644 --- a/src/add-ons/translators/bmp/Jamfile +++ b/src/add-ons/translators/bmp/Jamfile @@ -15,7 +15,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { BMPView.cpp : be translation [ MultiArchDefaultGristFiles libtranslatorsutils.a ] - $(TARGET_LIBSUPC++) localestub + [ TargetLibsupc++ ] localestub : true ; } diff --git a/src/add-ons/translators/exr/Jamfile b/src/add-ons/translators/exr/Jamfile index 775703215a..d60d6e36c8 100644 --- a/src/add-ons/translators/exr/Jamfile +++ b/src/add-ons/translators/exr/Jamfile @@ -18,7 +18,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { EXRGamma.cpp EXRTranslator.cpp IStreamWrapper.cpp - : be translation textencoding $(TARGET_LIBSTDC++) + : be translation textencoding [ TargetLibstdc++ ] [ MultiArchDefaultGristFiles libtranslatorsutils.a libilmimf.so ] localestub : true diff --git a/src/add-ons/translators/exr/openexr/ilmimf/Jamfile b/src/add-ons/translators/exr/openexr/ilmimf/Jamfile index 31b197add1..6a6922bef4 100644 --- a/src/add-ons/translators/exr/openexr/ilmimf/Jamfile +++ b/src/add-ons/translators/exr/openexr/ilmimf/Jamfile @@ -82,7 +82,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { : [ MultiArchDefaultGristFiles libhalf.a libiex.a libimath.a libilmthread.a ] - $(TARGET_LIBSTDC++) + [ TargetLibstdc++ ] [ BuildFeatureAttribute zlib : library ] ; } diff --git a/src/add-ons/translators/gif/Jamfile b/src/add-ons/translators/gif/Jamfile index 657e38a42b..370511d89d 100644 --- a/src/add-ons/translators/gif/Jamfile +++ b/src/add-ons/translators/gif/Jamfile @@ -21,7 +21,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { SavePalette.cpp SFHash.cpp : - be translation $(TARGET_LIBSUPC++) localestub + be translation [ TargetLibsupc++ ] localestub [ MultiArchDefaultGristFiles libtranslatorsutils.a ] : true ; diff --git a/src/add-ons/translators/hpgs/Jamfile b/src/add-ons/translators/hpgs/Jamfile index 342eb5a508..cd708790e1 100644 --- a/src/add-ons/translators/hpgs/Jamfile +++ b/src/add-ons/translators/hpgs/Jamfile @@ -60,7 +60,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { [ BuildFeatureAttribute libpng : library ] [ BuildFeatureAttribute zlib : library ] [ MultiArchDefaultGristFiles libtranslatorsutils.a ] - $(TARGET_LIBSUPC++) localestub + [ TargetLibsupc++ ] localestub : true ; } diff --git a/src/add-ons/translators/hvif/Jamfile b/src/add-ons/translators/hvif/Jamfile index 5bbb6083bc..9b4f578294 100644 --- a/src/add-ons/translators/hvif/Jamfile +++ b/src/add-ons/translators/hvif/Jamfile @@ -13,7 +13,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { HVIFView.cpp : be translation [ MultiArchDefaultGristFiles libtranslatorsutils.a ] - $(TARGET_LIBSUPC++) localestub + [ TargetLibsupc++ ] localestub : true ; } diff --git a/src/add-ons/translators/icns/Jamfile b/src/add-ons/translators/icns/Jamfile index 2ee1f0cd04..8af69456ba 100644 --- a/src/add-ons/translators/icns/Jamfile +++ b/src/add-ons/translators/icns/Jamfile @@ -78,7 +78,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { : be translation [ MultiArchDefaultGristFiles libtranslatorsutils.a ] - $(TARGET_LIBSUPC++) + [ TargetLibsupc++ ] [ BuildFeatureAttribute libpng : library ] localestub : true diff --git a/src/add-ons/translators/ico/Jamfile b/src/add-ons/translators/ico/Jamfile index 441f614f87..73f957801b 100644 --- a/src/add-ons/translators/ico/Jamfile +++ b/src/add-ons/translators/ico/Jamfile @@ -17,7 +17,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { ICO.cpp : be translation [ MultiArchDefaultGristFiles libtranslatorsutils.a ] - $(TARGET_LIBSUPC++) + [ TargetLibsupc++ ] localestub : true ; diff --git a/src/add-ons/translators/jpeg/Jamfile b/src/add-ons/translators/jpeg/Jamfile index 0591cc9987..e72be0fce3 100644 --- a/src/add-ons/translators/jpeg/Jamfile +++ b/src/add-ons/translators/jpeg/Jamfile @@ -24,7 +24,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { : be translation [ MultiArchDefaultGristFiles libtranslatorsutils.a ] [ BuildFeatureAttribute jpeg : library ] - $(TARGET_LIBSTDC++) localestub + [ TargetLibstdc++ ] localestub : true ; diff --git a/src/add-ons/translators/jpeg2000/Jamfile b/src/add-ons/translators/jpeg2000/Jamfile index 5e10009b3f..58d8f85926 100644 --- a/src/add-ons/translators/jpeg2000/Jamfile +++ b/src/add-ons/translators/jpeg2000/Jamfile @@ -76,7 +76,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { : be translation [ MultiArchDefaultGristFiles libtranslatorsutils.a ] - $(TARGET_LIBSUPC++) localestub + [ TargetLibsupc++ ] localestub : true ; } diff --git a/src/add-ons/translators/pcx/Jamfile b/src/add-ons/translators/pcx/Jamfile index 3a2ae9bd6e..f910df2a32 100644 --- a/src/add-ons/translators/pcx/Jamfile +++ b/src/add-ons/translators/pcx/Jamfile @@ -17,7 +17,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { PCX.cpp : be translation [ MultiArchDefaultGristFiles libtranslatorsutils.a ] - $(TARGET_LIBSUPC++) localestub + [ TargetLibsupc++ ] localestub : true ; } diff --git a/src/add-ons/translators/png/Jamfile b/src/add-ons/translators/png/Jamfile index 672ea1026c..2faadf1c92 100644 --- a/src/add-ons/translators/png/Jamfile +++ b/src/add-ons/translators/png/Jamfile @@ -27,7 +27,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { : be translation [ BuildFeatureAttribute libpng : library ] [ BuildFeatureAttribute zlib : library ] - $(TARGET_LIBSUPC++) + [ TargetLibsupc++ ] [ MultiArchDefaultGristFiles libtranslatorsutils.a ] localestub : true diff --git a/src/add-ons/translators/ppm/Jamfile b/src/add-ons/translators/ppm/Jamfile index 8006bcb1be..a4ed148da2 100644 --- a/src/add-ons/translators/ppm/Jamfile +++ b/src/add-ons/translators/ppm/Jamfile @@ -9,7 +9,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { on $(architectureObject) { Translator [ MultiArchDefaultGristFiles PPMTranslator ] : PPMMain.cpp PPMTranslator.cpp colorspace.cpp - : be translation $(TARGET_LIBSUPC++) localestub + : be translation [ TargetLibsupc++ ] localestub : true ; } diff --git a/src/add-ons/translators/psd/Jamfile b/src/add-ons/translators/psd/Jamfile index bbf7c3cb6c..ceb4be06b9 100644 --- a/src/add-ons/translators/psd/Jamfile +++ b/src/add-ons/translators/psd/Jamfile @@ -18,7 +18,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { ConfigView.cpp : be translation [ MultiArchDefaultGristFiles libtranslatorsutils.a ] - $(TARGET_LIBSUPC++) localestub + [ TargetLibsupc++ ] localestub : true ; } diff --git a/src/add-ons/translators/raw/Jamfile b/src/add-ons/translators/raw/Jamfile index 4e0e860bfe..f9459cd1e0 100644 --- a/src/add-ons/translators/raw/Jamfile +++ b/src/add-ons/translators/raw/Jamfile @@ -18,7 +18,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { : be translation [ MultiArchDefaultGristFiles libtranslatorsutils.a ] - $(TARGET_LIBSUPC++) localestub + [ TargetLibsupc++ ] localestub : true ; diff --git a/src/add-ons/translators/rtf/Jamfile b/src/add-ons/translators/rtf/Jamfile index 95c665e686..b0a1288446 100644 --- a/src/add-ons/translators/rtf/Jamfile +++ b/src/add-ons/translators/rtf/Jamfile @@ -23,7 +23,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { : be translation [ MultiArchDefaultGristFiles libtranslatorsutils.a ] - $(TARGET_LIBSUPC++) localestub + [ TargetLibsupc++ ] localestub : true ; } diff --git a/src/add-ons/translators/sgi/Jamfile b/src/add-ons/translators/sgi/Jamfile index 4c87437895..f4ce128869 100644 --- a/src/add-ons/translators/sgi/Jamfile +++ b/src/add-ons/translators/sgi/Jamfile @@ -16,7 +16,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { SGIView.cpp : be translation [ MultiArchDefaultGristFiles libtranslatorsutils.a ] - $(TARGET_LIBSUPC++) localestub + [ TargetLibsupc++ ] localestub : true ; } diff --git a/src/add-ons/translators/stxt/Jamfile b/src/add-ons/translators/stxt/Jamfile index 08dec881a9..8c4b40f53b 100644 --- a/src/add-ons/translators/stxt/Jamfile +++ b/src/add-ons/translators/stxt/Jamfile @@ -19,7 +19,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { STXTView.cpp : be translation textencoding [ MultiArchDefaultGristFiles libtranslatorsutils.a ] - $(TARGET_LIBSUPC++) localestub + [ TargetLibsupc++ ] localestub : true ; } diff --git a/src/add-ons/translators/tga/Jamfile b/src/add-ons/translators/tga/Jamfile index 9bfc000736..3f059b0ea7 100644 --- a/src/add-ons/translators/tga/Jamfile +++ b/src/add-ons/translators/tga/Jamfile @@ -15,7 +15,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { TGAView.cpp : be translation [ MultiArchDefaultGristFiles libtranslatorsutils.a ] - $(TARGET_LIBSUPC++) localestub + [ TargetLibsupc++ ] localestub : true ; } diff --git a/src/add-ons/translators/tiff/Jamfile b/src/add-ons/translators/tiff/Jamfile index 6ebc57b2b0..a2f53590c1 100644 --- a/src/add-ons/translators/tiff/Jamfile +++ b/src/add-ons/translators/tiff/Jamfile @@ -22,7 +22,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { : be translation [ MultiArchDefaultGristFiles libtranslatorsutils.a ] [ BuildFeatureAttribute tiff : library ] - $(TARGET_LIBSUPC++) localestub + [ TargetLibsupc++ ] localestub : true ; diff --git a/src/add-ons/translators/webp/Jamfile b/src/add-ons/translators/webp/Jamfile index 69a2469e37..51f226f8a0 100644 --- a/src/add-ons/translators/webp/Jamfile +++ b/src/add-ons/translators/webp/Jamfile @@ -21,7 +21,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { webpdecode.o webpencode.o be translation [ MultiArchDefaultGristFiles libtranslatorsutils.a ] - $(TARGET_LIBSUPC++) localestub + [ TargetLibsupc++ ] localestub : true ; } diff --git a/src/add-ons/translators/wonderbrush/Jamfile b/src/add-ons/translators/wonderbrush/Jamfile index d2c10eaf50..fb105efed3 100644 --- a/src/add-ons/translators/wonderbrush/Jamfile +++ b/src/add-ons/translators/wonderbrush/Jamfile @@ -34,7 +34,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { : be translation [ BuildFeatureAttribute zlib : library ] [ MultiArchDefaultGristFiles libtranslatorsutils.a ] - $(TARGET_LIBSUPC++) localestub + [ TargetLibsupc++ ] localestub : true ; } diff --git a/src/apps/3dmov/Jamfile b/src/apps/3dmov/Jamfile index b196f51238..24d1fd0869 100644 --- a/src/apps/3dmov/Jamfile +++ b/src/apps/3dmov/Jamfile @@ -27,7 +27,7 @@ Application 3DMov : : be game [ BuildFeatureAttribute mesa : library ] - localestub media translation $(TARGET_LIBSUPC++) + localestub media translation [ TargetLibsupc++ ] : 3dmov.rdef ; diff --git a/src/apps/aboutsystem/Jamfile b/src/apps/aboutsystem/Jamfile index 757657cb35..ca23780132 100644 --- a/src/apps/aboutsystem/Jamfile +++ b/src/apps/aboutsystem/Jamfile @@ -7,7 +7,7 @@ Application AboutSystem : HyperTextActions.cpp HyperTextView.cpp Utilities.cpp - : $(TARGET_LIBSTDC++) be translation localestub + : [ TargetLibstdc++ ] be translation localestub : AboutSystem.rdef ; diff --git a/src/apps/activitymonitor/Jamfile b/src/apps/activitymonitor/Jamfile index 591631d38f..d36d3f5fac 100644 --- a/src/apps/activitymonitor/Jamfile +++ b/src/apps/activitymonitor/Jamfile @@ -10,7 +10,7 @@ Application ActivityMonitor : SettingsWindow.cpp SystemInfo.cpp SystemInfoHandler.cpp - : be tracker media libbnetapi.so libshared.a $(TARGET_LIBSTDC++) + : be tracker media libbnetapi.so libshared.a [ TargetLibstdc++ ] $(TARGET_NETWORK_LIBS) localestub : ActivityMonitor.rdef ; diff --git a/src/apps/autoraise/Jamfile b/src/apps/autoraise/Jamfile index 91c98f1240..bf42e526b7 100644 --- a/src/apps/autoraise/Jamfile +++ b/src/apps/autoraise/Jamfile @@ -6,7 +6,7 @@ Application AutoRaise : AutoRaiseApp.cpp AutoRaiseIcon.cpp settings.cpp - : be $(TARGET_LIBSTDC++) + : be [ TargetLibstdc++ ] : AutoRaise.rdef ; diff --git a/src/apps/bootmanager/Jamfile b/src/apps/bootmanager/Jamfile index b5960cb289..5a0d686e05 100644 --- a/src/apps/bootmanager/Jamfile +++ b/src/apps/bootmanager/Jamfile @@ -22,7 +22,7 @@ Application BootManager : WizardController.cpp WizardPageView.cpp - : be textencoding tracker localestub $(TARGET_LIBSUPC++) + : be textencoding tracker localestub [ TargetLibsupc++ ] : BootManager.rdef ; diff --git a/src/apps/bsnow/Jamfile b/src/apps/bsnow/Jamfile index 4f941c5735..604c4011f3 100644 --- a/src/apps/bsnow/Jamfile +++ b/src/apps/bsnow/Jamfile @@ -6,7 +6,7 @@ Application BSnow : Flakes.cpp SnowView.cpp SnowApp.cpp - : be $(TARGET_LIBSUPC++) localestub + : be [ TargetLibsupc++ ] localestub : BSnow.rdef ; diff --git a/src/apps/charactermap/Jamfile b/src/apps/charactermap/Jamfile index a05f9e0b15..23b8fe5d0b 100644 --- a/src/apps/charactermap/Jamfile +++ b/src/apps/charactermap/Jamfile @@ -11,7 +11,7 @@ Application CharacterMap : UnicodeBlocks.cpp UnicodeBlockView.cpp - : be $(TARGET_LIBSUPC++) localestub + : be [ TargetLibsupc++ ] localestub : CharacterMap.rdef ; diff --git a/src/apps/clock/Jamfile b/src/apps/clock/Jamfile index ee1b5c1dd7..28c0187655 100644 --- a/src/apps/clock/Jamfile +++ b/src/apps/clock/Jamfile @@ -6,7 +6,7 @@ Application Clock : cl_view.cpp cl_wind.cpp clock.cpp - : be localestub $(TARGET_LIBSUPC++) + : be localestub [ TargetLibsupc++ ] : Clock.rdef ; diff --git a/src/apps/codycam/Jamfile b/src/apps/codycam/Jamfile index e6a8aace55..d3e0eae819 100644 --- a/src/apps/codycam/Jamfile +++ b/src/apps/codycam/Jamfile @@ -14,7 +14,7 @@ Application CodyCam : SettingsHandler.cpp VideoConsumer.cpp : be localestub media translation $(TARGET_NETAPI_LIB) - $(TARGET_LIBSTDC++) + [ TargetLibstdc++ ] : CodyCam.rdef ; diff --git a/src/apps/cortex/AddOnHost/Jamfile b/src/apps/cortex/AddOnHost/Jamfile index 96759861f9..5a65618bca 100644 --- a/src/apps/cortex/AddOnHost/Jamfile +++ b/src/apps/cortex/AddOnHost/Jamfile @@ -9,6 +9,6 @@ SetSubDirSupportedPlatformsBeOSCompatible ; Application CortexAddOnHost : AddOnHostApp.cpp - : be media $(TARGET_LIBSTDC++) cortex_support.a + : be media [ TargetLibstdc++ ] cortex_support.a : AddOnHost_Resource.rsrc ; diff --git a/src/apps/cortex/RouteApp/Jamfile b/src/apps/cortex/RouteApp/Jamfile index b66ab30ab8..0960b8c415 100644 --- a/src/apps/cortex/RouteApp/Jamfile +++ b/src/apps/cortex/RouteApp/Jamfile @@ -41,6 +41,6 @@ Application Cortex : cortex_support.a be media tracker translation libexpat.a - $(TARGET_LIBSTDC++) + [ TargetLibstdc++ ] : ../Resource.rdef ; diff --git a/src/apps/cortex/addons/AudioAdapter/Jamfile b/src/apps/cortex/addons/AudioAdapter/Jamfile index dff82f0390..9d30d97584 100644 --- a/src/apps/cortex/addons/AudioAdapter/Jamfile +++ b/src/apps/cortex/addons/AudioAdapter/Jamfile @@ -21,5 +21,5 @@ Addon cortex_audioadapter.media_addon : RawBuffer.cpp SoundUtils.cpp - : be media $(TARGET_LIBSUPC++) + : be media [ TargetLibsupc++ ] ; diff --git a/src/apps/cortex/addons/Flanger/Jamfile b/src/apps/cortex/addons/Flanger/Jamfile index e1e389609d..21b7d74fbc 100644 --- a/src/apps/cortex/addons/Flanger/Jamfile +++ b/src/apps/cortex/addons/Flanger/Jamfile @@ -10,6 +10,6 @@ Addon cortex_flanger.media_addon : MediaNodeControlApp.cpp RawBuffer.cpp SoundUtils.cpp - : be media $(TARGET_LIBSUPC++) + : be media [ TargetLibsupc++ ] : Resource.rsrc ; diff --git a/src/apps/debuganalyzer/Jamfile b/src/apps/debuganalyzer/Jamfile index acaa5bf70e..6821468a29 100644 --- a/src/apps/debuganalyzer/Jamfile +++ b/src/apps/debuganalyzer/Jamfile @@ -28,7 +28,7 @@ Application DebugAnalyzer DebugAnalyzer_util.o libcolumnlistview.a libshared.a libdebug.so be - $(TARGET_LIBSTDC++) + [ TargetLibstdc++ ] : DebugAnalyzer.rdef ; diff --git a/src/apps/debugger/Jamfile b/src/apps/debugger/Jamfile index 4361841045..e5d96e2fc3 100644 --- a/src/apps/debugger/Jamfile +++ b/src/apps/debugger/Jamfile @@ -356,7 +356,7 @@ Application Debugger : libedit.a libncurses.a - $(TARGET_LIBSTDC++) + [ TargetLibstdc++ ] be package tracker libbsd.so libdebug.so : Debugger.rdef diff --git a/src/apps/deskbar/Jamfile b/src/apps/deskbar/Jamfile index 33315ea2a1..6c38976cc5 100644 --- a/src/apps/deskbar/Jamfile +++ b/src/apps/deskbar/Jamfile @@ -40,7 +40,7 @@ Application Deskbar : ResourceSet.cpp Switcher.cpp $(targetSource) - : be localestub tracker $(targetLib) $(TARGET_LIBSUPC++) + : be localestub tracker $(targetLib) [ TargetLibsupc++ ] ; DoCatalogs Deskbar : diff --git a/src/apps/deskcalc/Jamfile b/src/apps/deskcalc/Jamfile index 1a94679b2f..5de3aaa52e 100644 --- a/src/apps/deskcalc/Jamfile +++ b/src/apps/deskcalc/Jamfile @@ -12,7 +12,7 @@ Application DeskCalc : DeskCalc.cpp ExpressionTextView.cpp InputTextView.cpp - : be $(TARGET_LIBSTDC++) localestub media libexpression_parser.a + : be [ TargetLibstdc++ ] localestub media libexpression_parser.a libmapm.a libshared.a : DeskCalc.rdef ; diff --git a/src/apps/devices/Jamfile b/src/apps/devices/Jamfile index 66086087ae..bff9aa5939 100644 --- a/src/apps/devices/Jamfile +++ b/src/apps/devices/Jamfile @@ -96,8 +96,8 @@ Application Devices : Device.cpp PropertyList.cpp PropertyListPlain.cpp - : be libcolumnlistview.a tracker $(TARGET_LIBSUPC++) - $(TARGET_LIBSTDC++) localestub + : be libcolumnlistview.a tracker [ TargetLibsupc++ ] + [ TargetLibstdc++ ] localestub : Devices.rdef ; diff --git a/src/apps/diskprobe/Jamfile b/src/apps/diskprobe/Jamfile index 1d354f5b76..7f9f552bf0 100644 --- a/src/apps/diskprobe/Jamfile +++ b/src/apps/diskprobe/Jamfile @@ -16,7 +16,7 @@ Application DiskProbe : OpenWindow.cpp FindWindow.cpp : be localestub tracker translation libexpression_parser.a - libmapm.a $(TARGET_LIBSUPC++) + libmapm.a [ TargetLibsupc++ ] : DiskProbe.rdef ; diff --git a/src/apps/diskusage/Jamfile b/src/apps/diskusage/Jamfile index 42f0b5ce59..60402c5f9b 100644 --- a/src/apps/diskusage/Jamfile +++ b/src/apps/diskusage/Jamfile @@ -14,7 +14,7 @@ Application DiskUsage : Snapshot.cpp StatusView.cpp VolumeView.cpp - : be libshared.a localestub $(TARGET_LIBSTDC++) + : be libshared.a localestub [ TargetLibstdc++ ] : DiskUsage.rdef ; diff --git a/src/apps/drivesetup/Jamfile b/src/apps/drivesetup/Jamfile index cb003fa9e3..5aff25719f 100644 --- a/src/apps/drivesetup/Jamfile +++ b/src/apps/drivesetup/Jamfile @@ -16,7 +16,7 @@ Preference DriveSetup : Support.cpp : be localestub libcolumnlistview.a libshared.a - $(TARGET_LIBSUPC++) + [ TargetLibsupc++ ] : DriveSetup.rdef ; diff --git a/src/apps/expander/Jamfile b/src/apps/expander/Jamfile index 7f532907c5..6c6df750c9 100644 --- a/src/apps/expander/Jamfile +++ b/src/apps/expander/Jamfile @@ -12,7 +12,7 @@ Application Expander : DirectoryFilePanel.cpp ExpanderRules.cpp PasswordAlert.cpp - : be tracker localestub $(TARGET_LIBSUPC++) + : be tracker localestub [ TargetLibsupc++ ] : Expander.rdef ; diff --git a/src/apps/firstbootprompt/Jamfile b/src/apps/firstbootprompt/Jamfile index 352ab263dc..da3700c068 100644 --- a/src/apps/firstbootprompt/Jamfile +++ b/src/apps/firstbootprompt/Jamfile @@ -9,7 +9,7 @@ Application FirstBootPrompt : BootPromptWindow.cpp Keymap.cpp KeymapListItem.cpp - : be translation libshared.a $(TARGET_LIBSTDC++) localestub + : be translation libshared.a [ TargetLibstdc++ ] localestub : BootPrompt.rdef ; diff --git a/src/apps/fontdemo/Jamfile b/src/apps/fontdemo/Jamfile index 7d23d10aab..4066bed866 100644 --- a/src/apps/fontdemo/Jamfile +++ b/src/apps/fontdemo/Jamfile @@ -6,7 +6,7 @@ Application FontDemo : ControlView.cpp FontDemo.cpp FontDemoView.cpp - : be localestub $(TARGET_LIBSUPC++) + : be localestub [ TargetLibsupc++ ] : FontDemo.rdef ; diff --git a/src/apps/glteapot/Jamfile b/src/apps/glteapot/Jamfile index 41bf054e0d..ce751a0eac 100644 --- a/src/apps/glteapot/Jamfile +++ b/src/apps/glteapot/Jamfile @@ -21,7 +21,7 @@ Includes [ FGristFiles $(sources) ] : Application GLTeapot : $(sources) : - be game localestub $(TARGET_LIBSUPC++) + be game localestub [ TargetLibsupc++ ] [ BuildFeatureAttribute glu : library ] [ BuildFeatureAttribute mesa : library ] : GLTeapot.rdef diff --git a/src/apps/gradients/Jamfile b/src/apps/gradients/Jamfile index ffd7909b3e..2662d950d9 100644 --- a/src/apps/gradients/Jamfile +++ b/src/apps/gradients/Jamfile @@ -4,6 +4,6 @@ Application Gradients : GradientsApp.cpp GradientsWindow.cpp GradientsView.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] : Gradients.rdef ; diff --git a/src/apps/haiku3d/Jamfile b/src/apps/haiku3d/Jamfile index 48d00d990a..e9266cbfdc 100644 --- a/src/apps/haiku3d/Jamfile +++ b/src/apps/haiku3d/Jamfile @@ -38,7 +38,7 @@ Includes [ FGristFiles $(sources) ] : Application Haiku3d : $(sources) : - be game media translation $(TARGET_LIBSTDC++) + be game media translation [ TargetLibstdc++ ] [ BuildFeatureAttribute glu : library ] [ BuildFeatureAttribute mesa : library ] : Haiku3d.rdef diff --git a/src/apps/haikudepot/Jamfile b/src/apps/haikudepot/Jamfile index 10869a8045..1aac1b6a28 100644 --- a/src/apps/haikudepot/Jamfile +++ b/src/apps/haikudepot/Jamfile @@ -63,7 +63,7 @@ Application HaikuDepot : $(textDocumentSources) : be package bnetapi translation libcolumnlistview.a libshared.a - $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++) localestub + [ TargetLibstdc++ ] [ TargetLibsupc++ ] localestub : HaikuDepot.rdef ; @@ -84,5 +84,5 @@ Application TextDocumentTest : TextDocumentTest.cpp $(textDocumentSources) - : be translation libshared.a $(TARGET_LIBSUPC++) + : be translation libshared.a [ TargetLibsupc++ ] ; diff --git a/src/apps/icon-o-matic/Jamfile b/src/apps/icon-o-matic/Jamfile index b4e2ce2543..2a0be6ee21 100644 --- a/src/apps/icon-o-matic/Jamfile +++ b/src/apps/icon-o-matic/Jamfile @@ -300,7 +300,7 @@ Application Icon-O-Matic : Util.cpp : be tracker translation libshared.a libagg.a libexpat.a - $(TARGET_LIBSTDC++) localestub + [ TargetLibstdc++ ] localestub : Icon-O-Matic.rdef ; diff --git a/src/apps/installedpackages/Jamfile b/src/apps/installedpackages/Jamfile index 7553857c6d..10c1bfbbff 100644 --- a/src/apps/installedpackages/Jamfile +++ b/src/apps/installedpackages/Jamfile @@ -11,7 +11,7 @@ Application InstalledPackages : main.cpp UninstallWindow.cpp UninstallView.cpp - : be tracker translation $(TARGET_LIBSUPC++) localestub + : be tracker translation [ TargetLibsupc++ ] localestub ; DoCatalogs InstalledPackages : diff --git a/src/apps/installer/Jamfile b/src/apps/installer/Jamfile index 9d9b4d197b..e3146bc35f 100644 --- a/src/apps/installer/Jamfile +++ b/src/apps/installer/Jamfile @@ -14,7 +14,7 @@ Application Installer : ProgressReporter.cpp UnzipEngine.cpp WorkerThread.cpp - : be tracker translation libshared.a $(TARGET_LIBSTDC++) + : be tracker translation libshared.a [ TargetLibstdc++ ] localestub : Installer.rdef ; diff --git a/src/apps/launchbox/Jamfile b/src/apps/launchbox/Jamfile index 7a6da13ed0..8d03f3e90d 100644 --- a/src/apps/launchbox/Jamfile +++ b/src/apps/launchbox/Jamfile @@ -11,7 +11,7 @@ Application LaunchBox : PadView.cpp Panel.cpp support.cpp - : be translation libshared.a $(TARGET_LIBSUPC++) localestub + : be translation libshared.a [ TargetLibsupc++ ] localestub : LaunchBox.rdef ; diff --git a/src/apps/login/Jamfile b/src/apps/login/Jamfile index e995bd3227..c3d0743787 100644 --- a/src/apps/login/Jamfile +++ b/src/apps/login/Jamfile @@ -19,7 +19,7 @@ Application Login : LoginWindow.cpp LoginView.cpp main.cpp - : be tracker $(mu_libs) $(TARGET_LIBSTDC++) localestub + : be tracker $(mu_libs) [ TargetLibstdc++ ] localestub : Login.rdef ; diff --git a/src/apps/magnify/Jamfile b/src/apps/magnify/Jamfile index 8cfbf7889c..19aef1ed0f 100644 --- a/src/apps/magnify/Jamfile +++ b/src/apps/magnify/Jamfile @@ -8,7 +8,7 @@ UsePrivateHeaders shared ; Application Magnify : Magnify.cpp - : be game localestub $(TARGET_LIBSUPC++) tracker + : be game localestub [ TargetLibsupc++ ] tracker : Magnify.rdef ; diff --git a/src/apps/mail/Jamfile b/src/apps/mail/Jamfile index 123cb95c96..c10da1892e 100644 --- a/src/apps/mail/Jamfile +++ b/src/apps/mail/Jamfile @@ -33,7 +33,7 @@ Application Mail : WIndex.cpp Words.cpp KUndoBuffer.cpp - : be tracker $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++) localestub + : be tracker [ TargetLibstdc++ ] [ TargetLibsupc++ ] localestub libmail.so libtextencoding.so : Mail.rdef ; diff --git a/src/apps/mandelbrot/Jamfile b/src/apps/mandelbrot/Jamfile index 0e99a63f11..23783f79f7 100644 --- a/src/apps/mandelbrot/Jamfile +++ b/src/apps/mandelbrot/Jamfile @@ -6,7 +6,7 @@ AddSubDirSupportedPlatforms libbe_test ; Application Mandelbrot : Mandelbrot.cpp tsb.cpp - : be $(TARGET_LIBSUPC++) localestub + : be [ TargetLibsupc++ ] localestub : Mandelbrot.rdef ; diff --git a/src/apps/mediaconverter/Jamfile b/src/apps/mediaconverter/Jamfile index 60ac2bffb1..8dc9db4ae0 100644 --- a/src/apps/mediaconverter/Jamfile +++ b/src/apps/mediaconverter/Jamfile @@ -12,7 +12,7 @@ Application MediaConverter : MediaFileInfoView.cpp MediaFileListView.cpp - : be media tracker localestub $(TARGET_LIBSTDC++) + : be media tracker localestub [ TargetLibstdc++ ] : MediaConverter.rdef ; diff --git a/src/apps/mediaplayer/Jamfile b/src/apps/mediaplayer/Jamfile index 5f35946f46..50f2377f73 100644 --- a/src/apps/mediaplayer/Jamfile +++ b/src/apps/mediaplayer/Jamfile @@ -114,7 +114,7 @@ Application MediaPlayer : MainWin.cpp VideoView.cpp - : be game media tracker translation textencoding $(TARGET_LIBSTDC++) + : be game media tracker translation textencoding [ TargetLibstdc++ ] localestub libshared.a : MediaPlayer.rdef ; diff --git a/src/apps/midiplayer/Jamfile b/src/apps/midiplayer/Jamfile index 7e7788a3fd..032fe24ed2 100644 --- a/src/apps/midiplayer/Jamfile +++ b/src/apps/midiplayer/Jamfile @@ -9,7 +9,7 @@ Application MidiPlayer : MidiPlayerWindow.cpp ScopeView.cpp SynthBridge.cpp - : be midi midi2 $(TARGET_LIBSUPC++) localestub + : be midi midi2 [ TargetLibsupc++ ] localestub : MidiPlayer.rdef ; diff --git a/src/apps/musiccollection/Jamfile b/src/apps/musiccollection/Jamfile index f38edffd64..0960aa0e62 100644 --- a/src/apps/musiccollection/Jamfile +++ b/src/apps/musiccollection/Jamfile @@ -12,8 +12,8 @@ Application MusicCollection : NodeMonitorHandler.cpp : - be libalm.so localestub $(TARGET_LIBSUPC++) - $(TARGET_LIBSTDC++) libshared.a + be libalm.so localestub [ TargetLibsupc++ ] + [ TargetLibstdc++ ] libshared.a : MusicCollection.rdef ; diff --git a/src/apps/networkstatus/Jamfile b/src/apps/networkstatus/Jamfile index e71777aa8b..9fb885b05f 100644 --- a/src/apps/networkstatus/Jamfile +++ b/src/apps/networkstatus/Jamfile @@ -18,7 +18,7 @@ Application NetworkStatus : WirelessNetworkMenuItem.cpp : be libshared.a localestub $(icon_libs) $(TARGET_NETWORK_LIBS) - libbnetapi.so $(TARGET_LIBSTDC++) + libbnetapi.so [ TargetLibstdc++ ] : NetworkStatus.rdef NetworkStatusIcons.rdef ; diff --git a/src/apps/overlayimage/Jamfile b/src/apps/overlayimage/Jamfile index 634c9cd18c..3e295013d6 100644 --- a/src/apps/overlayimage/Jamfile +++ b/src/apps/overlayimage/Jamfile @@ -5,7 +5,7 @@ Application OverlayImage : OverlayView.cpp OverlayWindow.cpp - : be libtranslation.so $(TARGET_LIBSTDC++) localestub + : be libtranslation.so [ TargetLibstdc++ ] localestub : OverlayImage.rdef ; diff --git a/src/apps/packageinstaller/Jamfile b/src/apps/packageinstaller/Jamfile index a8b6cdb95a..c040ee37ea 100644 --- a/src/apps/packageinstaller/Jamfile +++ b/src/apps/packageinstaller/Jamfile @@ -22,7 +22,7 @@ Application PackageInstaller : InstalledPackageInfo.cpp : be localestub tracker translation [ BuildFeatureAttribute zlib : library ] - $(TARGET_LIBSUPC++) + [ TargetLibsupc++ ] : PackageInstaller.rdef ; diff --git a/src/apps/pairs/Jamfile b/src/apps/pairs/Jamfile index f4d8698b13..b040753e2d 100644 --- a/src/apps/pairs/Jamfile +++ b/src/apps/pairs/Jamfile @@ -6,7 +6,7 @@ Application Pairs : PairsView.cpp PairsWindow.cpp - : be localestub $(TARGET_LIBSTDC++) + : be localestub [ TargetLibstdc++ ] : Pairs.rdef ; diff --git a/src/apps/patchbay/Jamfile b/src/apps/patchbay/Jamfile index 193ad8563c..a3dd8b3e31 100644 --- a/src/apps/patchbay/Jamfile +++ b/src/apps/patchbay/Jamfile @@ -11,7 +11,7 @@ SimpleTest PatchBay EndpointInfo.cpp MidiEventMeter.cpp : - midi midi2 be libicon.a $(TARGET_LIBSTDC++) + midi midi2 be libicon.a [ TargetLibstdc++ ] : PatchBay.rdef ; diff --git a/src/apps/people/Jamfile b/src/apps/people/Jamfile index 1a0f1d3fdf..807868e34b 100644 --- a/src/apps/people/Jamfile +++ b/src/apps/people/Jamfile @@ -10,7 +10,7 @@ Application People : PersonWindow.cpp PictureView.cpp : be tracker translation - $(TARGET_LIBSUPC++) localestub + [ TargetLibsupc++ ] localestub : People.rdef ; diff --git a/src/apps/poorman/Jamfile b/src/apps/poorman/Jamfile index ca3a0c4aac..ac661568a7 100644 --- a/src/apps/poorman/Jamfile +++ b/src/apps/poorman/Jamfile @@ -51,7 +51,7 @@ Application PoorMan : PoorMan.cpp match.c tdate_parse.c - : be network tracker $(TARGET_LIBSTDC++) localestub + : be network tracker [ TargetLibstdc++ ] localestub ; diff --git a/src/apps/powerstatus/Jamfile b/src/apps/powerstatus/Jamfile index 3e88b2e80a..395d2d1d96 100644 --- a/src/apps/powerstatus/Jamfile +++ b/src/apps/powerstatus/Jamfile @@ -13,7 +13,7 @@ Application PowerStatus : PowerStatusWindow.cpp PowerStatusView.cpp PowerStatus.cpp - : be libshared.a $(TARGET_LIBSUPC++) localestub + : be libshared.a [ TargetLibsupc++ ] localestub : PowerStatus.rdef ; DoCatalogs PowerStatus : diff --git a/src/apps/processcontroller/Jamfile b/src/apps/processcontroller/Jamfile index e40d3ba4c2..00bdc8221e 100644 --- a/src/apps/processcontroller/Jamfile +++ b/src/apps/processcontroller/Jamfile @@ -21,7 +21,7 @@ Application ProcessController : ThreadBarMenu.cpp ThreadBarMenuItem.cpp Utilities.cpp - : be libshared.a $(TARGET_LIBSUPC++) localestub + : be libshared.a [ TargetLibsupc++ ] localestub : ProcessController.rdef ; diff --git a/src/apps/pulse/Jamfile b/src/apps/pulse/Jamfile index ae4c712aa7..c5c67414c1 100644 --- a/src/apps/pulse/Jamfile +++ b/src/apps/pulse/Jamfile @@ -23,7 +23,7 @@ Application Pulse : PulseView.cpp PulseWindow.cpp - : be localestub $(TARGET_LIBSUPC++) + : be localestub [ TargetLibsupc++ ] : Pulse.rdef ; diff --git a/src/apps/remotedesktop/Jamfile b/src/apps/remotedesktop/Jamfile index b49c006c97..76afb67ef4 100644 --- a/src/apps/remotedesktop/Jamfile +++ b/src/apps/remotedesktop/Jamfile @@ -18,7 +18,7 @@ Application RemoteDesktop : NetSender.cpp StreamingRingBuffer.cpp - : be bnetapi $(TARGET_LIBSUPC++) + : be bnetapi [ TargetLibsupc++ ] : RemoteDesktop.rdef ; diff --git a/src/apps/resedit/Jamfile b/src/apps/resedit/Jamfile index 3af837049d..26397b09b5 100644 --- a/src/apps/resedit/Jamfile +++ b/src/apps/resedit/Jamfile @@ -27,5 +27,5 @@ Application ResEdit : ResourceRoster.cpp ResView.cpp ResWindow.cpp - : be tracker translation libcolumnlistview.a $(TARGET_LIBSUPC++) + : be tracker translation libcolumnlistview.a [ TargetLibsupc++ ] ; diff --git a/src/apps/resourceedit/Jamfile b/src/apps/resourceedit/Jamfile index b392f77ea4..8167113914 100644 --- a/src/apps/resourceedit/Jamfile +++ b/src/apps/resourceedit/Jamfile @@ -48,7 +48,7 @@ Application ResourceEdit tracker translation libcolumnlistview.a - $(TARGET_LIBSTDC++) + [ TargetLibstdc++ ] : ResourceEdit.rdef ; diff --git a/src/apps/screenshot/Jamfile b/src/apps/screenshot/Jamfile index 0ad29f72a1..75695c68f6 100644 --- a/src/apps/screenshot/Jamfile +++ b/src/apps/screenshot/Jamfile @@ -8,7 +8,7 @@ Application Screenshot : ScreenshotApp.cpp ScreenshotWindow.cpp Utility.cpp - : be localestub tracker translation $(TARGET_LIBSUPC++) + : be localestub tracker translation [ TargetLibsupc++ ] : ScreenshotApp.rdef ; @@ -22,7 +22,7 @@ DoCatalogs Screenshot : Application screenshot : Screenshot.cpp Utility.cpp - : be localestub translation $(TARGET_LIBSUPC++) + : be localestub translation [ TargetLibsupc++ ] : Screenshot.rdef ; diff --git a/src/apps/serialconnect/Jamfile b/src/apps/serialconnect/Jamfile index 3e0d7d97de..953b0c9a03 100644 --- a/src/apps/serialconnect/Jamfile +++ b/src/apps/serialconnect/Jamfile @@ -16,7 +16,7 @@ Application SerialConnect : state.c unicode.c vterm.c - : be device tracker localestub $(TARGET_LIBSUPC++) + : be device tracker localestub [ TargetLibsupc++ ] : SerialConnect.rdef ; diff --git a/src/apps/showimage/Jamfile b/src/apps/showimage/Jamfile index a0195e75f9..cac3886419 100644 --- a/src/apps/showimage/Jamfile +++ b/src/apps/showimage/Jamfile @@ -22,7 +22,7 @@ Application ShowImage : ToolBarIcons.cpp ToolBarView.cpp : libshared.a be tracker translation localestub - $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++) + [ TargetLibstdc++ ] [ TargetLibsupc++ ] : ShowImage.rdef ; diff --git a/src/apps/soundrecorder/Jamfile b/src/apps/soundrecorder/Jamfile index a223991981..89d436607d 100644 --- a/src/apps/soundrecorder/Jamfile +++ b/src/apps/soundrecorder/Jamfile @@ -17,7 +17,7 @@ Application SoundRecorder : UpDownButton.cpp VUView.cpp VolumeSlider.cpp - : be localestub media tracker $(TARGET_LIBSTDC++) + : be localestub media tracker [ TargetLibstdc++ ] : SoundRecorder.rdef ; diff --git a/src/apps/stylededit/Jamfile b/src/apps/stylededit/Jamfile index 848b66b710..8d264d1cf7 100644 --- a/src/apps/stylededit/Jamfile +++ b/src/apps/stylededit/Jamfile @@ -19,7 +19,7 @@ Application StyledEdit : StyledEditView.cpp StyledEditWindow.cpp : be translation tracker libtextencoding.so localestub - $(TARGET_LIBSUPC++) + [ TargetLibsupc++ ] : $(styled_edit_rsrc) ; diff --git a/src/apps/sudoku/Jamfile b/src/apps/sudoku/Jamfile index 51f31eefc5..5724d0a6f9 100644 --- a/src/apps/sudoku/Jamfile +++ b/src/apps/sudoku/Jamfile @@ -12,7 +12,7 @@ Application Sudoku : SudokuView.cpp SudokuWindow.cpp - : be tracker localestub $(TARGET_LIBSTDC++) + : be tracker localestub [ TargetLibstdc++ ] : Sudoku.rdef ; diff --git a/src/apps/switcher/Jamfile b/src/apps/switcher/Jamfile index 1d561a2e15..8bfd1b271a 100644 --- a/src/apps/switcher/Jamfile +++ b/src/apps/switcher/Jamfile @@ -11,7 +11,7 @@ Application Switcher : Switcher.cpp WindowsView.cpp - : be translation $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++) + : be translation [ TargetLibstdc++ ] [ TargetLibsupc++ ] localestub libshared.a : Switcher.rdef ; diff --git a/src/apps/terminal/Jamfile b/src/apps/terminal/Jamfile index 17b684f3e7..d254daef01 100644 --- a/src/apps/terminal/Jamfile +++ b/src/apps/terminal/Jamfile @@ -41,7 +41,7 @@ Application Terminal : VTKeyTbl.c VTPrsTbl.c : be localestub tracker textencoding - $(TARGET_LIBSUPC++) $(TARGET_LIBSTDC++) + [ TargetLibsupc++ ] [ TargetLibstdc++ ] : Terminal.rdef XColors.rdef ; diff --git a/src/apps/text_search/Jamfile b/src/apps/text_search/Jamfile index 5ef190a85e..9c0b8e4a50 100644 --- a/src/apps/text_search/Jamfile +++ b/src/apps/text_search/Jamfile @@ -25,7 +25,7 @@ Application TextSearch : $(additionalBeOSSources) : be localestub tracker textencoding libshared.a - $(TARGET_LIBSUPC++) + [ TargetLibsupc++ ] : TextSearch.rdef ; diff --git a/src/apps/tv/Jamfile b/src/apps/tv/Jamfile index 47b49e9529..27a40073d7 100644 --- a/src/apps/tv/Jamfile +++ b/src/apps/tv/Jamfile @@ -8,7 +8,7 @@ Application TV : MainWin.cpp VideoNode.cpp VideoView.cpp - : be localestub media $(TARGET_LIBSUPC++) + : be localestub media [ TargetLibsupc++ ] : tv.rdef ; diff --git a/src/apps/webpositive/Jamfile b/src/apps/webpositive/Jamfile index b0a6ee0a9c..2429b56f6f 100644 --- a/src/apps/webpositive/Jamfile +++ b/src/apps/webpositive/Jamfile @@ -72,7 +72,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { $(sources) : [ BuildFeatureAttribute webkit : libraries ] - $(TARGET_LIBSTDC++) localestub + [ TargetLibstdc++ ] localestub [ MultiArchDefaultGristFiles libshared.a ] be network bnetapi tracker translation : diff --git a/src/apps/webwatch/Jamfile b/src/apps/webwatch/Jamfile index 3764f04eca..909eafdef6 100644 --- a/src/apps/webwatch/Jamfile +++ b/src/apps/webwatch/Jamfile @@ -5,7 +5,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ; Application WebWatch : WatchApp.cpp WatchView.cpp - : be localestub $(TARGET_LIBSUPC++) + : be localestub [ TargetLibsupc++ ] : WebWatch.rdef ; diff --git a/src/apps/workspaces/Jamfile b/src/apps/workspaces/Jamfile index 1922be596c..0af2fc682b 100644 --- a/src/apps/workspaces/Jamfile +++ b/src/apps/workspaces/Jamfile @@ -7,7 +7,7 @@ UsePrivateHeaders app interface shared ; Application Workspaces : Workspaces.cpp - : be libshared.a localestub $(TARGET_LIBSUPC++) + : be libshared.a localestub [ TargetLibsupc++ ] : Workspaces.rdef ; diff --git a/src/bin/Jamfile b/src/bin/Jamfile index 9f67550ab3..cdc5715463 100644 --- a/src/bin/Jamfile +++ b/src/bin/Jamfile @@ -122,18 +122,18 @@ StdBinCommands settype.cpp spybmessage.cpp urlwrapper.cpp - : be $(TARGET_LIBSUPC++) : $(haiku-utils_rsrc) ; + : be [ TargetLibsupc++ ] : $(haiku-utils_rsrc) ; # standard commands that need libbe.so, libsupc++.so, and libshared.a StdBinCommands ramdisk.cpp - : libshared.a be $(TARGET_LIBSUPC++) : $(haiku-utils_rsrc) ; + : libshared.a be [ TargetLibsupc++ ] : $(haiku-utils_rsrc) ; # standard commands that need libbe.so, libbnetapi.solibsupc++.so StdBinCommands open.cpp urlwrapper.cpp - : be bnetapi $(TARGET_LIBSUPC++) : $(haiku-utils_rsrc) ; + : be bnetapi [ TargetLibsupc++ ] : $(haiku-utils_rsrc) ; # commands that need libbe.so and the stub catalog StdBinCommands @@ -144,7 +144,7 @@ StdBinCommands # commands that need libbe.so, libsupc++.so and the stub catalog StdBinCommands dstcheck.cpp - : be $(TARGET_LIBSUPC++) localestub : $(haiku-utils_rsrc) ; + : be [ TargetLibsupc++ ] localestub : $(haiku-utils_rsrc) ; # Haiku-specific apps which need libbe.so if $(TARGET_PLATFORM) = haiku { @@ -159,30 +159,30 @@ StdBinCommands copyattr.cpp setmime.cpp xres.cpp - : be $(TARGET_LIBSTDC++) : $(haiku-utils_rsrc) ; + : be [ TargetLibstdc++ ] : $(haiku-utils_rsrc) ; # Haiku-specific apps which need libbe.so, libstdc++.so if $(TARGET_PLATFORM) = haiku { StdBinCommands mountvolume.cpp - : be $(TARGET_LIBSTDC++) : $(haiku-utils_rsrc) ; + : be [ TargetLibstdc++ ] : $(haiku-utils_rsrc) ; } # commands that need libstdc++ only StdBinCommands diff_zip.cpp sysinfo.cpp - : $(TARGET_LIBSTDC++) : $(haiku-utils_rsrc) ; + : [ TargetLibstdc++ ] : $(haiku-utils_rsrc) ; # standard commands that need libbe.so, libtranslation.so, libsupc++.so StdBinCommands translate.cpp - : be translation $(TARGET_LIBSUPC++) : $(haiku-utils_rsrc) ; + : be translation [ TargetLibsupc++ ] : $(haiku-utils_rsrc) ; # standard commands that need libbe.so, libtranslation.so, libicon.a, libstdc++.so StdBinCommands notify.cpp - : be translation libicon.a $(TARGET_LIBSTDC++) : $(haiku-utils_rsrc) ; + : be translation libicon.a [ TargetLibstdc++ ] : $(haiku-utils_rsrc) ; # standard commands that need libbe.so, libmedia.so StdBinCommands @@ -192,7 +192,7 @@ StdBinCommands # standard commands that need libbe.so, libmedia.so, libsupc++.so StdBinCommands setvolume.cpp - : be libmedia.so $(TARGET_LIBSUPC++) : $(haiku-utils_rsrc) ; + : be libmedia.so [ TargetLibsupc++ ] : $(haiku-utils_rsrc) ; # standard commands that need libbe.so, libmail.so StdBinCommands @@ -202,7 +202,7 @@ StdBinCommands # standard commands that need libbe.so, libpackage.so, libsupc++.so StdBinCommands findpaths.cpp - : be package $(TARGET_LIBSUPC++) : $(haiku-utils_rsrc) ; + : be package [ TargetLibsupc++ ] : $(haiku-utils_rsrc) ; # standard commands that need libbe.so, libdevice.so StdBinCommands @@ -223,18 +223,18 @@ StdBinCommands StdBinCommands bt_discovery.cpp - : be libbluetooth.so $(TARGET_LIBSUPC++) : $(haiku-utils_rsrc) ; + : be libbluetooth.so [ TargetLibsupc++ ] : $(haiku-utils_rsrc) ; # standard commands that need libbe.so, libbnetapi.so, libtracker.so StdBinCommands checkitout.cpp - : be bnetapi tracker $(TARGET_LIBSUPC++) : $(haiku-utils_rsrc) ; + : be bnetapi tracker [ TargetLibsupc++ ] : $(haiku-utils_rsrc) ; #standard commands that need libbe.so, libtracker.so and the stub catalog StdBinCommands filepanel.cpp - : be tracker $(TARGET_LIBSUPC++) localestub : $(haiku-utils_rsrc) ; + : be tracker [ TargetLibsupc++ ] localestub : $(haiku-utils_rsrc) ; # standard commands that need libncurses.a StdBinCommands @@ -244,7 +244,7 @@ StdBinCommands # mimeset needs libstorage_kit_mime.a StdBinCommands mimeset.cpp - : be libstorage_kit_mime.a $(TARGET_LIBSTDC++) : $(haiku-utils_rsrc) ; + : be libstorage_kit_mime.a [ TargetLibstdc++ ] : $(haiku-utils_rsrc) ; # Localization of some applications DoCatalogs dstcheck diff --git a/src/bin/bfs_tools/Jamfile b/src/bin/bfs_tools/Jamfile index 93a67bb2f9..16e123a872 100644 --- a/src/bin/bfs_tools/Jamfile +++ b/src/bin/bfs_tools/Jamfile @@ -10,7 +10,7 @@ StdBinCommands bfswhich.cpp recover.cpp - : libbfs_tools.a be $(TARGET_LIBSTDC++) : $(haiku-utils_rsrc) + : libbfs_tools.a be [ TargetLibstdc++ ] : $(haiku-utils_rsrc) ; SubInclude HAIKU_TOP src bin bfs_tools lib ; diff --git a/src/bin/consoled/Jamfile b/src/bin/consoled/Jamfile index df42f286e9..d900f70a74 100644 --- a/src/bin/consoled/Jamfile +++ b/src/bin/consoled/Jamfile @@ -5,5 +5,5 @@ UseHeaders [ FDirName $(HAIKU_TOP) src apps terminal ] ; Application consoled : consoled.cpp - : be libshared.a $(TARGET_LIBSUPC++) + : be libshared.a [ TargetLibsupc++ ] ; diff --git a/src/bin/debug/Jamfile b/src/bin/debug/Jamfile index 75d9f044f8..4891e2ee92 100644 --- a/src/bin/debug/Jamfile +++ b/src/bin/debug/Jamfile @@ -9,7 +9,7 @@ StaticLibrary debug_utils.a : debug_utils.cpp ; BinCommand kernel_debugger : kernel_debugger.cpp : - $(TARGET_LIBSUPC++) + [ TargetLibsupc++ ] ; diff --git a/src/bin/debug/profile/Jamfile b/src/bin/debug/profile/Jamfile index e3f3fc2eee..cd02b206b0 100644 --- a/src/bin/debug/profile/Jamfile +++ b/src/bin/debug/profile/Jamfile @@ -23,6 +23,6 @@ BinCommand profile : debug_utils.a libdebug.so - $(TARGET_LIBSTDC++) + [ TargetLibstdc++ ] be ; diff --git a/src/bin/debug/scheduling_recorder/Jamfile b/src/bin/debug/scheduling_recorder/Jamfile index 6544576915..a45c94073a 100644 --- a/src/bin/debug/scheduling_recorder/Jamfile +++ b/src/bin/debug/scheduling_recorder/Jamfile @@ -12,5 +12,5 @@ BinCommand scheduling_recorder debug_utils.a libdebug.so be - $(TARGET_LIBSTDC++) + [ TargetLibstdc++ ] ; diff --git a/src/bin/debug/strace/Jamfile b/src/bin/debug/strace/Jamfile index d3b37777ff..527190e3e0 100644 --- a/src/bin/debug/strace/Jamfile +++ b/src/bin/debug/strace/Jamfile @@ -51,7 +51,7 @@ BinCommand strace : $(straceSources) : $(straceSyscallsObjects) debug_utils.a - $(TARGET_LIBSTDC++) + [ TargetLibstdc++ ] ; # We need to specify the dependency on the generated syscalls file explicitly. diff --git a/src/bin/debug/time_stats/Jamfile b/src/bin/debug/time_stats/Jamfile index f0158cdb8d..d332493f2e 100644 --- a/src/bin/debug/time_stats/Jamfile +++ b/src/bin/debug/time_stats/Jamfile @@ -13,5 +13,5 @@ BinCommand time_stats time_stats.cpp timing_analysis.cpp : - $(TARGET_LIBSTDC++) + [ TargetLibstdc++ ] ; diff --git a/src/bin/desklink/Jamfile b/src/bin/desklink/Jamfile index fec8bd616d..2bf3c4629c 100644 --- a/src/bin/desklink/Jamfile +++ b/src/bin/desklink/Jamfile @@ -12,7 +12,7 @@ BinCommand desklink : VolumeControl.cpp VolumeWindow.cpp - : be libmedia.so localestub $(TARGET_LIBSUPC++) + : be libmedia.so localestub [ TargetLibsupc++ ] : desklink.rdef ; diff --git a/src/bin/hid_decode/Jamfile b/src/bin/hid_decode/Jamfile index 3c50069bc8..0314e6dc37 100644 --- a/src/bin/hid_decode/Jamfile +++ b/src/bin/hid_decode/Jamfile @@ -17,7 +17,7 @@ BinCommand hid_decode : HIDWriter.cpp hid_decode.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; SEARCH on [ FGristFiles HIDCollection.cpp HIDParser.cpp HIDReport.cpp diff --git a/src/bin/keymap/Jamfile b/src/bin/keymap/Jamfile index 6bfef39729..aaaede1824 100644 --- a/src/bin/keymap/Jamfile +++ b/src/bin/keymap/Jamfile @@ -6,5 +6,5 @@ UsePrivateHeaders shared storage ; BinCommand keymap : main.cpp Keymap.cpp - : be libshared.a $(TARGET_LIBSUPC++) + : be libshared.a [ TargetLibsupc++ ] : keymap.rdef ; diff --git a/src/bin/locale/Jamfile b/src/bin/locale/Jamfile index af63c66a51..0a5ce382b9 100644 --- a/src/bin/locale/Jamfile +++ b/src/bin/locale/Jamfile @@ -6,10 +6,10 @@ UsePublicHeaders locale ; UsePrivateHeaders locale shared ; BinCommand collectcatkeys : collectcatkeys.cpp RegExp.cpp - : be $(TARGET_LIBSUPC++) ; + : be [ TargetLibsupc++ ] ; -BinCommand linkcatkeys : linkcatkeys.cpp : be $(TARGET_LIBSTDC++) ; +BinCommand linkcatkeys : linkcatkeys.cpp : be [ TargetLibstdc++ ] ; -BinCommand dumpcatalog : dumpcatalog.cpp : be $(TARGET_LIBSUPC++) ; +BinCommand dumpcatalog : dumpcatalog.cpp : be [ TargetLibsupc++ ] ; -BinCommand locale : locale.cpp : be $(TARGET_LIBSUPC++) ; +BinCommand locale : locale.cpp : be [ TargetLibsupc++ ] ; diff --git a/src/bin/mail_utils/Jamfile b/src/bin/mail_utils/Jamfile index 1f032d59be..ffad6a9802 100644 --- a/src/bin/mail_utils/Jamfile +++ b/src/bin/mail_utils/Jamfile @@ -22,6 +22,6 @@ StdBinCommands StdBinCommands spamdbm.cpp - : be tracker $(TARGET_LIBSTDC++) libmail.so + : be tracker [ TargetLibstdc++ ] libmail.so : spamdbm.rdef ; diff --git a/src/bin/makebootable/platform/bios_ia32/Jamfile b/src/bin/makebootable/platform/bios_ia32/Jamfile index b50a1ff227..2ad1fde4cf 100644 --- a/src/bin/makebootable/platform/bios_ia32/Jamfile +++ b/src/bin/makebootable/platform/bios_ia32/Jamfile @@ -8,4 +8,4 @@ UsePrivateSystemHeaders ; # write the stage 1 boot loader into the makebootable resources AddFileDataResource makebootable : RAWT:666:BootCode : stage1.bin ; -BinCommand makebootable : makebootable.cpp : be $(TARGET_LIBSUPC++) ; +BinCommand makebootable : makebootable.cpp : be [ TargetLibsupc++ ] ; diff --git a/src/bin/makebootable/platform/pxe_ia32/Jamfile b/src/bin/makebootable/platform/pxe_ia32/Jamfile index 5e989d028d..217b07911a 100644 --- a/src/bin/makebootable/platform/pxe_ia32/Jamfile +++ b/src/bin/makebootable/platform/pxe_ia32/Jamfile @@ -3,7 +3,7 @@ SubDir HAIKU_TOP src bin makebootable platform pxe_ia32 ; # write the stage 1 boot loader into the makebootable resources AddFileDataResource makebootable : RAWT:666:BootCode : stage1.bin ; -BinCommand makebootable : makebootable.cpp : be $(TARGET_LIBSUPC++) ; +BinCommand makebootable : makebootable.cpp : be [ TargetLibsupc++ ] ; SEARCH on [ FGristFiles makebootable.cpp ] = [ FDirName $(SUBDIR) $(DOTDOT) bios_ia32 ] ; diff --git a/src/bin/mkfs/Jamfile b/src/bin/mkfs/Jamfile index 676d97c5b3..b7faa6af41 100644 --- a/src/bin/mkfs/Jamfile +++ b/src/bin/mkfs/Jamfile @@ -6,4 +6,4 @@ UsePrivateHeaders storage ; BinCommand mkfs : main.cpp FsCreator.cpp - : be $(TARGET_LIBSTDC++) ; + : be [ TargetLibstdc++ ] ; diff --git a/src/bin/multiuser/Jamfile b/src/bin/multiuser/Jamfile index c79da87d3d..ff9fd693d3 100644 --- a/src/bin/multiuser/Jamfile +++ b/src/bin/multiuser/Jamfile @@ -21,7 +21,7 @@ BinCommand groupadd : groupadd.cpp ; BinCommand groupdel : groupdel.cpp ; -BinCommand groupmod : groupmod.cpp : $(TARGET_LIBSTDC++) ; +BinCommand groupmod : groupmod.cpp : [ TargetLibstdc++ ] ; # set set-uid bit on passwd MODE on passwd = 04755 ; diff --git a/src/bin/network/mount_nfs/Jamfile b/src/bin/network/mount_nfs/Jamfile index 163f1d7998..db1c8c389e 100644 --- a/src/bin/network/mount_nfs/Jamfile +++ b/src/bin/network/mount_nfs/Jamfile @@ -6,5 +6,5 @@ UsePrivateHeaders net ; BinCommand mount_nfs : mount_nfs.cpp - : libnetwork.so $(TARGET_LIBSUPC++) + : libnetwork.so [ TargetLibsupc++ ] ; diff --git a/src/bin/package/Jamfile b/src/bin/package/Jamfile index a5454fa168..81ae7c33b0 100644 --- a/src/bin/package/Jamfile +++ b/src/bin/package/Jamfile @@ -16,5 +16,5 @@ BinCommand package : PackageWritingUtils.cpp : package be - $(TARGET_LIBSUPC++) + [ TargetLibsupc++ ] ; diff --git a/src/bin/package_repo/Jamfile b/src/bin/package_repo/Jamfile index 20da033c4b..c899132ddd 100644 --- a/src/bin/package_repo/Jamfile +++ b/src/bin/package_repo/Jamfile @@ -14,6 +14,6 @@ BinCommand package_repo : package_repo.cpp : package be - $(TARGET_LIBSUPC++) - $(TARGET_LIBSTDC++) + [ TargetLibsupc++ ] + [ TargetLibstdc++ ] ; diff --git a/src/bin/pkgman/Jamfile b/src/bin/pkgman/Jamfile index d55cb50ef2..d45885bb72 100644 --- a/src/bin/pkgman/Jamfile +++ b/src/bin/pkgman/Jamfile @@ -20,5 +20,5 @@ BinCommand pkgman : pkgman.cpp : libshared.a package be - $(TARGET_LIBSUPC++) $(TARGET_LIBSTDC++) + [ TargetLibsupc++ ] [ TargetLibstdc++ ] ; diff --git a/src/bin/playsound/Jamfile b/src/bin/playsound/Jamfile index 0c6b465be4..75593cff33 100644 --- a/src/bin/playsound/Jamfile +++ b/src/bin/playsound/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src bin playsound ; BinCommand playfile : playfile.cpp - : be media $(TARGET_LIBSUPC++) + : be media [ TargetLibsupc++ ] ; BinCommand playsound : @@ -12,5 +12,5 @@ BinCommand playsound : BinCommand playwav : playwav.cpp - : be media $(TARGET_LIBSUPC++) + : be media [ TargetLibsupc++ ] ; diff --git a/src/bin/rc/Jamfile b/src/bin/rc/Jamfile index a80e379e48..43bc689a1e 100644 --- a/src/bin/rc/Jamfile +++ b/src/bin/rc/Jamfile @@ -25,7 +25,7 @@ BinCommand rc : # these two are needed for R5 only $(strlSources) - : librdef.a $(TARGET_LIBSTDC++) be + : librdef.a [ TargetLibstdc++ ] be ; SEARCH on [ FGristFiles $(strlSources) ] diff --git a/src/bin/screen_blanker/Jamfile b/src/bin/screen_blanker/Jamfile index 89f5893e3d..f20b188ac1 100644 --- a/src/bin/screen_blanker/Jamfile +++ b/src/bin/screen_blanker/Jamfile @@ -16,7 +16,7 @@ BinCommand screen_blanker : # needed for some old/broken screen saver add-ons that do not # link against libscreensaver.so - : be game localestub libscreensaver.so $(TARGET_LIBSUPC++) + : be game localestub libscreensaver.so [ TargetLibsupc++ ] : screen_blanker.rdef ; diff --git a/src/bin/screenmode/Jamfile b/src/bin/screenmode/Jamfile index 3cec7da3b5..1f6da18ccb 100644 --- a/src/bin/screenmode/Jamfile +++ b/src/bin/screenmode/Jamfile @@ -15,5 +15,5 @@ BinCommand screenmode : multimon.cpp ScreenMode.cpp - : be $(TARGET_LIBSUPC++) libaccelerantscommon.a + : be [ TargetLibsupc++ ] libaccelerantscommon.a ; diff --git a/src/bin/writembr/Jamfile b/src/bin/writembr/Jamfile index c1d91014a3..858de0aaae 100644 --- a/src/bin/writembr/Jamfile +++ b/src/bin/writembr/Jamfile @@ -5,7 +5,7 @@ UsePrivateHeaders shared storage ; Application writembr : writembr.cpp - : be $(TARGET_LIBSUPC+++) $(TARGET_LIBSTDC++) + : be [ TargetLibstdc++ ] ; # Assemble the MBR code, and convert it into a header file diff --git a/src/data/package_infos/arm/haiku b/src/data/package_infos/arm/haiku index e44d5d9e41..375d3f1006 100644 --- a/src/data/package_infos/arm/haiku +++ b/src/data/package_infos/arm/haiku @@ -171,6 +171,7 @@ provides { requires { lib:libfreetype + lib:libgcc_s lib:libicudata lib:libicui18n lib:libicuio @@ -185,5 +186,7 @@ requires { #endif lib:libsolv lib:libsolvext + lib:libstdc++ + lib:libsupc++ lib:libz } diff --git a/src/data/package_infos/m68k/haiku b/src/data/package_infos/m68k/haiku index 5a1075fa9f..6e7ffbcb92 100644 --- a/src/data/package_infos/m68k/haiku +++ b/src/data/package_infos/m68k/haiku @@ -171,11 +171,14 @@ provides { requires { lib:libfreetype + lib:libgcc_s #ifdef HAIKU_REGULAR_BUILD lib:libjpeg lib:libpng #endif lib:libsolv lib:libsolvext + lib:libstdc++ + lib:libsupc++ lib:libz } diff --git a/src/data/package_infos/ppc/haiku b/src/data/package_infos/ppc/haiku index 04421c17b2..ee23d7c5b7 100644 --- a/src/data/package_infos/ppc/haiku +++ b/src/data/package_infos/ppc/haiku @@ -171,6 +171,7 @@ provides { requires { lib:libfreetype + lib:libgcc_s lib:libicudata lib:libicui18n lib:libicuio @@ -185,5 +186,7 @@ requires { #endif lib:libsolv lib:libsolvext + lib:libstdc++ + lib:libsupc++ lib:libz } diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku index 31398615b0..26c9a5ef7b 100644 --- a/src/data/package_infos/x86/haiku +++ b/src/data/package_infos/x86/haiku @@ -172,6 +172,7 @@ provides { requires { lib:libcurl lib:libfreetype + lib:libgcc_s lib:libicudata lib:libicui18n lib:libicuio @@ -186,5 +187,7 @@ requires { #endif lib:libsolv lib:libsolvext + lib:libstdc++ + lib:libsupc++ lib:libz } diff --git a/src/data/package_infos/x86_64/haiku b/src/data/package_infos/x86_64/haiku index 77b4b6a67b..0164b4afce 100644 --- a/src/data/package_infos/x86_64/haiku +++ b/src/data/package_infos/x86_64/haiku @@ -170,6 +170,7 @@ provides { requires { lib:libcurl + lib:libgcc_s lib:libfreetype lib:libicudata lib:libicui18n @@ -185,5 +186,7 @@ requires { #endif lib:libsolv lib:libsolvext + lib:libstdc++ + lib:libsupc++ lib:libz } diff --git a/src/data/package_infos/x86_64/haiku_secondary b/src/data/package_infos/x86_64/haiku_secondary index 225f9dfdc1..515e65fdeb 100644 --- a/src/data/package_infos/x86_64/haiku_secondary +++ b/src/data/package_infos/x86_64/haiku_secondary @@ -22,6 +22,7 @@ provides { requires { lib:libfreetype_%HAIKU_SECONDARY_PACKAGING_ARCH% + lib:libgcc_s_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicudata_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicui18n_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicuio_%HAIKU_SECONDARY_PACKAGING_ARCH% @@ -36,5 +37,7 @@ requires { #endif lib:libsolv_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libsolvext_%HAIKU_SECONDARY_PACKAGING_ARCH% + lib:libstdc++_%HAIKU_SECONDARY_PACKAGING_ARCH% + lib:libsupc++_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libz_%HAIKU_SECONDARY_PACKAGING_ARCH% } diff --git a/src/data/package_infos/x86_gcc2/haiku_secondary b/src/data/package_infos/x86_gcc2/haiku_secondary index 6769d67a23..74dbeb520c 100644 --- a/src/data/package_infos/x86_gcc2/haiku_secondary +++ b/src/data/package_infos/x86_gcc2/haiku_secondary @@ -23,6 +23,7 @@ provides { requires { lib:libfreetype_%HAIKU_SECONDARY_PACKAGING_ARCH% + lib:libgcc_s_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicudata_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicui18n_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicuio_%HAIKU_SECONDARY_PACKAGING_ARCH% @@ -38,5 +39,7 @@ requires { #endif lib:libsolv_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libsolvext_%HAIKU_SECONDARY_PACKAGING_ARCH% + lib:libstdc++_%HAIKU_SECONDARY_PACKAGING_ARCH% + lib:libsupc++_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libz_%HAIKU_SECONDARY_PACKAGING_ARCH% } diff --git a/src/kits/Jamfile b/src/kits/Jamfile index 7355df6ae7..c617aef1f1 100644 --- a/src/kits/Jamfile +++ b/src/kits/Jamfile @@ -45,7 +45,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { [ MultiArchDefaultGristFiles libicon.a ] [ MultiArchDefaultGristFiles libagg.a ] - $(TARGET_LIBSTDC++) + [ TargetLibstdc++ ] [ BuildFeatureAttribute icu : libraries ] [ BuildFeatureAttribute zlib : library ] ; @@ -73,7 +73,7 @@ SharedLibrary libbe_test.so : [ MultiArchDefaultGristFiles libicon.a ] [ MultiArchDefaultGristFiles libagg.a ] - $(TARGET_LIBSTDC++) + [ TargetLibstdc++ ] [ BuildFeatureAttribute icu : libraries ] [ BuildFeatureAttribute zlib : library ] ; diff --git a/src/kits/bluetooth/Jamfile b/src/kits/bluetooth/Jamfile index 848b32d145..2bc4091d6f 100644 --- a/src/kits/bluetooth/Jamfile +++ b/src/kits/bluetooth/Jamfile @@ -24,7 +24,7 @@ SharedLibrary libbluetooth.so : #UI PincodeWindow.cpp ConnectionIncoming.cpp - : be localestub $(TARGET_LIBSTDC++) + : be localestub [ TargetLibstdc++ ] ; DoCatalogs libbluetooth.so : diff --git a/src/kits/debug/Jamfile b/src/kits/debug/Jamfile index b054398fc3..1ad0f841ee 100644 --- a/src/kits/debug/Jamfile +++ b/src/kits/debug/Jamfile @@ -33,7 +33,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { # architecture specific arch_debug_support.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; } } diff --git a/src/kits/device/Jamfile b/src/kits/device/Jamfile index e247eaa575..933345ce95 100644 --- a/src/kits/device/Jamfile +++ b/src/kits/device/Jamfile @@ -22,7 +22,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { USBEndpoint.cpp USBInterface.cpp USBRoster.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; } } diff --git a/src/kits/game/Jamfile b/src/kits/game/Jamfile index 7cac4199ae..9a1a6bba35 100644 --- a/src/kits/game/Jamfile +++ b/src/kits/game/Jamfile @@ -30,7 +30,7 @@ if $(TARGET_PLATFORM) = haiku { GameSoundBuffer.cpp GameSoundDevice.cpp GSUtility.cpp - : be media $(TARGET_LIBSUPC++) + : be media [ TargetLibsupc++ ] ; } } diff --git a/src/kits/mail/Jamfile b/src/kits/mail/Jamfile index bf29978d27..6f6bcdd9ed 100644 --- a/src/kits/mail/Jamfile +++ b/src/kits/mail/Jamfile @@ -58,7 +58,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { $(sources) : be bnetapi textencoding tracker - $(TARGET_LIBSTDC++) + [ TargetLibstdc++ ] $(TARGET_NETWORK_LIBS) $(TARGET_SELECT_UNAME_ETC_LIB) [ BuildFeatureAttribute openssl : libraries ] diff --git a/src/kits/media/Jamfile b/src/kits/media/Jamfile index 907794cdac..5f049a1826 100644 --- a/src/kits/media/Jamfile +++ b/src/kits/media/Jamfile @@ -86,7 +86,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { ReaderPlugin.cpp WriterPlugin.cpp : - be $(TARGET_LIBSUPC++) $(TARGET_LIBSTDC++) + be [ TargetLibsupc++ ] [ TargetLibstdc++ ] ; } } diff --git a/src/kits/midi/Jamfile b/src/kits/midi/Jamfile index decec19133..85d4e72a82 100644 --- a/src/kits/midi/Jamfile +++ b/src/kits/midi/Jamfile @@ -30,7 +30,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { midi2 media [ MultiArchDefaultGristFiles libfluidsynth.so ] - $(TARGET_LIBSUPC++) + [ TargetLibsupc++ ] ; } } diff --git a/src/kits/midi2/Jamfile b/src/kits/midi2/Jamfile index 1660f8e027..cd33c7f063 100644 --- a/src/kits/midi2/Jamfile +++ b/src/kits/midi2/Jamfile @@ -21,7 +21,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { MidiRoster.cpp MidiRosterLooper.cpp : - be $(TARGET_LIBSUPC++) + be [ TargetLibsupc++ ] ; } } diff --git a/src/kits/network/Jamfile b/src/kits/network/Jamfile index 6725088f97..c57bdd8a8b 100644 --- a/src/kits/network/Jamfile +++ b/src/kits/network/Jamfile @@ -20,7 +20,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { r5_compatibility.cpp : libbind.o - $(TARGET_LIBSUPC++) + [ TargetLibsupc++ ] ; AddFileDataAttribute $(libnetwork) : services : string : $(services) ; diff --git a/src/kits/network/libnetapi/Jamfile b/src/kits/network/libnetapi/Jamfile index fb8da38eb9..4aaf8800db 100644 --- a/src/kits/network/libnetapi/Jamfile +++ b/src/kits/network/libnetapi/Jamfile @@ -88,7 +88,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { UrlSynchronousRequest.cpp : - be $(TARGET_NETWORK_LIBS) $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++) + be $(TARGET_NETWORK_LIBS) [ TargetLibstdc++ ] [ TargetLibsupc++ ] [ BuildFeatureAttribute openssl : libraries ] [ MultiArchDefaultGristFiles libshared.a ] ; diff --git a/src/kits/package/Jamfile b/src/kits/package/Jamfile index b5d4fe98ed..bdac6e15d8 100644 --- a/src/kits/package/Jamfile +++ b/src/kits/package/Jamfile @@ -132,7 +132,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { [ MultiArchDefaultGristFiles libshared.a ] be [ BuildFeatureAttribute curl : library ] - $(TARGET_LIBSTDC++) + [ TargetLibstdc++ ] ; } } diff --git a/src/kits/package/solver/Jamfile b/src/kits/package/solver/Jamfile index 32e3e2812f..e9f8bdb0f2 100644 --- a/src/kits/package/solver/Jamfile +++ b/src/kits/package/solver/Jamfile @@ -21,7 +21,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { : package [ BuildFeatureAttribute libsolv : libraries ] - be $(TARGET_LIBSTDC++) + be [ TargetLibstdc++ ] ; diff --git a/src/kits/screensaver/Jamfile b/src/kits/screensaver/Jamfile index c9f508b930..ff742c7d60 100644 --- a/src/kits/screensaver/Jamfile +++ b/src/kits/screensaver/Jamfile @@ -16,7 +16,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { ScreenSaverSettings.cpp ScreenSaverRunner.cpp : - be game $(TARGET_LIBSUPC++) + be game [ TargetLibsupc++ ] ; } } diff --git a/src/kits/textencoding/Jamfile b/src/kits/textencoding/Jamfile index be4b656cd1..a73aaf178f 100644 --- a/src/kits/textencoding/Jamfile +++ b/src/kits/textencoding/Jamfile @@ -19,7 +19,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { : be [ MultiArchDefaultGristFiles libiconv.a ] - $(TARGET_LIBSUPC++) localestub ; + [ TargetLibsupc++ ] localestub ; } } diff --git a/src/kits/tracker/Jamfile b/src/kits/tracker/Jamfile index c9486e1e48..e6e5dfb0d9 100644 --- a/src/kits/tracker/Jamfile +++ b/src/kits/tracker/Jamfile @@ -100,7 +100,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { WidgetAttributeText.cpp : - be translation $(vectorIconLibs) $(TARGET_LIBSTDC++) localestub + be translation $(vectorIconLibs) [ TargetLibstdc++ ] localestub [ MultiArchDefaultGristFiles libshared.a ] [ MultiArchDefaultGristFiles libshortcuts_shared.a ] ; diff --git a/src/kits/translation/Jamfile b/src/kits/translation/Jamfile index 1a35c34d55..e9b25bfdc7 100644 --- a/src/kits/translation/Jamfile +++ b/src/kits/translation/Jamfile @@ -21,7 +21,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { Translator.cpp TranslatorRoster.cpp - : be textencoding $(TARGET_LIBSTDC++) + : be textencoding [ TargetLibstdc++ ] ; } } diff --git a/src/libs/alm/Jamfile b/src/libs/alm/Jamfile index b79e3df69f..b10809cb46 100644 --- a/src/libs/alm/Jamfile +++ b/src/libs/alm/Jamfile @@ -21,7 +21,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { Tab.cpp : [ MultiArchDefaultGristFiles liblinprog.a ] - be $(TARGET_LIBSTDC++) + be [ TargetLibstdc++ ] ; } } diff --git a/src/libs/glut/Jamfile b/src/libs/glut/Jamfile index 6daf5b3c98..2cdb02e6e4 100644 --- a/src/libs/glut/Jamfile +++ b/src/libs/glut/Jamfile @@ -67,7 +67,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { $(sourcesCpp) $(sourcesCc) : - game be $(TARGET_LIBSTDC++) + game be [ TargetLibstdc++ ] [ BuildFeatureAttribute mesa : library ] [ BuildFeatureAttribute glu : library ] ; diff --git a/src/libs/stdc++/Jamfile b/src/libs/stdc++/Jamfile index d5b8441f74..03b2965584 100644 --- a/src/libs/stdc++/Jamfile +++ b/src/libs/stdc++/Jamfile @@ -4,8 +4,4 @@ if $(TARGET_PLATFORM) = haiku { if x86_gcc2 in $(TARGET_PACKAGING_ARCHS) { HaikuSubInclude legacy ; } - - if $(TARGET_PACKAGING_ARCHS) != x86_gcc2 { - HaikuSubInclude current ; - } } diff --git a/src/preferences/appearance/Jamfile b/src/preferences/appearance/Jamfile index e78f2ea108..9b82841533 100644 --- a/src/preferences/appearance/Jamfile +++ b/src/preferences/appearance/Jamfile @@ -28,7 +28,7 @@ Preference Appearance : #FontMenu.cpp #MenuView.cpp - : be $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++) localestub + : be [ TargetLibstdc++ ] [ TargetLibsupc++ ] localestub : Appearance.rdef ; diff --git a/src/preferences/backgrounds/Jamfile b/src/preferences/backgrounds/Jamfile index b537b7ac0e..3d134f5cde 100644 --- a/src/preferences/backgrounds/Jamfile +++ b/src/preferences/backgrounds/Jamfile @@ -7,7 +7,7 @@ Preference Backgrounds : Backgrounds.cpp BackgroundsView.cpp ImageFilePanel.cpp - : be tracker translation $(TARGET_LIBSUPC++) localestub + : be tracker translation [ TargetLibsupc++ ] localestub : Backgrounds.rdef ; diff --git a/src/preferences/bluetooth/Jamfile b/src/preferences/bluetooth/Jamfile index 82452ba2be..339321da37 100644 --- a/src/preferences/bluetooth/Jamfile +++ b/src/preferences/bluetooth/Jamfile @@ -15,7 +15,7 @@ Preference Bluetooth : ExtendedLocalDeviceView.cpp InquiryPanel.cpp RemoteDevicesView.cpp - : be libbluetooth.so $(TARGET_LIBSUPC++) localestub + : be libbluetooth.so [ TargetLibsupc++ ] localestub ; DoCatalogs Bluetooth : diff --git a/src/preferences/datatranslations/Jamfile b/src/preferences/datatranslations/Jamfile index c88b84da4a..8c2ef905db 100644 --- a/src/preferences/datatranslations/Jamfile +++ b/src/preferences/datatranslations/Jamfile @@ -10,7 +10,7 @@ Preference DataTranslations : DataTranslationsSettings.cpp TranslatorListView.cpp - : be translation $(TARGET_LIBSUPC++) localestub libshared.a + : be translation [ TargetLibsupc++ ] localestub libshared.a : DataTranslations.rdef ; diff --git a/src/preferences/dun/Jamfile b/src/preferences/dun/Jamfile index 1b3deb2637..1aa703c903 100644 --- a/src/preferences/dun/Jamfile +++ b/src/preferences/dun/Jamfile @@ -13,4 +13,4 @@ Preference DialUpNetworking : DUNWindow.cpp NewConnectionWindow.cpp ; -LinkAgainst DialUpNetworking : be tracker $(TARGET_LIBSTDC++) ; \ No newline at end of file +LinkAgainst DialUpNetworking : be tracker [ TargetLibstdc++ ] ; \ No newline at end of file diff --git a/src/preferences/filetypes/Jamfile b/src/preferences/filetypes/Jamfile index 4244c50604..23789cbf38 100644 --- a/src/preferences/filetypes/Jamfile +++ b/src/preferences/filetypes/Jamfile @@ -25,7 +25,7 @@ Preference FileTypes : PreferredAppMenu.cpp StringView.cpp - : be tracker $(TARGET_LIBSUPC++) localestub + : be tracker [ TargetLibsupc++ ] localestub : FileTypes.rdef FileTypes.icons.rdef ; diff --git a/src/preferences/fonts/Jamfile b/src/preferences/fonts/Jamfile index 168ca5d3c3..33c9618db4 100644 --- a/src/preferences/fonts/Jamfile +++ b/src/preferences/fonts/Jamfile @@ -6,7 +6,7 @@ Preference Fonts : FontView.cpp main.cpp MainWindow.cpp - : be $(TARGET_LIBSUPC++) localestub + : be [ TargetLibsupc++ ] localestub : Fonts.rdef ; diff --git a/src/preferences/joysticks/Jamfile b/src/preferences/joysticks/Jamfile index 172aa4e7a3..012246f6e8 100644 --- a/src/preferences/joysticks/Jamfile +++ b/src/preferences/joysticks/Jamfile @@ -8,7 +8,7 @@ Preference Joysticks : Joysticks.cpp MessageWin.cpp PortItem.cpp - : be libdevice.so $(TARGET_LIBSUPC++) + : be libdevice.so [ TargetLibsupc++ ] : Joysticks.rdef ; diff --git a/src/preferences/keyboard/Jamfile b/src/preferences/keyboard/Jamfile index 80db6e39ae..4c3a6d521c 100644 --- a/src/preferences/keyboard/Jamfile +++ b/src/preferences/keyboard/Jamfile @@ -14,7 +14,7 @@ Preference Keyboard : KeyboardSettings.cpp KeyboardView.cpp KeyboardWindow.cpp - : translation be $(TARGET_LIBSUPC++) localestub + : translation be [ TargetLibsupc++ ] localestub : Keyboard.rdef ; diff --git a/src/preferences/keymap/Jamfile b/src/preferences/keymap/Jamfile index 10a294f301..a342714434 100644 --- a/src/preferences/keymap/Jamfile +++ b/src/preferences/keymap/Jamfile @@ -21,7 +21,7 @@ Preference Keymap : KeymapWindow.cpp ModifierKeysWindow.cpp - : be tracker localestub libshared.a $(TARGET_LIBSTDC++) + : be tracker localestub libshared.a [ TargetLibstdc++ ] : Keymap.rdef ; diff --git a/src/preferences/locale/Jamfile b/src/preferences/locale/Jamfile index 0868f6f9e6..9e2d7e93ec 100644 --- a/src/preferences/locale/Jamfile +++ b/src/preferences/locale/Jamfile @@ -11,7 +11,7 @@ local sources = Preference Locale : $(sources) - : be $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++) libshared.a + : be [ TargetLibstdc++ ] [ TargetLibsupc++ ] libshared.a localestub : Locale.rdef ; diff --git a/src/preferences/mail/Jamfile b/src/preferences/mail/Jamfile index 460ecca841..6b89f8174b 100644 --- a/src/preferences/mail/Jamfile +++ b/src/preferences/mail/Jamfile @@ -29,8 +29,8 @@ Preference E-mail : $(sources) : - be libmail.so $(HAIKU_NETWORK_LIBS) $(TARGET_NETAPI_LIB) $(TARGET_LIBSTDC++) - $(TARGET_LIBSUPC++) localestub + be libmail.so $(HAIKU_NETWORK_LIBS) $(TARGET_NETAPI_LIB) [ TargetLibstdc++ ] + [ TargetLibsupc++ ] localestub ; DoCatalogs E-mail diff --git a/src/preferences/media/Jamfile b/src/preferences/media/Jamfile index 048a55e745..e585392e73 100644 --- a/src/preferences/media/Jamfile +++ b/src/preferences/media/Jamfile @@ -15,7 +15,7 @@ Preference Media : MediaListItem.cpp MediaViews.cpp MediaWindow.cpp - : media be localestub $(TARGET_LIBSUPC++) + : media be localestub [ TargetLibsupc++ ] : media.rdef ; diff --git a/src/preferences/mouse/Jamfile b/src/preferences/mouse/Jamfile index 0cd82cf7bb..4fd30cca2a 100644 --- a/src/preferences/mouse/Jamfile +++ b/src/preferences/mouse/Jamfile @@ -8,7 +8,7 @@ Preference Mouse : MouseWindow.cpp MouseView.cpp SettingsView.cpp - : translation be $(TARGET_LIBSUPC++) localestub + : translation be [ TargetLibsupc++ ] localestub : Mouse.rdef ; diff --git a/src/preferences/network/Jamfile b/src/preferences/network/Jamfile index 515a90ba1b..01fac7fed0 100644 --- a/src/preferences/network/Jamfile +++ b/src/preferences/network/Jamfile @@ -13,7 +13,7 @@ Preference Network : RadioView.cpp WirelessNetworkMenuItem.cpp - : be $(HAIKU_NETWORK_LIBS) $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++) + : be $(HAIKU_NETWORK_LIBS) [ TargetLibstdc++ ] [ TargetLibsupc++ ] localestub libbnetapi.so : Network.rdef ; diff --git a/src/preferences/notifications/Jamfile b/src/preferences/notifications/Jamfile index 10f2613922..fe980aea82 100644 --- a/src/preferences/notifications/Jamfile +++ b/src/preferences/notifications/Jamfile @@ -12,7 +12,7 @@ Application Notifications : GeneralView.cpp DisplayView.cpp NotificationsView.cpp - : be translation libcolumnlistview.a libnotification.a $(TARGET_LIBSTDC++) localestub + : be translation libcolumnlistview.a libnotification.a [ TargetLibstdc++ ] localestub : Notifications.rdef ; diff --git a/src/preferences/printers/Jamfile b/src/preferences/printers/Jamfile index 4fdf9da0db..3944c92d7b 100644 --- a/src/preferences/printers/Jamfile +++ b/src/preferences/printers/Jamfile @@ -16,7 +16,7 @@ Preference Printers : be translation libprintutils.a - $(TARGET_LIBSUPC++) + [ TargetLibsupc++ ] localestub : Printers.rdef diff --git a/src/preferences/screen/Jamfile b/src/preferences/screen/Jamfile index 8327ac3278..d2370cd486 100644 --- a/src/preferences/screen/Jamfile +++ b/src/preferences/screen/Jamfile @@ -19,7 +19,7 @@ Preference Screen : ScreenSettings.cpp ScreenWindow.cpp Utility.cpp - : be $(TARGET_LIBSUPC++) localestub libaccelerantscommon.a + : be [ TargetLibsupc++ ] localestub libaccelerantscommon.a : Screen.rdef ; diff --git a/src/preferences/screensaver/Jamfile b/src/preferences/screensaver/Jamfile index 715065b3d3..32bada46d5 100644 --- a/src/preferences/screensaver/Jamfile +++ b/src/preferences/screensaver/Jamfile @@ -18,7 +18,7 @@ Preference ScreenSaver : ScreenSaver.cpp # needed for some old/broken screen saver add-ons that do not # link against libscreensaver.so - : be game libscreensaver.so localestub tracker $(TARGET_LIBSTDC++) + : be game libscreensaver.so localestub tracker [ TargetLibstdc++ ] : ScreenSaver.rdef ; diff --git a/src/preferences/shortcuts/Jamfile b/src/preferences/shortcuts/Jamfile index efa90535b0..6ac4a3e2c4 100644 --- a/src/preferences/shortcuts/Jamfile +++ b/src/preferences/shortcuts/Jamfile @@ -19,7 +19,7 @@ Preference Shortcuts : PrefilledBitmap.cpp ScrollViewCorner.cpp - : be localestub tracker libshortcuts_shared.a $(TARGET_LIBSTDC++) + : be localestub tracker libshortcuts_shared.a [ TargetLibstdc++ ] : Shortcuts.rdef ; diff --git a/src/preferences/sounds/Jamfile b/src/preferences/sounds/Jamfile index 92ee5d040c..ce7f153218 100644 --- a/src/preferences/sounds/Jamfile +++ b/src/preferences/sounds/Jamfile @@ -9,7 +9,7 @@ Preference Sounds : HWindow.cpp HEventList.cpp : be libcolumnlistview.a game localestub tracker libmedia.so - $(TARGET_LIBSUPC++) + [ TargetLibsupc++ ] : Sounds.rdef ; diff --git a/src/preferences/time/Jamfile b/src/preferences/time/Jamfile index 9b5fa9b5e4..fc0d2cf1e0 100644 --- a/src/preferences/time/Jamfile +++ b/src/preferences/time/Jamfile @@ -32,7 +32,7 @@ Includes [ FGristFiles $(sources) ] : [ BuildFeatureAttribute icu : headers ] ; Preference Time : $(sources) - : be libshared.a $(TARGET_LIBSTDC++) localestub $(HAIKU_NETWORK_LIBS) + : be libshared.a [ TargetLibstdc++ ] localestub $(HAIKU_NETWORK_LIBS) : Time.rdef ; diff --git a/src/preferences/touchpad/Jamfile b/src/preferences/touchpad/Jamfile index 684eb85107..c6c9a45c26 100644 --- a/src/preferences/touchpad/Jamfile +++ b/src/preferences/touchpad/Jamfile @@ -6,7 +6,7 @@ Preference Touchpad : TouchpadPref.cpp TouchpadPrefView.cpp main.cpp - : be $(TARGET_LIBSUPC++) localestub + : be [ TargetLibsupc++ ] localestub : Touchpad.rdef ; diff --git a/src/preferences/virtualmemory/Jamfile b/src/preferences/virtualmemory/Jamfile index f35c2236c0..259afb54fb 100644 --- a/src/preferences/virtualmemory/Jamfile +++ b/src/preferences/virtualmemory/Jamfile @@ -8,7 +8,7 @@ Preference VirtualMemory : Settings.cpp $(DRIVER_SETTINGS) - : be libshared.a $(TARGET_LIBSTDC++) localestub + : be libshared.a [ TargetLibstdc++ ] localestub : VirtualMemory.rdef ; diff --git a/src/servers/app/Jamfile b/src/servers/app/Jamfile index d3910b8889..024088b061 100644 --- a/src/servers/app/Jamfile +++ b/src/servers/app/Jamfile @@ -101,7 +101,7 @@ Server app_server : libasdrawing.a libpainter.a libagg.a [ BuildFeatureAttribute freetype : library ] libstackandtile.a liblinprog.a libtextencoding.so libshared.a - $(TARGET_LIBSTDC++) + [ TargetLibstdc++ ] : app_server.rdef ; diff --git a/src/servers/bluetooth/Jamfile b/src/servers/bluetooth/Jamfile index e620e4ec46..c91bdf5817 100644 --- a/src/servers/bluetooth/Jamfile +++ b/src/servers/bluetooth/Jamfile @@ -17,5 +17,5 @@ Server bluetooth_server LocalDeviceImpl.cpp Output.cpp : be network libbluetooth.so - $(TARGET_LIBSTDC++) + [ TargetLibstdc++ ] ; diff --git a/src/servers/cddb_daemon/Jamfile b/src/servers/cddb_daemon/Jamfile index f75bf483ef..61ed08d242 100644 --- a/src/servers/cddb_daemon/Jamfile +++ b/src/servers/cddb_daemon/Jamfile @@ -7,5 +7,5 @@ AddResources cddb_daemon : cddb_daemon.rdef ; Server cddb_daemon : cddb_daemon.cpp cddb_server.cpp - : be bnetapi $(TARGET_LIBSUPC++) + : be bnetapi [ TargetLibsupc++ ] ; diff --git a/src/servers/debug/Jamfile b/src/servers/debug/Jamfile index 947af468fe..71ba507842 100644 --- a/src/servers/debug/Jamfile +++ b/src/servers/debug/Jamfile @@ -15,7 +15,7 @@ Server debug_server be libdebug.so libshared.a - $(TARGET_LIBSTDC++) + [ TargetLibstdc++ ] localestub ; diff --git a/src/servers/index/Jamfile b/src/servers/index/Jamfile index bbe6811c77..aef999a30c 100644 --- a/src/servers/index/Jamfile +++ b/src/servers/index/Jamfile @@ -17,7 +17,7 @@ Server index_server : NodeMonitorHandler.cpp : be - $(TARGET_LIBSTDC++) + [ TargetLibstdc++ ] ; SEARCH on [ FGristFiles AddOnMonitorHandler.cpp NodeMonitorHandler.cpp ] diff --git a/src/servers/input/Jamfile b/src/servers/input/Jamfile index 37737970fd..2aa0569931 100644 --- a/src/servers/input/Jamfile +++ b/src/servers/input/Jamfile @@ -61,7 +61,7 @@ Server input_server : AddOnMonitorHandler.cpp NodeMonitorHandler.cpp - : be $(TARGET_LIBSTDC++) + : be [ TargetLibstdc++ ] ; Includes [ FGristFiles InputServer.cpp ] : [ FGristFiles SystemKeymap.h ] ; diff --git a/src/servers/keystore/Jamfile b/src/servers/keystore/Jamfile index b89085a58e..3237a52781 100644 --- a/src/servers/keystore/Jamfile +++ b/src/servers/keystore/Jamfile @@ -8,6 +8,6 @@ Server keystore_server : Keyring.cpp KeyStoreServer.cpp - : be $(TARGET_LIBSTDC++) + : be [ TargetLibstdc++ ] : keystore_server.rdef ; diff --git a/src/servers/mail/Jamfile b/src/servers/mail/Jamfile index 1fceea8fe7..54c6772814 100644 --- a/src/servers/mail/Jamfile +++ b/src/servers/mail/Jamfile @@ -19,7 +19,7 @@ Server mail_daemon : MailDaemon.cpp main.cpp Notifier.cpp - : be libmail.so tracker localestub $(TARGET_LIBSTDC++) + : be libmail.so tracker localestub [ TargetLibstdc++ ] $(TARGET_NETWORK_LIBS) ; diff --git a/src/servers/media/Jamfile b/src/servers/media/Jamfile index eaf3b213e9..c5edb718a8 100644 --- a/src/servers/media/Jamfile +++ b/src/servers/media/Jamfile @@ -22,7 +22,7 @@ Server media_server : AddOnMonitorHandler.cpp NodeMonitorHandler.cpp - : be libmedia.so $(TARGET_LIBSTDC++) + : be libmedia.so [ TargetLibstdc++ ] ; SEARCH on [ FGristFiles AddOnMonitor.cpp AddOnMonitorHandler.cpp diff --git a/src/servers/media_addon/Jamfile b/src/servers/media_addon/Jamfile index 084f48d742..1de8066f71 100644 --- a/src/servers/media_addon/Jamfile +++ b/src/servers/media_addon/Jamfile @@ -16,7 +16,7 @@ Server media_addon_server : AddOnMonitorHandler.cpp NodeMonitorHandler.cpp : - be libmedia.so game $(TARGET_LIBSUPC++) $(TARGET_LIBSTDC++) + be libmedia.so game [ TargetLibsupc++ ] [ TargetLibstdc++ ] ; SEARCH on [ FGristFiles AddOnMonitorHandler.cpp NodeMonitorHandler.cpp ] diff --git a/src/servers/midi/Jamfile b/src/servers/midi/Jamfile index fb54958865..37a022f588 100644 --- a/src/servers/midi/Jamfile +++ b/src/servers/midi/Jamfile @@ -12,7 +12,7 @@ Server midi_server : # storage NodeMonitorHandler.cpp - : be midi2 libshared.a libicon.a $(TARGET_LIBSTDC++) + : be midi2 libshared.a libicon.a [ TargetLibstdc++ ] : midi_server.rdef ; diff --git a/src/servers/mount/Jamfile b/src/servers/mount/Jamfile index 3d1a658922..15fa0d58b7 100644 --- a/src/servers/mount/Jamfile +++ b/src/servers/mount/Jamfile @@ -8,7 +8,7 @@ Server mount_server # AutoMounterSettings.cpp : libbe.so localestub - $(TARGET_LIBSTDC++) + [ TargetLibstdc++ ] : mount_server.rdef ; diff --git a/src/servers/net/Jamfile b/src/servers/net/Jamfile index aaabce3200..3e1e087d9e 100644 --- a/src/servers/net/Jamfile +++ b/src/servers/net/Jamfile @@ -23,7 +23,7 @@ Server net_server : DHCPClient.cpp Services.cpp - : be network bnetapi $(TARGET_LIBSTDC++) libshared.a + : be network bnetapi [ TargetLibstdc++ ] libshared.a # for PPP #libppp.a ; diff --git a/src/servers/notification/Jamfile b/src/servers/notification/Jamfile index d11a04503f..def4c22604 100644 --- a/src/servers/notification/Jamfile +++ b/src/servers/notification/Jamfile @@ -7,7 +7,7 @@ Server notification_server : NotificationServer.cpp NotificationView.cpp NotificationWindow.cpp - : be translation $(TARGET_LIBSTDC++) libnotification.a localestub + : be translation [ TargetLibstdc++ ] libnotification.a localestub : notification_server.rdef ; diff --git a/src/servers/package/Jamfile b/src/servers/package/Jamfile index 58ca48c380..b7b944c3e1 100644 --- a/src/servers/package/Jamfile +++ b/src/servers/package/Jamfile @@ -25,7 +25,7 @@ Server package_daemon VolumeState.cpp : be package - $(TARGET_LIBSTDC++) + [ TargetLibstdc++ ] : package_daemon.rdef ; diff --git a/src/servers/power/Jamfile b/src/servers/power/Jamfile index 9ab72a5b5a..4027cd541b 100644 --- a/src/servers/power/Jamfile +++ b/src/servers/power/Jamfile @@ -10,4 +10,4 @@ Server power_daemon : power_button_monitor.cpp ; -LinkAgainst power_daemon : be $(TARGET_LIBSUPC++) ; +LinkAgainst power_daemon : be [ TargetLibsupc++ ] ; diff --git a/src/servers/print/Jamfile b/src/servers/print/Jamfile index 7649d15dd2..1d9fdfbd4e 100644 --- a/src/servers/print/Jamfile +++ b/src/servers/print/Jamfile @@ -27,7 +27,7 @@ LinkAgainst print_server : localestub libprint.a libprintutils.a - $(TARGET_LIBSUPC++) + [ TargetLibsupc++ ] ; DoCatalogs print_server : diff --git a/src/servers/print_addon/Jamfile b/src/servers/print_addon/Jamfile index e896271edb..348a099ac6 100644 --- a/src/servers/print_addon/Jamfile +++ b/src/servers/print_addon/Jamfile @@ -15,5 +15,5 @@ LinkAgainst print_addon_server : root libprintutils.a localestub - $(TARGET_LIBSUPC++) + [ TargetLibsupc++ ] ; diff --git a/src/servers/registrar/Jamfile b/src/servers/registrar/Jamfile index 7aef8a29bf..f7580ce0aa 100644 --- a/src/servers/registrar/Jamfile +++ b/src/servers/registrar/Jamfile @@ -48,7 +48,7 @@ Server registrar : libstorage_kit_mime.a be - $(TARGET_LIBSTDC++) + [ TargetLibstdc++ ] localestub : registrar.rdef diff --git a/src/servers/services_daemon/Jamfile b/src/servers/services_daemon/Jamfile index bf99b59342..74151ae2af 100644 --- a/src/servers/services_daemon/Jamfile +++ b/src/servers/services_daemon/Jamfile @@ -4,6 +4,6 @@ SetSubDirSupportedPlatformsBeOSCompatible ; Application services_daemon : ServicesDaemon.cpp - : be media $(TARGET_LIBSUPC++) + : be media [ TargetLibsupc++ ] : ServicesDaemon.rdef ; diff --git a/src/servers/syslog_daemon/Jamfile b/src/servers/syslog_daemon/Jamfile index 455afda7d1..1d37179954 100644 --- a/src/servers/syslog_daemon/Jamfile +++ b/src/servers/syslog_daemon/Jamfile @@ -13,7 +13,7 @@ Server syslog_daemon : # ToDo: this can be removed for the Haiku build strlcpy.c : - be $(TARGET_LIBSUPC++) localestub + be [ TargetLibsupc++ ] localestub ; DoCatalogs syslog_daemon : diff --git a/src/system/kernel/Jamfile b/src/system/kernel/Jamfile index 8a4fd0f436..1a4b4b5b2e 100644 --- a/src/system/kernel/Jamfile +++ b/src/system/kernel/Jamfile @@ -132,8 +132,6 @@ KernelLd kernel_$(TARGET_ARCH) : kernel_lib_posix_arch_$(TARGET_ARCH).o kernel_misc.o - $(TARGET_KERNEL_LIBSUPC++) - : $(HAIKU_TOP)/src/system/ldscripts/$(TARGET_ARCH)/kernel.ld : -Bdynamic -export-dynamic -dynamic-linker /foo/bar $(TARGET_KERNEL_PIC_LINKFLAGS) @@ -174,8 +172,6 @@ if $(HAIKU_ARCH) in x86_64 arm { kernel_lib_posix_arch_$(TARGET_ARCH).o kernel_misc.o - $(TARGET_KERNEL_LIBSUPC++) - : $(HAIKU_TOP)/src/system/ldscripts/$(TARGET_ARCH)/kernel.ld : -Bdynamic -shared -export-dynamic -dynamic-linker /foo/bar $(TARGET_KERNEL_PIC_LINKFLAGS) diff --git a/src/system/kernel/util/Jamfile b/src/system/kernel/util/Jamfile index 42fa42e0fe..e7e7e407e7 100644 --- a/src/system/kernel/util/Jamfile +++ b/src/system/kernel/util/Jamfile @@ -18,5 +18,5 @@ KernelMergeObject kernel_util.o : Random.cpp StringHash.cpp - : $(TARGET_KERNEL_PIC_CCFLAGS) -DUSING_LIBGCC + : $(TARGET_KERNEL_PIC_CCFLAGS) ; diff --git a/src/system/kernel/util/kernel_cpp.cpp b/src/system/kernel/util/kernel_cpp.cpp index ad2b50b49c..a4ab706705 100644 --- a/src/system/kernel/util/kernel_cpp.cpp +++ b/src/system/kernel/util/kernel_cpp.cpp @@ -29,17 +29,6 @@ // Always define the symbols needed when not linking against libgcc.a -- // we simply override them. -// ... it doesn't seem to work with this symbol at least. -#ifndef USING_LIBGCC -# if __GNUC__ >= 3 -const std::nothrow_t std::nothrow = {}; -# else -const nothrow_t std::nothrow = {}; -# endif -#endif - -const mynothrow_t mynothrow = {}; - #if __GNUC__ == 2 extern "C" void @@ -171,6 +160,13 @@ _Unwind_GetIP() panic("_Unwind_GetIP"); } +extern "C" +void +_Unwind_GetIPInfo() +{ + panic("_Unwind_GetIPInfo"); +} + extern "C" void _Unwind_GetLanguageSpecificData() diff --git a/src/system/libroot/Jamfile b/src/system/libroot/Jamfile index 3a9edc44c7..06394bc9fb 100644 --- a/src/system/libroot/Jamfile +++ b/src/system/libroot/Jamfile @@ -2,33 +2,6 @@ SubDir HAIKU_TOP src system libroot ; UsePrivateHeaders libroot runtime_loader ; -rule FilterArchive -{ - # FilterArchive : : - - # set the tools according to the platform - AR on $(1) = $(TARGET_AR_$(TARGET_PACKAGING_ARCH)) d ; - # TODO: use $(TARGET_DELARFLAGS_$(TARGET_PACKAGING_ARCH)) - RANLIB on $(1) = $(TARGET_RANLIB_$(TARGET_PACKAGING_ARCH)) ; - MEMBERS on $(1) = $(3) ; - - MakeLocateArch $(1) ; - Depends $(1) : $(2) ; - File $(1) : $(2) ; - - # delete the unwanted members - FilterArchive1 $(1) ; - - if $(RANLIB) { - Ranlib $(1) ; - } -} - -actions FilterArchive1 -{ - $(AR) $(<) $(MEMBERS) -} - local architectureObject ; for architectureObject in [ MultiArchSubDirSetup ] { on $(architectureObject) { @@ -36,24 +9,21 @@ for architectureObject in [ MultiArchSubDirSetup ] { UsePrivateSystemHeaders ; - # Make a copy of libgcc without the objects we don't need - FilterArchive <$(architecture)>libroot_libgcc_$(TARGET_ARCH).a - : $(HAIKU_GCC_LIBGCC_$(architecture)) - : $(HAIKU_GCC_LIBGCC_OBJECTS_EXCLUDES_$(architecture)) ; - - # One object to link them all... - TARGET_LDFLAGS_$(TARGET_PACKAGING_ARCH) on - <$(architecture)>libroot_libgcc_$(TARGET_ARCH).o = - [ on <$(architecture)>libroot_libgcc_$(TARGET_ARCH).o - return $(TARGET_LDFLAGS_$(TARGET_PACKAGING_ARCH)) ] - --whole-archive ; - - MergeObject <$(architecture)>libroot_libgcc_$(TARGET_ARCH).o - : - : <$(architecture)>libroot_libgcc_$(TARGET_ARCH).a ; + local libgccAsSingleObject ; + if $(architecture) = x86_gcc2 { + libgccAsSingleObject + = <$(architecture)>libroot_libgcc_$(TARGET_ARCH).o ; + # One object to link them all... + TARGET_LDFLAGS_$(TARGET_PACKAGING_ARCH) on + <$(architecture)>libroot_libgcc_$(TARGET_ARCH).o = + [ on <$(architecture)>libroot_libgcc_$(TARGET_ARCH).o + return $(TARGET_LDFLAGS_$(TARGET_PACKAGING_ARCH)) ] + --whole-archive ; + MergeObject $(libgccAsSingleObject) : : [ TargetLibgcc ] ; + } local librootObjects = - libroot_libgcc_$(TARGET_ARCH).o + $(libgccAsSingleObject) os_main.o os_arch_$(TARGET_ARCH).o @@ -112,7 +82,8 @@ for architectureObject in [ MultiArchSubDirSetup ] { : $(librootObjects) $(librootNoDebugObjects) - $(HAIKU_STATIC_LIBSUPC++_$(architecture)) + [ TargetStaticLibsupc++ ] + [ TargetLibgcc ] ; # Use the standard libroot.so soname, so when the debug version is @@ -125,7 +96,8 @@ for architectureObject in [ MultiArchSubDirSetup ] { : $(librootObjects) $(librootDebugObjects) - $(HAIKU_STATIC_LIBSUPC++_$(architecture)) + [ TargetStaticLibsupc++ ] + [ TargetLibgcc ] ; diff --git a/src/system/libroot/add-ons/icu/Jamfile b/src/system/libroot/add-ons/icu/Jamfile index 52dd179b00..3c076f30f3 100644 --- a/src/system/libroot/add-ons/icu/Jamfile +++ b/src/system/libroot/add-ons/icu/Jamfile @@ -39,7 +39,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { SharedLibrary $(grist)libroot-addon-icu.so : $(sources) : - $(grist)libreferenceable.a $(TARGET_LIBSTDC++_$(architecture)) + $(grist)libreferenceable.a [ TargetLibstdc++ ] [ BuildFeatureAttribute icu : libraries ] ; } diff --git a/src/system/runtime_loader/Jamfile b/src/system/runtime_loader/Jamfile index 315aa139c4..3a19cf1372 100644 --- a/src/system/runtime_loader/Jamfile +++ b/src/system/runtime_loader/Jamfile @@ -99,8 +99,9 @@ Ld runtime_loader : [ FGristFiles $(sources:S=$(SUFOBJ)) ] libruntime_loader.a libruntime_loader_$(TARGET_ARCH).a - $(HAIKU_KERNEL_LIBSUPC++_$(TARGET_PACKAGING_ARCH)) - $(HAIKU_GCC_LIBGCC_$(TARGET_PACKAGING_ARCH)) + [ TargetKernelLibsupc++ ] + [ TargetKernelLibgcc ] + [ TargetKernelLibgcceh ] : $(HAIKU_TOP)/src/system/ldscripts/$(TARGET_ARCH)/runtime_loader.ld : --no-undefined -shared -soname=runtime_loader ; diff --git a/src/tests/Jamfile b/src/tests/Jamfile index 7ccb5b3dae..9d896da726 100644 --- a/src/tests/Jamfile +++ b/src/tests/Jamfile @@ -6,13 +6,13 @@ AddSubDirSupportedPlatforms libbe_test ; UnitTestLib libexampletest.so : ExampleTestAddon.cpp ExampleTest.cpp - : be $(TARGET_LIBSTDC++) + : be [ TargetLibstdc++ ] : ; UnitTest UnitTester : UnitTester.cpp - : be $(TARGET_LIBSTDC++) + : be [ TargetLibstdc++ ] : UnitTester.rsrc ; diff --git a/src/tests/add-ons/index_server/fulltext_search/Jamfile b/src/tests/add-ons/index_server/fulltext_search/Jamfile index 8ef8bac1cc..00137c53e6 100644 --- a/src/tests/add-ons/index_server/fulltext_search/Jamfile +++ b/src/tests/add-ons/index_server/fulltext_search/Jamfile @@ -16,5 +16,5 @@ Includes [ FGristFiles $(sources) ] : $(HAIKU_CLUCENE_HEADERS_DEPENDENCY) ; Application FullTextSearch : $(sources) : - be $(HAIKU_CLUCENE_LIBS) $(TARGET_LIBSTDC++) + be $(HAIKU_CLUCENE_LIBS) [ TargetLibstdc++ ] ; diff --git a/src/tests/add-ons/kernel/drivers/hpet/Jamfile b/src/tests/add-ons/kernel/drivers/hpet/Jamfile index f7bd459baf..9dd635c0e6 100644 --- a/src/tests/add-ons/kernel/drivers/hpet/Jamfile +++ b/src/tests/add-ons/kernel/drivers/hpet/Jamfile @@ -4,7 +4,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel drivers timer ] : true ; Application hpet_test : main.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; diff --git a/src/tests/add-ons/kernel/drivers/tty/Jamfile b/src/tests/add-ons/kernel/drivers/tty/Jamfile index 6190ea30db..9a54b96651 100644 --- a/src/tests/add-ons/kernel/drivers/tty/Jamfile +++ b/src/tests/add-ons/kernel/drivers/tty/Jamfile @@ -2,5 +2,5 @@ SubDir HAIKU_TOP src tests add-ons kernel drivers tty ; UsePrivateHeaders [ FDirName kernel ] ; -SimpleTest tty-test : tty-test.cpp : libroot.so $(TARGET_LIBSTDC++) ; +SimpleTest tty-test : tty-test.cpp : libroot.so [ TargetLibstdc++ ] ; diff --git a/src/tests/add-ons/kernel/file_systems/bfs/queries/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/queries/Jamfile index b587723788..1f16c3822c 100644 --- a/src/tests/add-ons/kernel/file_systems/bfs/queries/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/bfs/queries/Jamfile @@ -2,5 +2,5 @@ SubDir HAIKU_TOP src tests add-ons kernel file_systems bfs queries ; SimpleTest queryTest : test.cpp - : be $(TARGET_LIBSUPC++) ; + : be [ TargetLibsupc++ ] ; diff --git a/src/tests/add-ons/kernel/file_systems/consistency_check/Jamfile b/src/tests/add-ons/kernel/file_systems/consistency_check/Jamfile index c68d8bc8f4..1db35ad281 100644 --- a/src/tests/add-ons/kernel/file_systems/consistency_check/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/consistency_check/Jamfile @@ -5,11 +5,11 @@ UsePrivateHeaders shared ; SimpleTest generate_hashs : generate_hashs.cpp AdaptiveBuffering.cpp - : be $(TARGET_LIBSTDC++) libshared.a + : be [ TargetLibstdc++ ] libshared.a ; SimpleTest consistency_check : consistency_check.cpp AdaptiveBuffering.cpp - : be $(TARGET_LIBSTDC++) libshared.a + : be [ TargetLibstdc++ ] libshared.a ; diff --git a/src/tests/add-ons/kernel/file_systems/random_file_actions/Jamfile b/src/tests/add-ons/kernel/file_systems/random_file_actions/Jamfile index a4a8b765bd..00c1f19a06 100644 --- a/src/tests/add-ons/kernel/file_systems/random_file_actions/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/random_file_actions/Jamfile @@ -2,5 +2,5 @@ SubDir HAIKU_TOP src tests add-ons kernel file_systems random_file_actions ; SimpleTest random_file_actions : random_file_actions.cpp - : $(TARGET_LIBSTDC++) + : [ TargetLibstdc++ ] ; diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/bfs/Jamfile b/src/tests/add-ons/kernel/file_systems/userlandfs/bfs/Jamfile index 9893d43989..b42a2d0349 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/bfs/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/bfs/Jamfile @@ -42,5 +42,5 @@ Addon bfs kernel_interface.cpp - : libuserlandfs_haiku_kernel.so $(TARGET_LIBSUPC++) + : libuserlandfs_haiku_kernel.so [ TargetLibsupc++ ] ; diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/kernel_add_on/Jamfile b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/kernel_add_on/Jamfile index 5f22359e75..d23726f23b 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/kernel_add_on/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/kernel_add_on/Jamfile @@ -50,8 +50,4 @@ KernelAddon userlandfs Volume.cpp $(kernelC++) - - : $(HAIKU_GCC_LIBGCC_$(TARGET_PACKAGING_ARCH) - # TARGET_GCC_LIBGCC is not defined for TARGET_PLATFORM != haiku, - # but the compiler is the same in this case anyway. ; diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/ramfs/beos_interface/Jamfile b/src/tests/add-ons/kernel/file_systems/userlandfs/ramfs/beos_interface/Jamfile index e9c5b6611f..70390dd255 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/ramfs/beos_interface/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/ramfs/beos_interface/Jamfile @@ -59,5 +59,5 @@ Addon ramfs Volume.cpp : libuserlandfs_beos_kernel.so be # for BLocker only - $(TARGET_LIBSUPC++) + [ TargetLibsupc++ ] ; diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/Jamfile b/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/Jamfile index ef82fb5ea3..2652cc71d8 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/Jamfile @@ -32,7 +32,7 @@ Addon reiserfs : libuserlandfs_haiku_kernel.so be # for BLocker only - $(TARGET_LIBSUPC++) + [ TargetLibsupc++ ] ; HaikuSubInclude beos_interface ; diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/beos_interface/Jamfile b/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/beos_interface/Jamfile index 863e6a98f3..fd1e0db362 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/beos_interface/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/beos_interface/Jamfile @@ -33,5 +33,5 @@ Addon reiserfs String.cpp SuperBlock.cpp - : libuserlandfs_beos_kernel.so $(TARGET_LIBSUPC++) + : libuserlandfs_beos_kernel.so [ TargetLibsupc++ ] ; diff --git a/src/tests/add-ons/kernel/kernelland_emu/Jamfile b/src/tests/add-ons/kernel/kernelland_emu/Jamfile index 3d570cb89d..ab75e0bdf6 100644 --- a/src/tests/add-ons/kernel/kernelland_emu/Jamfile +++ b/src/tests/add-ons/kernel/kernelland_emu/Jamfile @@ -19,7 +19,7 @@ SharedLibrary libkernelland_emu.so : khash.cpp list.cpp - : be $(TARGET_LIBSTDC++) ; + : be [ TargetLibstdc++ ] ; AbsSymLink libkernelland_emu.so : libkernelland_emu.so : /boot/home/config/lib : false ; diff --git a/src/tests/add-ons/mail/imap/Jamfile b/src/tests/add-ons/mail/imap/Jamfile index ebee62a704..65e2387470 100644 --- a/src/tests/add-ons/mail/imap/Jamfile +++ b/src/tests/add-ons/mail/imap/Jamfile @@ -18,7 +18,7 @@ SimpleTest imap_tester : # from fs_shell argv.c - : be $(TARGET_LIBSUPC++) mail + : be [ TargetLibsupc++ ] mail ; SEARCH on [ FGristFiles $(libSources) ] diff --git a/src/tests/add-ons/media/plugins/musepack/Jamfile b/src/tests/add-ons/media/plugins/musepack/Jamfile index d670ce51d8..750d12617a 100644 --- a/src/tests/add-ons/media/plugins/musepack/Jamfile +++ b/src/tests/add-ons/media/plugins/musepack/Jamfile @@ -16,7 +16,7 @@ SimpleTest mpc_reader_test : MusePackReader.cpp MusePackDecoder.cpp - : libmusepack.a media be $(TARGET_LIBSUPC++) + : libmusepack.a media be [ TargetLibsupc++ ] ; # Tell Jam where to find these sources diff --git a/src/tests/add-ons/print/pdf/bezierbounds/Jamfile b/src/tests/add-ons/print/pdf/bezierbounds/Jamfile index 5fb896bdaa..673852d953 100644 --- a/src/tests/add-ons/print/pdf/bezierbounds/Jamfile +++ b/src/tests/add-ons/print/pdf/bezierbounds/Jamfile @@ -13,7 +13,7 @@ local sources = SimpleTest BezierBounds : $(sources) - : be $(TARGET_LIBSUPC++) root + : be [ TargetLibsupc++ ] root ; # Tell Jam where to find these sources: diff --git a/src/tests/add-ons/print/pdf/linepathbuilder/Jamfile b/src/tests/add-ons/print/pdf/linepathbuilder/Jamfile index f45c706ad4..25d1bbe670 100644 --- a/src/tests/add-ons/print/pdf/linepathbuilder/Jamfile +++ b/src/tests/add-ons/print/pdf/linepathbuilder/Jamfile @@ -13,7 +13,7 @@ local sources = SimpleTest LinePathBuilder : $(sources) - : be $(TARGET_LIBSUPC++) root + : be [ TargetLibsupc++ ] root ; # Tell Jam where to find these sources: diff --git a/src/tests/add-ons/print/ppd/test/Jamfile b/src/tests/add-ons/print/ppd/test/Jamfile index cb512dddd3..e04a24cb86 100644 --- a/src/tests/add-ons/print/ppd/test/Jamfile +++ b/src/tests/add-ons/print/ppd/test/Jamfile @@ -11,7 +11,7 @@ SubDirHdrs $(HAIKU_TOP) src tests add-ons print ppd ui ; SimpleTest PPDConfig : PPDConfigApplication.cpp - : be root libppdtest.a $(TARGET_LIBSUPC++) + : be root libppdtest.a [ TargetLibsupc++ ] ; SimpleTest PPDTest : @@ -19,6 +19,6 @@ SimpleTest PPDTest : TestParser.cpp TestScanner.cpp : - be root libppdtest.a $(TARGET_LIBSUPC++) + be root libppdtest.a [ TargetLibsupc++ ] ; diff --git a/src/tests/add-ons/print/transports/Jamfile b/src/tests/add-ons/print/transports/Jamfile index 4c91c28c5c..e4554dc2ae 100644 --- a/src/tests/add-ons/print/transports/Jamfile +++ b/src/tests/add-ons/print/transports/Jamfile @@ -2,5 +2,5 @@ SubDir HAIKU_TOP src tests add-ons print transports ; UsePrivateHeaders shared print ; -SimpleTest print_transport_loader : main.cpp : be $(TARGET_LIBSUPC++) ; +SimpleTest print_transport_loader : main.cpp : be [ TargetLibsupc++ ] ; diff --git a/src/tests/add-ons/translators/Jamfile b/src/tests/add-ons/translators/Jamfile index 4a23563b7b..76838c7854 100644 --- a/src/tests/add-ons/translators/Jamfile +++ b/src/tests/add-ons/translators/Jamfile @@ -24,7 +24,7 @@ UnitTestLib libtranslatorstest.so STXTTranslatorTest.cpp TGATranslatorTest.cpp TIFFTranslatorTest.cpp - : $(libtranslation) be $(TARGET_LIBSTDC++) + : $(libtranslation) be [ TargetLibstdc++ ] ; SubInclude HAIKU_TOP src tests add-ons translators exif ; diff --git a/src/tests/add-ons/translators/exif/Jamfile b/src/tests/add-ons/translators/exif/Jamfile index 2fa8ff1288..6b9c39ac98 100644 --- a/src/tests/add-ons/translators/exif/Jamfile +++ b/src/tests/add-ons/translators/exif/Jamfile @@ -10,7 +10,7 @@ SimpleTest dump_exif : dump_exif.cpp exif_parser.cpp - : be $(TARGET_LIBSTDC++) + : be [ TargetLibstdc++ ] ; SEARCH on [ FGristFiles diff --git a/src/tests/apps/fake_app_server/Jamfile b/src/tests/apps/fake_app_server/Jamfile index 4ddb0fe875..088f3dc922 100644 --- a/src/tests/apps/fake_app_server/Jamfile +++ b/src/tests/apps/fake_app_server/Jamfile @@ -13,5 +13,5 @@ UseBuildFeatureHeaders freetype ; Server fake_app_server : AppServer.cpp ServerApp.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; diff --git a/src/tests/apps/miniterminal/Jamfile b/src/tests/apps/miniterminal/Jamfile index cbb2e0ceb5..435814358e 100644 --- a/src/tests/apps/miniterminal/Jamfile +++ b/src/tests/apps/miniterminal/Jamfile @@ -14,5 +14,5 @@ Application MiniTerminal : MiniView.cpp MiniWin.cpp ViewBuffer.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; diff --git a/src/tests/apps/partitioner/Jamfile b/src/tests/apps/partitioner/Jamfile index ee91cb9b38..807006b6de 100644 --- a/src/tests/apps/partitioner/Jamfile +++ b/src/tests/apps/partitioner/Jamfile @@ -6,5 +6,5 @@ UsePrivateHeaders storage ; SimpleTest Partitioner : Partitioner.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; diff --git a/src/tests/apps/terminal_replicant/Jamfile b/src/tests/apps/terminal_replicant/Jamfile index ac83201a43..3e01449cbd 100644 --- a/src/tests/apps/terminal_replicant/Jamfile +++ b/src/tests/apps/terminal_replicant/Jamfile @@ -6,7 +6,7 @@ SubDirHdrs [ FDirName $(HAIKU_TOP) src apps terminal ] ; Application RepliTerminal : main.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; diff --git a/src/tests/bin/makeudfimage/Jamfile b/src/tests/bin/makeudfimage/Jamfile index 5be2f67d58..5e9d84ae3c 100644 --- a/src/tests/bin/makeudfimage/Jamfile +++ b/src/tests/bin/makeudfimage/Jamfile @@ -24,7 +24,7 @@ UnitTestLib libmakeudfimagetest.so UdfStructures.cpp Utils.cpp - : be $(TARGET_LIBSTDC++) + : be [ TargetLibstdc++ ] ; SEARCH on [ FGristFiles Allocator.cpp PhysicalPartitionAllocator.cpp ] diff --git a/src/tests/kits/app/Jamfile b/src/tests/kits/app/Jamfile index d6119891f0..e35b78b604 100644 --- a/src/tests/kits/app/Jamfile +++ b/src/tests/kits/app/Jamfile @@ -31,7 +31,7 @@ SEARCH_SOURCE += [ FDirName $(SUBDIR) common ] ; # MessageOpAssignTest.cpp # MessageEasyFindTest.cpp # MessageSpeedTest.cpp -# : be $(TARGET_LIBSTDC++) +# : be [ TargetLibstdc++ ] #; @@ -157,12 +157,12 @@ UnitTestLib libapptest.so AppRunner.cpp PipedAppRunner.cpp - : be $(TARGET_LIBSTDC++) + : be [ TargetLibstdc++ ] ; UnitTestLib libappteststub.so : AppKitTestStub.cpp - : libapptest.so $(TARGET_LIBSTDC++) + : libapptest.so [ TargetLibstdc++ ] ; SimpleTest DanoMessageTest : diff --git a/src/tests/kits/app/bapplication/testapps/Jamfile b/src/tests/kits/app/bapplication/testapps/Jamfile index ca18c71f2f..7b8e54b4a5 100644 --- a/src/tests/kits/app/bapplication/testapps/Jamfile +++ b/src/tests/kits/app/bapplication/testapps/Jamfile @@ -28,7 +28,7 @@ rule SimpleBAppTestApp2 UnitTest $(name) : $(sources) - : be $(TARGET_LIBSTDC++) $(useObjects) + : be [ TargetLibstdc++ ] $(useObjects) : $(resources) ; } diff --git a/src/tests/kits/app/bmessenger/Jamfile b/src/tests/kits/app/bmessenger/Jamfile index 9815e4411d..45995622a5 100644 --- a/src/tests/kits/app/bmessenger/Jamfile +++ b/src/tests/kits/app/bmessenger/Jamfile @@ -6,7 +6,7 @@ AddSubDirSupportedPlatforms libbe_test ; UnitTest SMRemoteTargetApp : SMRemoteTargetApp.cpp SMLooper.cpp - : be $(TARGET_LIBSTDC++) + : be [ TargetLibstdc++ ] ; SimpleTest ForwardMessageTest : diff --git a/src/tests/kits/app/bmessenger/testapps/Jamfile b/src/tests/kits/app/bmessenger/testapps/Jamfile index 987a10f6b0..8bb2b648c5 100644 --- a/src/tests/kits/app/bmessenger/testapps/Jamfile +++ b/src/tests/kits/app/bmessenger/testapps/Jamfile @@ -29,7 +29,7 @@ rule SimpleBMessengerTestApp2 UnitTest $(name) : $(sources) - : be $(TARGET_LIBSTDC++) $(useObjects) + : be [ TargetLibstdc++ ] $(useObjects) : $(resources) ; } diff --git a/src/tests/kits/app/broster/testapps/Jamfile b/src/tests/kits/app/broster/testapps/Jamfile index 0c2e7dc456..d98b6e3209 100644 --- a/src/tests/kits/app/broster/testapps/Jamfile +++ b/src/tests/kits/app/broster/testapps/Jamfile @@ -31,7 +31,7 @@ rule SimpleBRosterTestApp2 UnitTest $(name) : $(sources) - : be $(TARGET_LIBSTDC++) $(useObjects) + : be [ TargetLibstdc++ ] $(useObjects) : $(resources) ; } diff --git a/src/tests/kits/app/messaging/Jamfile b/src/tests/kits/app/messaging/Jamfile index 3c2cc47280..fdaf124575 100644 --- a/src/tests/kits/app/messaging/Jamfile +++ b/src/tests/kits/app/messaging/Jamfile @@ -26,5 +26,5 @@ SEARCH on [ FGristFiles Shape.cpp Region.cpp RegionSupport.cpp ] SimpleTest HandlerLooperMessageTest : HandlerLooperMessageTest.cpp - : be $(TARGET_LIBSTDC++) + : be [ TargetLibstdc++ ] ; diff --git a/src/tests/kits/bluetooth/l2capClient/Jamfile b/src/tests/kits/bluetooth/l2capClient/Jamfile index 356aef0b99..a200bd234b 100644 --- a/src/tests/kits/bluetooth/l2capClient/Jamfile +++ b/src/tests/kits/bluetooth/l2capClient/Jamfile @@ -4,5 +4,5 @@ UseLibraryHeaders bluetooth ; SimpleTest L2capClient : l2capClient.cpp - : be bluetooth network $(TARGET_LIBSUPC++) + : be bluetooth network [ TargetLibsupc++ ] ; diff --git a/src/tests/kits/device/bserial/Jamfile b/src/tests/kits/device/bserial/Jamfile index 5db5a60eaa..3c613dddd0 100644 --- a/src/tests/kits/device/bserial/Jamfile +++ b/src/tests/kits/device/bserial/Jamfile @@ -2,4 +2,4 @@ SubDir HAIKU_TOP src tests kits device bserial ; SimpleTest serial_io : SerialIO.cpp - : libdevice.so $(TARGET_LIBSTDC++) ; + : libdevice.so [ TargetLibstdc++ ] ; diff --git a/src/tests/kits/device/stickit_BJoystick/Jamfile b/src/tests/kits/device/stickit_BJoystick/Jamfile index 201932cb3e..9f99ae8470 100644 --- a/src/tests/kits/device/stickit_BJoystick/Jamfile +++ b/src/tests/kits/device/stickit_BJoystick/Jamfile @@ -4,4 +4,4 @@ SimpleTest stickit : JoystickWindow.cpp StickItApp.cpp StickItWindow.cpp - : be libdevice.so $(TARGET_LIBSTDC++) ; + : be libdevice.so [ TargetLibstdc++ ] ; diff --git a/src/tests/kits/game/ParticlesII/Jamfile b/src/tests/kits/game/ParticlesII/Jamfile index a3e5bf9aa0..6d4506b1be 100644 --- a/src/tests/kits/game/ParticlesII/Jamfile +++ b/src/tests/kits/game/ParticlesII/Jamfile @@ -2,6 +2,6 @@ SubDir HAIKU_TOP src tests kits game ParticlesII ; SimpleTest ParticlesII : particlesII.cpp - : game be root $(TARGET_LIBSUPC++) + : game be root [ TargetLibsupc++ ] ; diff --git a/src/tests/kits/game/chart/Jamfile b/src/tests/kits/game/chart/Jamfile index ac52086ccb..70fe6e3c69 100644 --- a/src/tests/kits/game/chart/Jamfile +++ b/src/tests/kits/game/chart/Jamfile @@ -8,7 +8,7 @@ Application Chart : ChartRender.cpp ChartView.cpp ChartWindow.cpp - : be game localestub $(TARGET_LIBSUPC++) + : be game localestub [ TargetLibsupc++ ] : Chart.rdef ; diff --git a/src/tests/kits/game/direct_window_info_test/Jamfile b/src/tests/kits/game/direct_window_info_test/Jamfile index 13f299c816..d3f5e1c144 100644 --- a/src/tests/kits/game/direct_window_info_test/Jamfile +++ b/src/tests/kits/game/direct_window_info_test/Jamfile @@ -2,6 +2,6 @@ SubDir HAIKU_TOP src tests kits game direct_window_info_test ; SimpleTest dw_info : dwinfo.cpp - : game be root $(TARGET_LIBSUPC++) + : game be root [ TargetLibsupc++ ] ; diff --git a/src/tests/kits/game/direct_window_test/Jamfile b/src/tests/kits/game/direct_window_test/Jamfile index 54c3404974..af188f1eae 100644 --- a/src/tests/kits/game/direct_window_test/Jamfile +++ b/src/tests/kits/game/direct_window_test/Jamfile @@ -5,7 +5,7 @@ AddSubDirSupportedPlatforms libbe_test ; SimpleTest DirectWindowStars : Stars.cpp StarWindow.cpp - : game be $(TARGET_LIBSUPC++) + : game be [ TargetLibsupc++ ] ; if ( $(TARGET_PLATFORM) = libbe_test ) { diff --git a/src/tests/kits/game/file_game_sound_test/Jamfile b/src/tests/kits/game/file_game_sound_test/Jamfile index 4271e33358..7b4f9c24c1 100644 --- a/src/tests/kits/game/file_game_sound_test/Jamfile +++ b/src/tests/kits/game/file_game_sound_test/Jamfile @@ -2,6 +2,6 @@ SubDir HAIKU_TOP src tests kits game file_game_sound_test ; SimpleTest file_game_sound_test : FileSoundTest.cpp FileSoundWindow.cpp - : game tracker be root $(TARGET_LIBSTDC++) + : game tracker be root [ TargetLibstdc++ ] ; diff --git a/src/tests/kits/game/page_flipper/Jamfile b/src/tests/kits/game/page_flipper/Jamfile index 8fa7f67e13..a0ed096898 100644 --- a/src/tests/kits/game/page_flipper/Jamfile +++ b/src/tests/kits/game/page_flipper/Jamfile @@ -2,6 +2,6 @@ SubDir HAIKU_TOP src tests kits game page_flipper ; SimpleTest PageFlipper : page_flip.cpp - : game be root $(TARGET_LIBSUPC++) + : game be root [ TargetLibsupc++ ] ; diff --git a/src/tests/kits/game/push_game_sound_test/Jamfile b/src/tests/kits/game/push_game_sound_test/Jamfile index 82871470b4..44a2737cdd 100644 --- a/src/tests/kits/game/push_game_sound_test/Jamfile +++ b/src/tests/kits/game/push_game_sound_test/Jamfile @@ -2,10 +2,10 @@ SubDir HAIKU_TOP src tests kits game push_game_sound_test ; SimpleTest push_game_sound_test : push_game_sound_test.cpp - : game media be $(TARGET_LIBSUPC++) + : game media be [ TargetLibsupc++ ] ; SimpleTest push_game_sound_sine : push_game_sound_sine.cpp - : game be $(TARGET_LIBSUPC++) + : game be [ TargetLibsupc++ ] ; diff --git a/src/tests/kits/game/push_game_sound_test2/Jamfile b/src/tests/kits/game/push_game_sound_test2/Jamfile index e2a7356f3d..7e4effcf12 100644 --- a/src/tests/kits/game/push_game_sound_test2/Jamfile +++ b/src/tests/kits/game/push_game_sound_test2/Jamfile @@ -2,5 +2,5 @@ SubDir HAIKU_TOP src tests kits game push_game_sound_test2 ; SimpleTest push_game_sound_test2 : push_game_sound_test.cpp - : game media be $(TARGET_LIBSUPC++) + : game media be [ TargetLibsupc++ ] ; diff --git a/src/tests/kits/game/simple_game_sound_test/Jamfile b/src/tests/kits/game/simple_game_sound_test/Jamfile index d5e1e53971..ee550f1a1d 100644 --- a/src/tests/kits/game/simple_game_sound_test/Jamfile +++ b/src/tests/kits/game/simple_game_sound_test/Jamfile @@ -2,5 +2,5 @@ SubDir HAIKU_TOP src tests kits game simple_game_sound_test ; SimpleTest simple_game_sound_test : SimpleSoundTest.cpp - : game tracker be root $(TARGET_LIBSUPC++) + : game tracker be root [ TargetLibsupc++ ] ; diff --git a/src/tests/kits/interface/Jamfile b/src/tests/kits/interface/Jamfile index 991e49b29f..c6e81493ea 100644 --- a/src/tests/kits/interface/Jamfile +++ b/src/tests/kits/interface/Jamfile @@ -49,7 +49,7 @@ UnitTestLib libinterfacetest.so RegionIntersect.cpp RegionOffsetBy.cpp - : be $(TARGET_LIBSTDC++) + : be [ TargetLibstdc++ ] ; ObjectDefines @@ -59,31 +59,31 @@ ObjectDefines SimpleTest ScrollViewTest_r5 : ScrollViewTest.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; SimpleTest ScrollViewTest : ScrollViewTest.cpp ScrollView.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; SimpleTest AlertTest : SimpleAlertTest.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; SimpleTest ChannelSliderTest : ChannelSliderTest.cpp ChannelSlider.cpp ChannelControl.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; SimpleTest CheckBoxTest : CheckBoxTest.cpp CheckBox.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; SimpleTest ScreenTest : @@ -93,50 +93,50 @@ SimpleTest ScreenTest : SimpleTest StatusBarTest : StatusBarTest.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; SimpleTest ToolTipTest : ToolTipTest.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; SimpleTest GetMouseTest : GetMouseTest.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; SimpleTest PulseTest : PulseTest.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; SimpleTest SliderTest_r5 : SliderTest.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; SimpleTest SliderTest : SliderTest.cpp Slider.cpp Control.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; SimpleTest TruncateString : TruncateString.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; SimpleTest MenuBeginningTest : MenuBeginningTest.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; Application MenuTriggerTest : MenuTriggerTest.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; @@ -148,29 +148,29 @@ SimpleTest WidthBufferTest : SimpleTest ClippingPlusRedraw : ClippingPlusRedraw.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; SimpleTest SetDiskModeTest : SetDiskModeTest.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; SimpleTest SetBorderScrollViewTest : ScrollViewSetBorderTest.cpp ScrollView.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; SimpleTest TextViewTest : TextViewTest.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; SimpleTest WindowStackTest : WindowStackTest.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; SEARCH on [ FGristFiles diff --git a/src/tests/kits/interface/bshelf/Jamfile b/src/tests/kits/interface/bshelf/Jamfile index 6bb285cf97..5e68b5a38c 100644 --- a/src/tests/kits/interface/bshelf/Jamfile +++ b/src/tests/kits/interface/bshelf/Jamfile @@ -12,7 +12,7 @@ if $(TARGET_PLATFORM) != haiku { SimpleTest ShelfTest : ShelfTest.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; SEARCH on [ FGristFiles diff --git a/src/tests/kits/interface/flatten_picture/Jamfile b/src/tests/kits/interface/flatten_picture/Jamfile index 401e11c8a0..ce77ed9568 100644 --- a/src/tests/kits/interface/flatten_picture/Jamfile +++ b/src/tests/kits/interface/flatten_picture/Jamfile @@ -11,5 +11,5 @@ SimpleTest FlattenPictureTest : LinkAgainst FlattenPictureTest : be root - $(TARGET_LIBSUPC++) + [ TargetLibsupc++ ] ; diff --git a/src/tests/kits/interface/layout/Jamfile b/src/tests/kits/interface/layout/Jamfile index 232428b20e..8b3e2abaf7 100644 --- a/src/tests/kits/interface/layout/Jamfile +++ b/src/tests/kits/interface/layout/Jamfile @@ -5,7 +5,7 @@ SetSubDirSupportedPlatforms haiku libbe_test ; SimpleTest LayoutTest1 : LayoutTest1.cpp : - be $(TARGET_LIBSUPC++) + be [ TargetLibsupc++ ] ; if $(TARGET_PLATFORM) = libbe_test { diff --git a/src/tests/kits/interface/layout/widget_layout_test/Jamfile b/src/tests/kits/interface/layout/widget_layout_test/Jamfile index e349a4ff9b..4f8fe8ad86 100644 --- a/src/tests/kits/interface/layout/widget_layout_test/Jamfile +++ b/src/tests/kits/interface/layout/widget_layout_test/Jamfile @@ -33,7 +33,7 @@ SimpleTest WidgetLayoutTest : TextControlTest.cpp TextViewTest.cpp : - be $(TARGET_LIBSUPC++) + be [ TargetLibsupc++ ] ; if $(TARGET_PLATFORM) = libbe_test { diff --git a/src/tests/kits/interface/look/Jamfile b/src/tests/kits/interface/look/Jamfile index 738eda26f0..1cfba63a4b 100644 --- a/src/tests/kits/interface/look/Jamfile +++ b/src/tests/kits/interface/look/Jamfile @@ -4,5 +4,5 @@ UsePrivateHeaders interface ; SimpleTest LookTest : Look.cpp - : be tracker libcolumnlistview.a $(TARGET_LIBSUPC++) + : be tracker libcolumnlistview.a [ TargetLibsupc++ ] ; diff --git a/src/tests/kits/interface/menu/menuworld/Jamfile b/src/tests/kits/interface/menu/menuworld/Jamfile index 121cdcc561..cb6c1bc25f 100644 --- a/src/tests/kits/interface/menu/menuworld/Jamfile +++ b/src/tests/kits/interface/menu/menuworld/Jamfile @@ -11,6 +11,6 @@ Application MenuWorld : stddlg.cpp TestMenuBuilder.cpp ViewLayoutFactory.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] : MenuWorld.rsrc ; diff --git a/src/tests/kits/interface/picture/Jamfile b/src/tests/kits/interface/picture/Jamfile index d146f0c495..8ded4303d6 100644 --- a/src/tests/kits/interface/picture/Jamfile +++ b/src/tests/kits/interface/picture/Jamfile @@ -23,7 +23,7 @@ UseLibraryHeaders agg expat ; SimpleTest PictureTest : PictureTest.cpp SVGViewView.cpp - : be translation libexpat.a $(TARGET_LIBSUPC++) + : be translation libexpat.a [ TargetLibsupc++ ] ; if $(TARGET_PLATFORM) = libbe_test { diff --git a/src/tests/kits/locale/Jamfile b/src/tests/kits/locale/Jamfile index 25abb7d454..a3752b2e74 100644 --- a/src/tests/kits/locale/Jamfile +++ b/src/tests/kits/locale/Jamfile @@ -23,7 +23,7 @@ rule LocaleTest # LocaleTest ; local sources = $(1) ; local name = $(sources[1]:B) ; - Application $(name) : $(sources) : be $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++) ; + Application $(name) : $(sources) : be [ TargetLibstdc++ ] [ TargetLibsupc++ ] ; } LocaleTest catalogSpeed.cpp ; @@ -40,7 +40,7 @@ Includes [ FGristFiles ICUTest.cpp ] : [ BuildFeatureAttribute icu : headers ] ; Application ICUTest : ICUTest.cpp : - be $(TARGET_LIBSUPC++) [ BuildFeatureAttribute icu : libraries ] ; + be [ TargetLibsupc++ ] [ BuildFeatureAttribute icu : libraries ] ; Addon catalogTestAddOn : catalogTestAddOn.cpp diff --git a/src/tests/kits/locale/number_format/Jamfile b/src/tests/kits/locale/number_format/Jamfile index cb71edcc2d..c003e8fe51 100644 --- a/src/tests/kits/locale/number_format/Jamfile +++ b/src/tests/kits/locale/number_format/Jamfile @@ -11,5 +11,5 @@ UnitTestLib libNumberFormatTests.so GenericNumberFormatTests.cpp GenericNumberFormatConstructorTest.cpp - : be $(TARGET_LIBSTDC++) + : be [ TargetLibstdc++ ] ; diff --git a/src/tests/kits/mail/Jamfile b/src/tests/kits/mail/Jamfile index 180cf8930b..c82e785cc3 100644 --- a/src/tests/kits/mail/Jamfile +++ b/src/tests/kits/mail/Jamfile @@ -7,5 +7,5 @@ UsePrivateHeaders mail shared ; SimpleTest header_test : header_test.cpp - : be $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++) mail + : be [ TargetLibstdc++ ] [ TargetLibsupc++ ] mail ; diff --git a/src/tests/kits/media/Jamfile b/src/tests/kits/media/Jamfile index 41c4ae219e..0439e574ee 100644 --- a/src/tests/kits/media/Jamfile +++ b/src/tests/kits/media/Jamfile @@ -1,8 +1,8 @@ SubDir HAIKU_TOP src tests kits media ; -SimpleTest AreaTest : AreaTest.cpp : be $(TARGET_LIBSUPC++) ; +SimpleTest AreaTest : AreaTest.cpp : be [ TargetLibsupc++ ] ; -SimpleTest BufferTest : BufferTest.cpp : libmedia.so be $(TARGET_LIBSUPC++) ; +SimpleTest BufferTest : BufferTest.cpp : libmedia.so be [ TargetLibsupc++ ] ; SimpleTest SizeofTest : SizeofTest.cpp : be ; diff --git a/src/tests/kits/media/media_decoder/Jamfile b/src/tests/kits/media/media_decoder/Jamfile index dac93bd19e..fc3f69bda9 100644 --- a/src/tests/kits/media/media_decoder/Jamfile +++ b/src/tests/kits/media/media_decoder/Jamfile @@ -4,5 +4,5 @@ UsePrivateHeaders media_decoder ; SimpleTest media_decoder : media_decoder.cpp - : libmedia.so be root $(TARGET_LIBSUPC++) + : libmedia.so be root [ TargetLibsupc++ ] ; diff --git a/src/tests/kits/media/mp3_decoder_test/Jamfile b/src/tests/kits/media/mp3_decoder_test/Jamfile index 14b701c9a0..970a335bd3 100644 --- a/src/tests/kits/media/mp3_decoder_test/Jamfile +++ b/src/tests/kits/media/mp3_decoder_test/Jamfile @@ -10,7 +10,7 @@ SubDirC++Flags -D__STDC_CONSTANT_MACROS -Wno-deprecated-declarations ; SimpleTest mp3_decoder_test : mp3_decoder_test.cpp - : be media $(TARGET_LIBSUPC++) + : be media [ TargetLibsupc++ ] ; Includes [ FGristFiles mp3_decoder_test.cpp ] diff --git a/src/tests/kits/media/mp3_reader_test/Jamfile b/src/tests/kits/media/mp3_reader_test/Jamfile index 4c5f569237..7863554302 100644 --- a/src/tests/kits/media/mp3_reader_test/Jamfile +++ b/src/tests/kits/media/mp3_reader_test/Jamfile @@ -8,7 +8,7 @@ SimpleTest mp3_reader_test MediaPlugin.cpp ReaderPlugin.cpp MP3ReaderPlugin.cpp - : media be root $(TARGET_LIBSUPC++) + : media be root [ TargetLibsupc++ ] ; # Tell Jam where to find these sources diff --git a/src/tests/kits/media/mpeg2_decoder_test/Jamfile b/src/tests/kits/media/mpeg2_decoder_test/Jamfile index 57b47bebf0..bcfc4f3dd8 100644 --- a/src/tests/kits/media/mpeg2_decoder_test/Jamfile +++ b/src/tests/kits/media/mpeg2_decoder_test/Jamfile @@ -10,7 +10,7 @@ SubDirC++Flags -D__STDC_CONSTANT_MACROS -Wno-deprecated-declarations ; SimpleTest mpeg2_decoder_test : mpeg2_decoder_test.cpp - : be media translation $(TARGET_LIBSUPC++) + : be media translation [ TargetLibsupc++ ] ; Includes [ FGristFiles mpeg2_decoder_test.cpp ] diff --git a/src/tests/kits/media/notificationtest/Jamfile b/src/tests/kits/media/notificationtest/Jamfile index 979a3848b5..cfc8bd8bd8 100644 --- a/src/tests/kits/media/notificationtest/Jamfile +++ b/src/tests/kits/media/notificationtest/Jamfile @@ -2,6 +2,6 @@ SubDir HAIKU_TOP src tests kits media notificationtest ; SimpleTest NotificationTest : main.cpp - : media be root $(TARGET_LIBSUPC++) + : media be root [ TargetLibsupc++ ] ; diff --git a/src/tests/kits/media/playwav/Jamfile b/src/tests/kits/media/playwav/Jamfile index 0c00dcc464..afbe7bdf56 100644 --- a/src/tests/kits/media/playwav/Jamfile +++ b/src/tests/kits/media/playwav/Jamfile @@ -4,5 +4,5 @@ UsePrivateHeaders media ; SimpleTest playwav : playwav.cpp - : media be root $(TARGET_LIBSUPC++) + : media be root [ TargetLibsupc++ ] ; diff --git a/src/tests/kits/media/soundplayer/Jamfile b/src/tests/kits/media/soundplayer/Jamfile index dae87de95a..474ebac85f 100644 --- a/src/tests/kits/media/soundplayer/Jamfile +++ b/src/tests/kits/media/soundplayer/Jamfile @@ -2,5 +2,5 @@ SubDir HAIKU_TOP src tests kits media soundplayer ; SimpleTest SimplePlayerTest : SimplePlayerTest.cpp - : media be $(TARGET_LIBSUPC++) + : media be [ TargetLibsupc++ ] ; diff --git a/src/tests/kits/media/wav_reader_test/Jamfile b/src/tests/kits/media/wav_reader_test/Jamfile index fad4182bb9..898f9fa29f 100644 --- a/src/tests/kits/media/wav_reader_test/Jamfile +++ b/src/tests/kits/media/wav_reader_test/Jamfile @@ -8,7 +8,7 @@ SimpleTest wav_reader_test MediaPlugin.cpp ReaderPlugin.cpp WavReaderPlugin.cpp - : media be root $(TARGET_LIBSUPC++) + : media be root [ TargetLibsupc++ ] ; # Tell Jam where to find these sources diff --git a/src/tests/kits/net/Jamfile b/src/tests/kits/net/Jamfile index ffc165eb09..25d5f3548b 100644 --- a/src/tests/kits/net/Jamfile +++ b/src/tests/kits/net/Jamfile @@ -28,7 +28,7 @@ SimpleTest NetAddressTest : NetAddressTest.cpp : $(TARGET_NETWORK_LIBS) $(HAIKU_NETAPI_LIB) ; SimpleTest NetEndpointTest : NetEndpointTest.cpp - : $(TARGET_NETWORK_LIBS) $(HAIKU_NETAPI_LIB) be $(TARGET_LIBSUPC++) ; + : $(TARGET_NETWORK_LIBS) $(HAIKU_NETAPI_LIB) be [ TargetLibsupc++ ] ; SimpleTest wlan_test : wlan_test.cpp : $(TARGET_NETWORK_LIBS) bnetapi be ; diff --git a/src/tests/kits/net/cookie/Jamfile b/src/tests/kits/net/cookie/Jamfile index 074d9ac3f9..d447071f2e 100644 --- a/src/tests/kits/net/cookie/Jamfile +++ b/src/tests/kits/net/cookie/Jamfile @@ -2,5 +2,5 @@ SubDir HAIKU_TOP src tests kits net cookie ; Application cookie_test : cookie_test.cpp - : be $(TARGET_NETWORK_LIBS) $(HAIKU_NETAPI_LIB) $(TARGET_LIBSTDC++) + : be $(TARGET_NETWORK_LIBS) $(HAIKU_NETAPI_LIB) [ TargetLibstdc++ ] ; diff --git a/src/tests/kits/net/libnetapi/Jamfile b/src/tests/kits/net/libnetapi/Jamfile index 3b623d19ff..1e7fca6b5f 100644 --- a/src/tests/kits/net/libnetapi/Jamfile +++ b/src/tests/kits/net/libnetapi/Jamfile @@ -6,5 +6,5 @@ UnitTestLib libnetapitest.so : NetworkAddressTest.cpp NetworkInterfaceTest.cpp - : bnetapi network $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++) + : bnetapi network [ TargetLibstdc++ ] [ TargetLibsupc++ ] ; diff --git a/src/tests/kits/net/preflet/DummyAddOn/Jamfile b/src/tests/kits/net/preflet/DummyAddOn/Jamfile index 017fae9fea..e33c93167a 100644 --- a/src/tests/kits/net/preflet/DummyAddOn/Jamfile +++ b/src/tests/kits/net/preflet/DummyAddOn/Jamfile @@ -4,6 +4,6 @@ UseHeaders [ FDirName $(HAIKU_TOP) src tests kits net preflet ] ; Addon Dummy : DummyAddOn.cpp - : be NetworkSetup $(TARGET_LIBSTDC++) # $(HAIKU_NETWORK_LIBS) + : be NetworkSetup [ TargetLibstdc++ ] # $(HAIKU_NETWORK_LIBS) ; diff --git a/src/tests/kits/net/preflet/InterfacesAddOn/Jamfile b/src/tests/kits/net/preflet/InterfacesAddOn/Jamfile index de37774a57..3d1d0a30e3 100644 --- a/src/tests/kits/net/preflet/InterfacesAddOn/Jamfile +++ b/src/tests/kits/net/preflet/InterfacesAddOn/Jamfile @@ -29,8 +29,8 @@ Addon Interfaces : NetworkSetup $(TARGET_NETWORK_LIBS) libbnetapi.so - $(TARGET_LIBSUPC++) - $(TARGET_LIBSTDC++) + [ TargetLibsupc++ ] + [ TargetLibstdc++ ] localestub libicon.a libagg.a ; diff --git a/src/tests/kits/net/preflet/Jamfile b/src/tests/kits/net/preflet/Jamfile index 8c8e0095a6..d92a82b87e 100644 --- a/src/tests/kits/net/preflet/Jamfile +++ b/src/tests/kits/net/preflet/Jamfile @@ -5,7 +5,7 @@ Preference NetworkSetup : NetworkSetupWindow.cpp NetworkSetupProfile.cpp NetworkSetupAddOn.cpp - : be root $(TARGET_LIBSTDC++) localestub + : be root [ TargetLibstdc++ ] localestub : NetworkSetup.rdef ; diff --git a/src/tests/kits/net/preflet/MultipleAddOns/Jamfile b/src/tests/kits/net/preflet/MultipleAddOns/Jamfile index 54ed1b8ef7..315589e370 100644 --- a/src/tests/kits/net/preflet/MultipleAddOns/Jamfile +++ b/src/tests/kits/net/preflet/MultipleAddOns/Jamfile @@ -4,6 +4,6 @@ UseHeaders [ FDirName $(HAIKU_TOP) src tests kits net preflet ] ; Addon Multiple : MultipleAddOn.cpp - : be NetworkSetup $(TARGET_LIBSTDC++) # $(HAIKU_NETWORK_LIBS) + : be NetworkSetup [ TargetLibstdc++ ] # $(HAIKU_NETWORK_LIBS) ; diff --git a/src/tests/kits/net/preflet/ServicesAddOn/Jamfile b/src/tests/kits/net/preflet/ServicesAddOn/Jamfile index 593ea2d52a..a291427f54 100644 --- a/src/tests/kits/net/preflet/ServicesAddOn/Jamfile +++ b/src/tests/kits/net/preflet/ServicesAddOn/Jamfile @@ -4,6 +4,6 @@ UseHeaders [ FDirName $(HAIKU_TOP) src tests kits net preflet ] ; Addon Services : ServicesAddOn.cpp - : be NetworkSetup $(TARGET_LIBSTDC++) # $(HAIKU_NETWORK_LIBS) + : be NetworkSetup [ TargetLibstdc++ ] # $(HAIKU_NETWORK_LIBS) ; diff --git a/src/tests/kits/net/service/Jamfile b/src/tests/kits/net/service/Jamfile index a11c2cffcd..492ab5e59d 100644 --- a/src/tests/kits/net/service/Jamfile +++ b/src/tests/kits/net/service/Jamfile @@ -7,5 +7,5 @@ UnitTestLib servicekittest.so : HttpTest.cpp UrlTest.cpp - : be $(TARGET_NETWORK_LIBS) $(HAIKU_NETAPI_LIB) $(TARGET_LIBSTDC++) + : be $(TARGET_NETWORK_LIBS) $(HAIKU_NETAPI_LIB) [ TargetLibstdc++ ] ; diff --git a/src/tests/kits/net/tcptester/Jamfile b/src/tests/kits/net/tcptester/Jamfile index 57c169e628..e341e41086 100644 --- a/src/tests/kits/net/tcptester/Jamfile +++ b/src/tests/kits/net/tcptester/Jamfile @@ -2,5 +2,5 @@ SubDir HAIKU_TOP src tests kits net tcptester ; BinCommand tcptester : tcptester.cpp - : libnetwork.so $(TARGET_LIBSUPC++) + : libnetwork.so [ TargetLibsupc++ ] ; diff --git a/src/tests/kits/net/urlRequest/Jamfile b/src/tests/kits/net/urlRequest/Jamfile index dd53bf9fbf..c271f3921b 100644 --- a/src/tests/kits/net/urlRequest/Jamfile +++ b/src/tests/kits/net/urlRequest/Jamfile @@ -2,5 +2,5 @@ SubDir HAIKU_TOP src tests kits net urlRequest ; Application urlProtocolListener_test : urlProtocolListener_test.cpp - : be $(TARGET_NETWORK_LIBS) $(HAIKU_NETAPI_LIB) $(TARGET_LIBSTDC++) + : be $(TARGET_NETWORK_LIBS) $(HAIKU_NETAPI_LIB) [ TargetLibstdc++ ] ; diff --git a/src/tests/kits/opengl/direct_mode/Jamfile b/src/tests/kits/opengl/direct_mode/Jamfile index 0d3f88885e..35f6ad7981 100644 --- a/src/tests/kits/opengl/direct_mode/Jamfile +++ b/src/tests/kits/opengl/direct_mode/Jamfile @@ -15,7 +15,7 @@ Includes [ FGristFiles $(sources) ] SimpleTest GLDirectMode : $(sources) : - be game $(TARGET_LIBSUPC++) + be game [ TargetLibsupc++ ] [ BuildFeatureAttribute mesa : library ] [ BuildFeatureAttribute glu : library ] : GLDirectMode.rdef diff --git a/src/tests/kits/opengl/glinfo/Jamfile b/src/tests/kits/opengl/glinfo/Jamfile index d7a6bd0329..b8571d4e4b 100644 --- a/src/tests/kits/opengl/glinfo/Jamfile +++ b/src/tests/kits/opengl/glinfo/Jamfile @@ -27,7 +27,7 @@ Preference GLInfo : : be libglut.so translation libcolumnlistview.a localestub - $(TARGET_LIBSUPC++) + [ TargetLibsupc++ ] [ BuildFeatureAttribute mesa : library ] [ BuildFeatureAttribute glu : library ] : diff --git a/src/tests/kits/shared/Jamfile b/src/tests/kits/shared/Jamfile index f3754a4311..411a7fce7d 100644 --- a/src/tests/kits/shared/Jamfile +++ b/src/tests/kits/shared/Jamfile @@ -10,7 +10,7 @@ UnitTestLib libsharedtest.so : NaturalCompareTest.cpp - : be libshared.a $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++) + : be libshared.a [ TargetLibstdc++ ] [ TargetLibsupc++ ] ; SubInclude HAIKU_TOP src tests kits shared shake_filter ; diff --git a/src/tests/kits/shared/shake_filter/Jamfile b/src/tests/kits/shared/shake_filter/Jamfile index b305d1c1e1..df55cb0328 100644 --- a/src/tests/kits/shared/shake_filter/Jamfile +++ b/src/tests/kits/shared/shake_filter/Jamfile @@ -4,5 +4,5 @@ UsePrivateHeaders shared ; Application ShakeFilterTest : ShakeFilterTest.cpp - : libshared.a be $(TARGET_LIBSUPC++) + : libshared.a be [ TargetLibsupc++ ] ; diff --git a/src/tests/kits/storage/Jamfile b/src/tests/kits/storage/Jamfile index f933155cf8..b09da4aa71 100644 --- a/src/tests/kits/storage/Jamfile +++ b/src/tests/kits/storage/Jamfile @@ -25,7 +25,7 @@ UnitTestLib libstoragetest.so SymLinkTest.cpp TestApp.cpp VolumeTest.cpp - : be $(TARGET_LIBSTDC++) + : be [ TargetLibstdc++ ] ; # To run the tests some test files must be around. diff --git a/src/tests/kits/storage/testapps/Jamfile b/src/tests/kits/storage/testapps/Jamfile index 0b6ef3f548..ddd5fbef2e 100644 --- a/src/tests/kits/storage/testapps/Jamfile +++ b/src/tests/kits/storage/testapps/Jamfile @@ -14,11 +14,11 @@ SimpleTest dump_mime_types : dump_mime_types.cpp : be ; SimpleTest NodeMonitorTest - : NodeMonitorTest.cpp : be $(TARGET_LIBSUPC++) ; + : NodeMonitorTest.cpp : be [ TargetLibsupc++ ] ; SimpleTest PathMonitorTest : PathMonitorTest.cpp PathMonitor.cpp - : be $(TARGET_LIBSTDC++) + : be [ TargetLibstdc++ ] ; -SimpleTest PathMonitorTest2 : PathMonitorTest2.cpp : be $(TARGET_LIBSTDC++) ; +SimpleTest PathMonitorTest2 : PathMonitorTest2.cpp : be [ TargetLibstdc++ ] ; diff --git a/src/tests/kits/support/Jamfile b/src/tests/kits/support/Jamfile index 86a90aec89..626d35a6ef 100644 --- a/src/tests/kits/support/Jamfile +++ b/src/tests/kits/support/Jamfile @@ -80,12 +80,12 @@ UnitTestLib libsupporttest.so BlockCacheExerciseTest.cpp BlockCacheConcurrencyTest.cpp - : be $(TARGET_LIBSTDC++) libsupporttest_RemoteTestObject.so + : be [ TargetLibstdc++ ] libsupporttest_RemoteTestObject.so ; UsePrivateHeaders support ; -SimpleTest compression_test : compression_test.cpp : be $(TARGET_LIBSUPC++) ; +SimpleTest compression_test : compression_test.cpp : be [ TargetLibsupc++ ] ; SimpleTest string_utf8_tests : string_utf8_tests.cpp : be ; SubInclude HAIKU_TOP src tests kits support barchivable ; diff --git a/src/tests/kits/support/barchivable/remoteobjectdef/Jamfile b/src/tests/kits/support/barchivable/remoteobjectdef/Jamfile index c7757bd0ab..1dc036d7a5 100644 --- a/src/tests/kits/support/barchivable/remoteobjectdef/Jamfile +++ b/src/tests/kits/support/barchivable/remoteobjectdef/Jamfile @@ -5,6 +5,6 @@ AddSubDirSupportedPlatforms libbe_test ; UnitTestLib libsupporttest_RemoteTestObject.so : RemoteTestObject.cpp - : be $(TARGET_LIBSTDC++) + : be [ TargetLibstdc++ ] : RemoteTestObject.rdef ; diff --git a/src/tests/kits/translation/Jamfile b/src/tests/kits/translation/Jamfile index 5502f910c3..c91fb0162d 100644 --- a/src/tests/kits/translation/Jamfile +++ b/src/tests/kits/translation/Jamfile @@ -16,5 +16,5 @@ UnitTestLib libtranslationtest.so BitmapStreamTest.cpp TranslationUtilsTest.cpp TranslatorTest.cpp - : $(libtranslation) be $(TARGET_LIBSTDC++) + : $(libtranslation) be [ TargetLibstdc++ ] ; diff --git a/src/tests/libs/alm/Jamfile b/src/tests/libs/alm/Jamfile index 91ceef3c37..a684c2b3da 100644 --- a/src/tests/libs/alm/Jamfile +++ b/src/tests/libs/alm/Jamfile @@ -7,67 +7,67 @@ UsePrivateHeaders shared ; Application ALMHelloWorld : HelloWorld.cpp : - be libalm.so $(TARGET_LIBSUPC++) + be libalm.so [ TargetLibsupc++ ] ; Application ALMViews : Views.cpp : - be libalm.so $(TARGET_LIBSUPC++) + be libalm.so [ TargetLibsupc++ ] ; Application ALMPinwheel : Pinwheel.cpp : - be libalm.so $(TARGET_LIBSUPC++) + be libalm.so [ TargetLibsupc++ ] ; Application ALMAreas : Areas.cpp : - be libalm.so $(TARGET_LIBSUPC++) + be libalm.so [ TargetLibsupc++ ] ; Application ALMTableDemo : TableDemo.cpp : - be libalm.so $(TARGET_LIBSUPC++) + be libalm.so [ TargetLibsupc++ ] ; Application ALMOperator : OperatorLayout.cpp : - be libalm.so $(TARGET_LIBSTDC++) + be libalm.so [ TargetLibstdc++ ] ; Application ALMThreeButtons : ThreeButtons.cpp : - be libalm.so $(TARGET_LIBSTDC++) + be libalm.so [ TargetLibstdc++ ] ; Application ALMComplexButtons : ComplexButtons.cpp : - be libalm.so $(TARGET_LIBSTDC++) + be libalm.so [ TargetLibstdc++ ] ; Application ALMBadLayout : BadLayout.cpp : - be libalm.so $(TARGET_LIBSTDC++) + be libalm.so [ TargetLibstdc++ ] ; Application ALMNestedLayout : NestedLayout.cpp : - be libalm.so $(TARGET_LIBSTDC++) + be libalm.so [ TargetLibstdc++ ] ; Application ALMFriendLayout : FriendLayout.cpp : - be libalm.so $(TARGET_LIBSTDC++) + be libalm.so [ TargetLibstdc++ ] ; diff --git a/src/tests/libs/linprog/Jamfile b/src/tests/libs/linprog/Jamfile index 1d544391f6..85867ff70e 100644 --- a/src/tests/libs/linprog/Jamfile +++ b/src/tests/libs/linprog/Jamfile @@ -7,5 +7,5 @@ UseLibraryHeaders lp_solve linprog ; SimpleTest linprog_test : Program.cpp : - be liblpsolve55.so linprog.a $(TARGET_LIBSUPC++) $(TARGET_LIBSTDC++) + be liblpsolve55.so linprog.a [ TargetLibsupc++ ] [ TargetLibstdc++ ] ; diff --git a/src/tests/misc/Jamfile b/src/tests/misc/Jamfile index 40aae93925..7b5fea467a 100644 --- a/src/tests/misc/Jamfile +++ b/src/tests/misc/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src tests misc ; SetSubDirSupportedPlatformsBeOSCompatible ; -SimpleTest rtti-test : rtti-test.cpp : be $(TARGET_LIBSUPC++) ; +SimpleTest rtti-test : rtti-test.cpp : be [ TargetLibsupc++ ] ; SimpleTest writev-test : writev-test.cpp : be ; SubInclude HAIKU_TOP src tests misc exception-test ; diff --git a/src/tests/misc/exception-test/Jamfile b/src/tests/misc/exception-test/Jamfile index 0ff3df2d30..1523958734 100644 --- a/src/tests/misc/exception-test/Jamfile +++ b/src/tests/misc/exception-test/Jamfile @@ -4,10 +4,10 @@ SetSubDirSupportedPlatformsBeOSCompatible ; SharedLibrary libexceptiontest.so : exceptions.cpp - : $(TARGET_LIBSUPC++) + : [ TargetLibsupc++ ] ; SimpleTest exception-test : exception-test.cpp - : libexceptiontest.so $(TARGET_LIBSTDC++) + : libexceptiontest.so [ TargetLibstdc++ ] ; diff --git a/src/tests/servers/app/Jamfile b/src/tests/servers/app/Jamfile index 5b64feea90..af600870ac 100644 --- a/src/tests/servers/app/Jamfile +++ b/src/tests/servers/app/Jamfile @@ -201,7 +201,7 @@ Server test_app_server : [ BuildFeatureAttribute zlib : library ] libtestappserver.so be libhwinterface.so libhwinterfaceimpl.so libtextencoding.so [ BuildFeatureAttribute freetype : library ] - $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++) + [ TargetLibstdc++ ] [ TargetLibsupc++ ] ; # install in the test dir diff --git a/src/tests/servers/app/archived_view/Jamfile b/src/tests/servers/app/archived_view/Jamfile index 92e6af9085..90db947590 100644 --- a/src/tests/servers/app/archived_view/Jamfile +++ b/src/tests/servers/app/archived_view/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; SimpleTest ArchivedView : main.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] : ArchivedView.rdef ; diff --git a/src/tests/servers/app/async_drawing/Jamfile b/src/tests/servers/app/async_drawing/Jamfile index 1d465a1ee4..6536556725 100644 --- a/src/tests/servers/app/async_drawing/Jamfile +++ b/src/tests/servers/app/async_drawing/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; SimpleTest AsyncDrawing : main.cpp - : be $(TARGET_LIBSUPC++) ; + : be [ TargetLibsupc++ ] ; if ( $(TARGET_PLATFORM) = libbe_test ) { HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : AsyncDrawing diff --git a/src/tests/servers/app/avoid_focus/Jamfile b/src/tests/servers/app/avoid_focus/Jamfile index 66ea9b041d..2b886abfe0 100644 --- a/src/tests/servers/app/avoid_focus/Jamfile +++ b/src/tests/servers/app/avoid_focus/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; Application AvoidFocus : AvoidFocus.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; if $(TARGET_PLATFORM) = libbe_test { diff --git a/src/tests/servers/app/benchmark/Jamfile b/src/tests/servers/app/benchmark/Jamfile index e9f313d103..03ce1a8e54 100644 --- a/src/tests/servers/app/benchmark/Jamfile +++ b/src/tests/servers/app/benchmark/Jamfile @@ -15,7 +15,7 @@ Application Benchmark : Test.cpp TestWindow.cpp VerticalLineTest.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; if ( $(TARGET_PLATFORM) = libbe_test ) { diff --git a/src/tests/servers/app/bitmap_bounds/Jamfile b/src/tests/servers/app/bitmap_bounds/Jamfile index 16e76bbfce..ea5b9e170f 100644 --- a/src/tests/servers/app/bitmap_bounds/Jamfile +++ b/src/tests/servers/app/bitmap_bounds/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; SimpleTest BitmapBounds : main.cpp - : be $(TARGET_LIBSUPC++) ; + : be [ TargetLibsupc++ ] ; if ( $(TARGET_PLATFORM) = libbe_test ) { HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : BitmapBounds diff --git a/src/tests/servers/app/bitmap_drawing/Jamfile b/src/tests/servers/app/bitmap_drawing/Jamfile index 4337b51b47..cf0a1b60b7 100644 --- a/src/tests/servers/app/bitmap_drawing/Jamfile +++ b/src/tests/servers/app/bitmap_drawing/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; Application BitmapDrawing : main.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; if ( $(TARGET_PLATFORM) = libbe_test ) { diff --git a/src/tests/servers/app/clip_to_picture/Jamfile b/src/tests/servers/app/clip_to_picture/Jamfile index 9bc04416a3..6151e621f2 100644 --- a/src/tests/servers/app/clip_to_picture/Jamfile +++ b/src/tests/servers/app/clip_to_picture/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; SimpleTest ClipToPicture : main.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; if ( $(TARGET_PLATFORM) = libbe_test ) { diff --git a/src/tests/servers/app/constrain_clipping_region/Jamfile b/src/tests/servers/app/constrain_clipping_region/Jamfile index 4bac710651..7b03511e27 100644 --- a/src/tests/servers/app/constrain_clipping_region/Jamfile +++ b/src/tests/servers/app/constrain_clipping_region/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; SimpleTest ClippingRegion : main.cpp - : be $(TARGET_LIBSUPC++) ; + : be [ TargetLibsupc++ ] ; if ( $(TARGET_PLATFORM) = libbe_test ) { HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : ClippingRegion diff --git a/src/tests/servers/app/copy_bits/Jamfile b/src/tests/servers/app/copy_bits/Jamfile index c35ffbc7eb..d61cd8237e 100644 --- a/src/tests/servers/app/copy_bits/Jamfile +++ b/src/tests/servers/app/copy_bits/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; SimpleTest CopyBits : main.cpp - : be $(TARGET_LIBSUPC++) ; + : be [ TargetLibsupc++ ] ; #if ( $(TARGET_PLATFORM) = libbe_test ) { # HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : CopyBits diff --git a/src/tests/servers/app/cursor_test/Jamfile b/src/tests/servers/app/cursor_test/Jamfile index 13754f6269..772f57be32 100644 --- a/src/tests/servers/app/cursor_test/Jamfile +++ b/src/tests/servers/app/cursor_test/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; Application CursorTest : CursorTest.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; if $(TARGET_PLATFORM) = libbe_test { diff --git a/src/tests/servers/app/desktop_window/Jamfile b/src/tests/servers/app/desktop_window/Jamfile index ebebce035e..4eb8bc3a45 100644 --- a/src/tests/servers/app/desktop_window/Jamfile +++ b/src/tests/servers/app/desktop_window/Jamfile @@ -9,7 +9,7 @@ UsePrivateHeaders interface ; Application DesktopWindow : DesktopWindow.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; if $(TARGET_PLATFORM) = libbe_test { diff --git a/src/tests/servers/app/draw_after_children/Jamfile b/src/tests/servers/app/draw_after_children/Jamfile index 9b5309e84c..0fc1e0a10c 100644 --- a/src/tests/servers/app/draw_after_children/Jamfile +++ b/src/tests/servers/app/draw_after_children/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; Application DrawAfterChildren : DrawAfterChildren.cpp - : be $(TARGET_LIBSTDC++) + : be [ TargetLibstdc++ ] ; if $(TARGET_PLATFORM) = libbe_test { diff --git a/src/tests/servers/app/draw_string_offsets/Jamfile b/src/tests/servers/app/draw_string_offsets/Jamfile index cab82eaf61..97344c6a46 100644 --- a/src/tests/servers/app/draw_string_offsets/Jamfile +++ b/src/tests/servers/app/draw_string_offsets/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; SimpleTest DrawStringOffsets : main.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; if ( $(TARGET_PLATFORM) = libbe_test ) { diff --git a/src/tests/servers/app/drawing_debugger/Jamfile b/src/tests/servers/app/drawing_debugger/Jamfile index b7800c2435..ca1ae608ce 100644 --- a/src/tests/servers/app/drawing_debugger/Jamfile +++ b/src/tests/servers/app/drawing_debugger/Jamfile @@ -8,5 +8,5 @@ UseHeaders [ FDirName os interface ] ; Application DrawingDebugger : DrawingDebugger.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; diff --git a/src/tests/servers/app/drawing_modes/Jamfile b/src/tests/servers/app/drawing_modes/Jamfile index d3c4ae6353..dc32c5d9cd 100644 --- a/src/tests/servers/app/drawing_modes/Jamfile +++ b/src/tests/servers/app/drawing_modes/Jamfile @@ -8,5 +8,5 @@ UseHeaders [ FDirName os interface ] ; Application DrawingModes : DrawingModes.cpp - : $(TARGET_LIBSTDC++) be + : [ TargetLibstdc++ ] be ; diff --git a/src/tests/servers/app/event_mask/Jamfile b/src/tests/servers/app/event_mask/Jamfile index 5b12d8db40..96d9a34794 100644 --- a/src/tests/servers/app/event_mask/Jamfile +++ b/src/tests/servers/app/event_mask/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; Application EventMask : EventMask.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; if $(TARGET_PLATFORM) = libbe_test { diff --git a/src/tests/servers/app/find_view/Jamfile b/src/tests/servers/app/find_view/Jamfile index abea9de19c..39bf6d279a 100644 --- a/src/tests/servers/app/find_view/Jamfile +++ b/src/tests/servers/app/find_view/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; Application FindView : FindView.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; if ( $(TARGET_PLATFORM) = libbe_test ) { diff --git a/src/tests/servers/app/following/Jamfile b/src/tests/servers/app/following/Jamfile index 7d81adf2e2..89f6d06ab4 100644 --- a/src/tests/servers/app/following/Jamfile +++ b/src/tests/servers/app/following/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; SimpleTest Following : main.cpp - : be $(TARGET_LIBSUPC++) ; + : be [ TargetLibsupc++ ] ; if ( $(TARGET_PLATFORM) = libbe_test ) { HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : Following diff --git a/src/tests/servers/app/font_spacing/Jamfile b/src/tests/servers/app/font_spacing/Jamfile index b54648a19c..5232e91422 100644 --- a/src/tests/servers/app/font_spacing/Jamfile +++ b/src/tests/servers/app/font_spacing/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; SimpleTest FontSpacing : main.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] : ; diff --git a/src/tests/servers/app/gradients/Jamfile b/src/tests/servers/app/gradients/Jamfile index f714acb830..594fd5729f 100644 --- a/src/tests/servers/app/gradients/Jamfile +++ b/src/tests/servers/app/gradients/Jamfile @@ -11,7 +11,7 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src tests servers app harness ] ; SimpleTest Gradients : harness.cpp main.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] : Gradients.rdef ; diff --git a/src/tests/servers/app/hide_and_show/Jamfile b/src/tests/servers/app/hide_and_show/Jamfile index 3d7404b21d..8e7914ece9 100644 --- a/src/tests/servers/app/hide_and_show/Jamfile +++ b/src/tests/servers/app/hide_and_show/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; Application HideAndShow : HideAndShow.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; if $(TARGET_PLATFORM) = libbe_test { diff --git a/src/tests/servers/app/lagging_get_mouse/Jamfile b/src/tests/servers/app/lagging_get_mouse/Jamfile index 75bd492bd8..3cf4a99022 100644 --- a/src/tests/servers/app/lagging_get_mouse/Jamfile +++ b/src/tests/servers/app/lagging_get_mouse/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; SimpleTest LaggingGetMouse : main.cpp - : be $(TARGET_LIBSUPC++) ; + : be [ TargetLibsupc++ ] ; if ( $(TARGET_PLATFORM) = libbe_test ) { HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : LaggingGetMouse diff --git a/src/tests/servers/app/lock_focus/Jamfile b/src/tests/servers/app/lock_focus/Jamfile index 5cef6b53ec..2360cabf56 100644 --- a/src/tests/servers/app/lock_focus/Jamfile +++ b/src/tests/servers/app/lock_focus/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; Application LockFocusTest : LockFocusTest.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; if $(TARGET_PLATFORM) = libbe_test { diff --git a/src/tests/servers/app/look_and_feel/Jamfile b/src/tests/servers/app/look_and_feel/Jamfile index e6f35b7a74..ba50bc2bc9 100644 --- a/src/tests/servers/app/look_and_feel/Jamfile +++ b/src/tests/servers/app/look_and_feel/Jamfile @@ -9,7 +9,7 @@ UsePrivateHeaders interface ; Application LookAndFeel : LookAndFeel.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; if $(TARGET_PLATFORM) = libbe_test { diff --git a/src/tests/servers/app/menu_crash/Jamfile b/src/tests/servers/app/menu_crash/Jamfile index 9e851a28f2..0116821a8e 100644 --- a/src/tests/servers/app/menu_crash/Jamfile +++ b/src/tests/servers/app/menu_crash/Jamfile @@ -8,6 +8,6 @@ UseHeaders [ FDirName os interface ] ; Application MenuCrash : MenuCrash.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; diff --git a/src/tests/servers/app/no_pointer_history/Jamfile b/src/tests/servers/app/no_pointer_history/Jamfile index eca15ced71..6761c5d917 100644 --- a/src/tests/servers/app/no_pointer_history/Jamfile +++ b/src/tests/servers/app/no_pointer_history/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; Application NoPointerHistory : NoPointerHistory.cpp - : be $(TARGET_LIBSTDC++) + : be [ TargetLibstdc++ ] ; if $(TARGET_PLATFORM) = libbe_test { diff --git a/src/tests/servers/app/playground/Jamfile b/src/tests/servers/app/playground/Jamfile index bc4da0797b..4b3f237999 100644 --- a/src/tests/servers/app/playground/Jamfile +++ b/src/tests/servers/app/playground/Jamfile @@ -11,7 +11,7 @@ Application Playground : ObjectView.cpp ObjectWindow.cpp States.cpp - : be $(TARGET_LIBSUPC++) localestub + : be [ TargetLibsupc++ ] localestub : Playground.rdef ; diff --git a/src/tests/servers/app/pulsed_drawing/Jamfile b/src/tests/servers/app/pulsed_drawing/Jamfile index c6a348b081..e2c0c68db0 100644 --- a/src/tests/servers/app/pulsed_drawing/Jamfile +++ b/src/tests/servers/app/pulsed_drawing/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; SimpleTest PulsedDrawing : main.cpp - : be $(TARGET_LIBSUPC++) ; + : be [ TargetLibsupc++ ] ; if ( $(TARGET_PLATFORM) = libbe_test ) { HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : PulsedDrawing diff --git a/src/tests/servers/app/regularapps/Jamfile b/src/tests/servers/app/regularapps/Jamfile index e56acc2f6d..b5de971bd7 100644 --- a/src/tests/servers/app/regularapps/Jamfile +++ b/src/tests/servers/app/regularapps/Jamfile @@ -15,7 +15,7 @@ SimpleTest TestApp_Clock : cl_view.cpp cl_wind.cpp clock.cpp - : be localestub $(TARGET_LIBSUPC++) + : be localestub [ TargetLibsupc++ ] : Clock.rdef ; diff --git a/src/tests/servers/app/resize_limits/Jamfile b/src/tests/servers/app/resize_limits/Jamfile index 72fdb30676..a0d8bd76bc 100644 --- a/src/tests/servers/app/resize_limits/Jamfile +++ b/src/tests/servers/app/resize_limits/Jamfile @@ -5,5 +5,5 @@ AddSubDirSupportedPlatforms libbe_test ; Application ResizeLimits : ResizeLimits.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; diff --git a/src/tests/servers/app/scrollbar/Jamfile b/src/tests/servers/app/scrollbar/Jamfile index 13a6f44c7e..5e990cd803 100644 --- a/src/tests/servers/app/scrollbar/Jamfile +++ b/src/tests/servers/app/scrollbar/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; SimpleTest ScrollBar : main.cpp - : be $(TARGET_LIBSUPC++) ; + : be [ TargetLibsupc++ ] ; if ( $(TARGET_PLATFORM) = libbe_test ) { HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : ScrollBar diff --git a/src/tests/servers/app/scrolling/Jamfile b/src/tests/servers/app/scrolling/Jamfile index 3b4c5300bb..9752e96c87 100644 --- a/src/tests/servers/app/scrolling/Jamfile +++ b/src/tests/servers/app/scrolling/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; SimpleTest Scrolling : main.cpp - : be $(TARGET_LIBSUPC++) ; + : be [ TargetLibsupc++ ] ; #if ( $(TARGET_PLATFORM) = libbe_test ) { # HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : Scrolling diff --git a/src/tests/servers/app/shape_test/Jamfile b/src/tests/servers/app/shape_test/Jamfile index 458b78afa4..59c7a3b9d7 100644 --- a/src/tests/servers/app/shape_test/Jamfile +++ b/src/tests/servers/app/shape_test/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; SimpleTest ShapeTest : main.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; if ( $(TARGET_PLATFORM) = libbe_test ) { diff --git a/src/tests/servers/app/statusbar/Jamfile b/src/tests/servers/app/statusbar/Jamfile index 3163c774be..1a0f4c7cfa 100644 --- a/src/tests/servers/app/statusbar/Jamfile +++ b/src/tests/servers/app/statusbar/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; SimpleTest StatusBar : main.cpp - : be $(TARGET_LIBSUPC++) ; + : be [ TargetLibsupc++ ] ; if ( $(TARGET_PLATFORM) = libbe_test ) { HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : StatusBar diff --git a/src/tests/servers/app/stress_test/Jamfile b/src/tests/servers/app/stress_test/Jamfile index b5c526c593..9dc84c48d5 100644 --- a/src/tests/servers/app/stress_test/Jamfile +++ b/src/tests/servers/app/stress_test/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; Application StressTest : main.cpp - : be $(TARGET_LIBSTDC++) + : be [ TargetLibstdc++ ] ; if ( $(TARGET_PLATFORM) = libbe_test ) { diff --git a/src/tests/servers/app/textview/Jamfile b/src/tests/servers/app/textview/Jamfile index a39df77cd8..225967fa87 100644 --- a/src/tests/servers/app/textview/Jamfile +++ b/src/tests/servers/app/textview/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; SimpleTest TextView : main.cpp - : be $(TARGET_LIBSUPC++) ; + : be [ TargetLibsupc++ ] ; #if ( $(TARGET_PLATFORM) = libbe_test ) { # HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : TextView diff --git a/src/tests/servers/app/transformation/Jamfile b/src/tests/servers/app/transformation/Jamfile index e73b55737b..da31d8db15 100644 --- a/src/tests/servers/app/transformation/Jamfile +++ b/src/tests/servers/app/transformation/Jamfile @@ -11,7 +11,7 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src tests servers app harness ] ; SimpleTest Transformation : harness.cpp main.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] : Transformation.rdef ; diff --git a/src/tests/servers/app/view_state/Jamfile b/src/tests/servers/app/view_state/Jamfile index e856ed9cbf..647b579216 100644 --- a/src/tests/servers/app/view_state/Jamfile +++ b/src/tests/servers/app/view_state/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; Application ViewState : ViewState.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; if $(TARGET_PLATFORM) = libbe_test { diff --git a/src/tests/servers/app/view_transit/Jamfile b/src/tests/servers/app/view_transit/Jamfile index e6699d301b..5909ddc66b 100644 --- a/src/tests/servers/app/view_transit/Jamfile +++ b/src/tests/servers/app/view_transit/Jamfile @@ -8,6 +8,6 @@ UseHeaders [ FDirName os interface ] ; Application ViewTransit : ViewTransit.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; diff --git a/src/tests/servers/app/window_creation/Jamfile b/src/tests/servers/app/window_creation/Jamfile index f418efd4c2..ccdb335867 100644 --- a/src/tests/servers/app/window_creation/Jamfile +++ b/src/tests/servers/app/window_creation/Jamfile @@ -8,6 +8,6 @@ UseHeaders [ FDirName os interface ] ; Application WindowCreation : main.cpp - : $(TARGET_LIBSTDC++) be + : [ TargetLibstdc++ ] be ; diff --git a/src/tests/servers/app/window_invalidation/Jamfile b/src/tests/servers/app/window_invalidation/Jamfile index dba528dad2..833b9f5baf 100644 --- a/src/tests/servers/app/window_invalidation/Jamfile +++ b/src/tests/servers/app/window_invalidation/Jamfile @@ -7,7 +7,7 @@ UsePrivateHeaders interface ; Application WindowInvalidation : WindowInvalidation.cpp - : be $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++) + : be [ TargetLibstdc++ ] [ TargetLibsupc++ ] ; if $(TARGET_PLATFORM) = libbe_test { diff --git a/src/tests/servers/app/workspace_activated/Jamfile b/src/tests/servers/app/workspace_activated/Jamfile index 5337cdec0d..773bd6e2cc 100644 --- a/src/tests/servers/app/workspace_activated/Jamfile +++ b/src/tests/servers/app/workspace_activated/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; Application WorkspaceActivated : WorkspaceActivated.cpp - : be $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++) + : be [ TargetLibstdc++ ] [ TargetLibsupc++ ] ; if $(TARGET_PLATFORM) = libbe_test { diff --git a/src/tests/servers/app/workspace_switcher/Jamfile b/src/tests/servers/app/workspace_switcher/Jamfile index 4df7ba0728..05da4d0660 100644 --- a/src/tests/servers/app/workspace_switcher/Jamfile +++ b/src/tests/servers/app/workspace_switcher/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; Application workspace_switcher : workspace_switcher.cpp - : be $(TARGET_LIBSTDC++) + : be [ TargetLibstdc++ ] ; if $(TARGET_PLATFORM) = libbe_test { diff --git a/src/tests/servers/input/replicant/Jamfile b/src/tests/servers/input/replicant/Jamfile index 029ad7c83a..d954cbc5d9 100644 --- a/src/tests/servers/input/replicant/Jamfile +++ b/src/tests/servers/input/replicant/Jamfile @@ -12,7 +12,7 @@ SimpleTest ReplicantTest : MethodReplicant.cpp MethodMenuItem.cpp main.cpp - : be tracker $(TARGET_LIBSUPC++) ; + : be tracker [ TargetLibsupc++ ] ; SEARCH on [ FGristFiles MethodReplicant.cpp diff --git a/src/tests/servers/registrar/Jamfile b/src/tests/servers/registrar/Jamfile index 1c72fe68b2..91d8c362c2 100644 --- a/src/tests/servers/registrar/Jamfile +++ b/src/tests/servers/registrar/Jamfile @@ -9,12 +9,12 @@ SetSubDirSupportedPlatformsBeOSCompatible ; SimpleTest RegistrarTest1 : RegistrarTest1.cpp - : be $(TARGET_LIBSUPC++) + : be [ TargetLibsupc++ ] ; SimpleTest RosterShell : RosterShell.cpp - : be $(TARGET_LIBSTDC++) + : be [ TargetLibstdc++ ] ; SimpleTest message_deliverer_test : message_deliverer_test.cpp : be ; @@ -108,7 +108,7 @@ Server test_registrar R5Compatibility.cpp : libstorage_kit_mime.a - be localestub $(TARGET_LIBSTDC++) + be localestub [ TargetLibstdc++ ] : registrar.rdef ; diff --git a/src/tests/system/kernel/Jamfile b/src/tests/system/kernel/Jamfile index ce1ef96add..efb39a000a 100644 --- a/src/tests/system/kernel/Jamfile +++ b/src/tests/system/kernel/Jamfile @@ -59,7 +59,7 @@ SimpleTest sem_acquire_test1 : sem_acquire_test1.cpp : be ; SimpleTest spinlock_contention : spinlock_contention.cpp ; SimpleTest syscall_restart_test : syscall_restart_test.cpp - : network $(TARGET_LIBSUPC++) ; + : network [ TargetLibsupc++ ] ; SetSupportedPlatformsForTarget syscall_time : $(HAIKU_BEOS_COMPATIBLE_PLATFORMS) ; diff --git a/src/tests/system/kernel/device_manager/Jamfile b/src/tests/system/kernel/device_manager/Jamfile index d3d1f33d4d..b759e27807 100644 --- a/src/tests/system/kernel/device_manager/Jamfile +++ b/src/tests/system/kernel/device_manager/Jamfile @@ -14,7 +14,6 @@ UsePrivateKernelHeaders ; KernelAddon dma_resource_test : dma_resource_test.cpp -#: $(HAIKU_LIBSUPC++) ; SubInclude HAIKU_TOP src tests system kernel device_manager playground ; diff --git a/src/tests/system/kernel/file_corruption/disk_system/Jamfile b/src/tests/system/kernel/file_corruption/disk_system/Jamfile index 40bcb29ec9..465d5670be 100644 --- a/src/tests/system/kernel/file_corruption/disk_system/Jamfile +++ b/src/tests/system/kernel/file_corruption/disk_system/Jamfile @@ -9,5 +9,5 @@ UseHeaders [ FDirName $(SUBDIR) $(DOTDOT) ] ; Addon checksumfs : checksumfs.cpp - : be $(TARGET_LIBSTDC++) + : be [ TargetLibstdc++ ] ; diff --git a/src/tests/system/kernel/file_corruption/fs/userland/Jamfile b/src/tests/system/kernel/file_corruption/fs/userland/Jamfile index 3767d10c37..98ef5ae89f 100644 --- a/src/tests/system/kernel/file_corruption/fs/userland/Jamfile +++ b/src/tests/system/kernel/file_corruption/fs/userland/Jamfile @@ -29,7 +29,7 @@ Addon checksumfs : # from src/kits/shared SHA256.cpp - : libuserlandfs_haiku_kernel.so $(TARGET_LIBSUPC++) + : libuserlandfs_haiku_kernel.so [ TargetLibsupc++ ] ; diff --git a/src/tests/system/kernel/util/Jamfile b/src/tests/system/kernel/util/Jamfile index 4c18a532c3..a1e8b712f2 100644 --- a/src/tests/system/kernel/util/Jamfile +++ b/src/tests/system/kernel/util/Jamfile @@ -17,6 +17,6 @@ UnitTestLib libkernelutilstest.so VectorMapTest.cpp VectorSetTest.cpp VectorTest.cpp - : $(TARGET_LIBSTDC++) + : [ TargetLibstdc++ ] ; diff --git a/src/tests/system/libroot/posix/Jamfile b/src/tests/system/libroot/posix/Jamfile index 56396e89a1..bcde27f07a 100644 --- a/src/tests/system/libroot/posix/Jamfile +++ b/src/tests/system/libroot/posix/Jamfile @@ -16,7 +16,7 @@ SimpleTest flock_test : flock_test.cpp ; SimpleTest fseek_test : fseek_test.cpp ; SimpleTest getsubopt_test : getsubopt_test.cpp ; SimpleTest locale_test : locale_test.cpp ; -SimpleTest memalign_test : memalign_test.cpp : $(TARGET_LIBSUPC++) ; +SimpleTest memalign_test : memalign_test.cpp : [ TargetLibsupc++ ] ; SimpleTest mprotect_test : mprotect_test.cpp ; SimpleTest pthread_signal_test : pthread_signal_test.cpp ; SimpleTest realtime_sem_test1 : realtime_sem_test1.cpp ; diff --git a/src/tests/system/libroot/posix/bonnie++-1.03d/Jamfile b/src/tests/system/libroot/posix/bonnie++-1.03d/Jamfile index edd67c39cb..1bbcca1646 100644 --- a/src/tests/system/libroot/posix/bonnie++-1.03d/Jamfile +++ b/src/tests/system/libroot/posix/bonnie++-1.03d/Jamfile @@ -10,12 +10,12 @@ SimpleTest bonnie++ : bonnie++.cpp : - $(TARGET_LIBSUPC++) + [ TargetLibsupc++ ] ; SimpleTest zcav : bon_suid.cpp zcav.cpp : - $(TARGET_LIBSUPC++) + [ TargetLibsupc++ ] ; diff --git a/src/tools/cppunit/Jamfile b/src/tools/cppunit/Jamfile index 087a12ab77..3e75287a2e 100644 --- a/src/tools/cppunit/Jamfile +++ b/src/tools/cppunit/Jamfile @@ -49,7 +49,7 @@ SharedLibrary libcppunit.so : TextTestResult.cpp TypeInfoHelper.cpp XmlOutputter.cpp - : be $(TARGET_LIBSTDC++) + : be [ TargetLibstdc++ ] ; if $(OS) = BEOS && $(OSPLAT) != PPC { diff --git a/src/tools/translation/bitsinfo/Jamfile b/src/tools/translation/bitsinfo/Jamfile index 3b303b4b6d..854990f903 100644 --- a/src/tools/translation/bitsinfo/Jamfile +++ b/src/tools/translation/bitsinfo/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src tools translation bitsinfo ; BinCommand bitsinfo : bitsinfo.cpp - : be libbe.so localestub translation $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++) ; + : be libbe.so localestub translation [ TargetLibstdc++ ] [ TargetLibsupc++ ] ; AddResources bitsinfo : bitsinfo.rdef ; diff --git a/src/tools/translation/bmpinfo/Jamfile b/src/tools/translation/bmpinfo/Jamfile index 6547a8f70d..3ea143c92a 100644 --- a/src/tools/translation/bmpinfo/Jamfile +++ b/src/tools/translation/bmpinfo/Jamfile @@ -1,6 +1,6 @@ SubDir HAIKU_TOP src tools translation bmpinfo ; -BinCommand bmpinfo : bmpinfo.cpp : be libbe.so localestub translation $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++) ; +BinCommand bmpinfo : bmpinfo.cpp : be libbe.so localestub translation [ TargetLibstdc++ ] [ TargetLibsupc++ ] ; AddResources bmpinfo : bmpinfo.rdef ; diff --git a/src/tools/translation/inspector/Jamfile b/src/tools/translation/inspector/Jamfile index 8f96ff0b61..d1fa6f0eb8 100644 --- a/src/tools/translation/inspector/Jamfile +++ b/src/tools/translation/inspector/Jamfile @@ -21,5 +21,5 @@ DoCatalogs Inspector : ; LinkAgainst Inspector : - be tracker translation $(TARGET_LIBSUPC++) localestub ; + be tracker translation [ TargetLibsupc++ ] localestub ; diff --git a/src/tools/translation/pnginfo/Jamfile b/src/tools/translation/pnginfo/Jamfile index ad98a6a630..149f134eb5 100644 --- a/src/tools/translation/pnginfo/Jamfile +++ b/src/tools/translation/pnginfo/Jamfile @@ -12,5 +12,5 @@ Includes [ FGristFiles pnginfo.cpp ] BinCommand pnginfo : pnginfo.cpp : be [ BuildFeatureAttribute libpng : library ] [ BuildFeatureAttribute zlib : library ] - $(TARGET_LIBSUPC++) ; + [ TargetLibsupc++ ] ; diff --git a/src/tools/translation/stxtinfo/Jamfile b/src/tools/translation/stxtinfo/Jamfile index 62b9993334..fd95d042dc 100644 --- a/src/tools/translation/stxtinfo/Jamfile +++ b/src/tools/translation/stxtinfo/Jamfile @@ -1,4 +1,4 @@ SubDir HAIKU_TOP src tools translation stxtinfo ; -BinCommand stxtinfo : stxtinfo.cpp : be $(TARGET_LIBSUPC++) ; +BinCommand stxtinfo : stxtinfo.cpp : be [ TargetLibsupc++ ] ; diff --git a/src/tools/translation/tgainfo/Jamfile b/src/tools/translation/tgainfo/Jamfile index 13075a36bf..44aa61dd93 100644 --- a/src/tools/translation/tgainfo/Jamfile +++ b/src/tools/translation/tgainfo/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src tools translation tgainfo ; BinCommand tgainfo : tgainfo.cpp - : be libbe.so localestub translation $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++) ; + : be libbe.so localestub translation [ TargetLibstdc++ ] [ TargetLibsupc++ ] ; AddResources tgainfo : tgainfo.rdef ;