diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules index a31a26ea45..c7965c5cd7 100644 --- a/build/jam/MainBuildRules +++ b/build/jam/MainBuildRules @@ -98,46 +98,42 @@ rule Server Executable $(1) : $(2) : $(3) : $(4) ; } -rule Addon +rule Addon target : sources : libraries : isExecutable { - # Addon : : : : ; - # : Name of the add-on. - # : Path where the add-on shall live relative to the add-on dir. + # Addon : : : ; + # : The add-on. # : Source files. - # : true, if the target shall be executable as well. # : Libraries to be linked against. -# TODO: is no longer needed + # : true, if the target shall be executable as well. - if ! [ IsPlatformSupportedForTarget $(1) ] { + if ! [ IsPlatformSupportedForTarget $(target) ] { return ; } - local isExecutable = $(4) ; - - Main $(1) : $(3) ; + Main $(target) : $(sources) ; - local linkFlags = -Xlinker -soname=\"$(1:G=)\" ; + local linkFlags = -Xlinker -soname=\"$(target:G=)\" ; if $(isExecutable) != true { linkFlags = -nostart $(linkFlags) ; } - LINKFLAGS on $(1) = [ on $(1) return $(LINKFLAGS) ] $(linkFlags) ; - LinkAgainst $(1) : $(5) ; + LINKFLAGS on $(target) = [ on $(target) return $(LINKFLAGS) ] $(linkFlags) ; + LinkAgainst $(target) : $(libraries) ; - AddSharedObjectGlueCode $(1) : $(isExecutable) ; + AddSharedObjectGlueCode $(target) : $(isExecutable) ; } -rule Translator +rule Translator target : sources : libraries { - # Translator : : ; + # Translator : : ; # TODO: Although they currently all are, translators don't need to be # executable. Introduce a flag as for Addon. - Addon $(1) : Translators : $(2) : true : $(3) ; + Addon $(target) : $(sources) : $(libraries) : true ; } -rule ScreenSaver +rule ScreenSaver target : sources : libraries { - # ScreenSaver : : ; - Addon $(1) : screen_savers : $(2) : false : $(3) ; + # ScreenSaver : : ; + Addon $(target) : $(sources) : $(libraries) : false ; } rule StaticLibrary diff --git a/src/add-ons/accelerants/atimach64/Jamfile b/src/add-ons/accelerants/atimach64/Jamfile index c82ecb8ec2..e073a933a8 100644 --- a/src/add-ons/accelerants/atimach64/Jamfile +++ b/src/add-ons/accelerants/atimach64/Jamfile @@ -3,7 +3,7 @@ SubDir HAIKU_TOP src add-ons accelerants atimach64 ; UsePrivateHeaders graphics ; UsePrivateHeaders [ FDirName graphics atimach64 ] ; -Addon atimach64.accelerant : accelerants : +Addon atimach64.accelerant : Acceleration.c Cursor.c EngineManagment.c diff --git a/src/add-ons/accelerants/et6x00/Jamfile b/src/add-ons/accelerants/et6x00/Jamfile index 72f1c90f53..4ee6fd478e 100644 --- a/src/add-ons/accelerants/et6x00/Jamfile +++ b/src/add-ons/accelerants/et6x00/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons accelerants et6x00 ; UsePrivateHeaders [ FDirName graphics et6x00 ] ; -Addon et6x00.accelerant : accelerants : +Addon et6x00.accelerant : Acceleration.c EngineManagment.c GetAccelerantHook.c @@ -11,8 +11,6 @@ Addon et6x00.accelerant : accelerants : InitAccelerant.c ProposeDisplayMode.c SetDisplayMode.c - : false - : ; Depends et6x00.accelerant : et6x00.driver ; diff --git a/src/add-ons/accelerants/intel_extreme/Jamfile b/src/add-ons/accelerants/intel_extreme/Jamfile index bb486ccd5e..3bd9b9a0c4 100644 --- a/src/add-ons/accelerants/intel_extreme/Jamfile +++ b/src/add-ons/accelerants/intel_extreme/Jamfile @@ -6,7 +6,7 @@ UsePrivateHeaders graphics ; UsePrivateHeaders [ FDirName graphics intel_extreme ] ; UsePrivateHeaders [ FDirName graphics common ] ; -Addon intel_extreme.accelerant : accelerants : +Addon intel_extreme.accelerant : accelerant.cpp cursor.cpp dpms.cpp @@ -15,11 +15,10 @@ Addon intel_extreme.accelerant : accelerants : memory.cpp mode.cpp overlay.cpp - : false : be ; Package haiku-intel_extreme-cvs : intel_extreme.accelerant : boot home config add-ons accelerants ; - \ No newline at end of file + diff --git a/src/add-ons/accelerants/matrox/Jamfile b/src/add-ons/accelerants/matrox/Jamfile index d279c1fa4b..e5cfefed67 100644 --- a/src/add-ons/accelerants/matrox/Jamfile +++ b/src/add-ons/accelerants/matrox/Jamfile @@ -6,7 +6,7 @@ UsePrivateHeaders graphics ; UsePrivateHeaders [ FDirName graphics matrox ] ; UseHeaders [ FDirName $(SUBDIR) engine ] ; -Addon mga.accelerant : accelerants : +Addon mga.accelerant : Cursor.c EngineManagment.c GetAccelerantHook.c @@ -17,7 +17,7 @@ Addon mga.accelerant : accelerants : Overlay.c ProposeDisplayMode.c SetDisplayMode.c - : false : libmatrox_engine.a + : libmatrox_engine.a ; Package haiku-matrox-cvs : diff --git a/src/add-ons/accelerants/neomagic/Jamfile b/src/add-ons/accelerants/neomagic/Jamfile index f556d57da1..08d328edb0 100644 --- a/src/add-ons/accelerants/neomagic/Jamfile +++ b/src/add-ons/accelerants/neomagic/Jamfile @@ -6,7 +6,7 @@ UsePrivateHeaders graphics ; UsePrivateHeaders [ FDirName graphics neomagic ] ; UseHeaders [ FDirName $(SUBDIR) engine ] ; -Addon nm.accelerant : accelerants : +Addon nm.accelerant : Acceleration.c Cursor.c EngineManagment.c @@ -18,7 +18,7 @@ Addon nm.accelerant : accelerants : Overlay.c ProposeDisplayMode.c SetDisplayMode.c - : false : libneomagic_engine.a + : libneomagic_engine.a ; Package haiku-neomagic-cvs : diff --git a/src/add-ons/accelerants/nvidia/Jamfile b/src/add-ons/accelerants/nvidia/Jamfile index f7faf62709..c379f33061 100644 --- a/src/add-ons/accelerants/nvidia/Jamfile +++ b/src/add-ons/accelerants/nvidia/Jamfile @@ -6,7 +6,7 @@ UsePrivateHeaders graphics ; UsePrivateHeaders [ FDirName graphics nvidia ] ; UseHeaders [ FDirName $(SUBDIR) engine ] ; -Addon nv.accelerant : accelerants : +Addon nv.accelerant : Acceleration.c Cursor.c EngineManagment.c @@ -18,7 +18,7 @@ Addon nv.accelerant : accelerants : Overlay.c ProposeDisplayMode.c SetDisplayMode.c - : false : libnvidia_engine.a + : libnvidia_engine.a ; Package haiku-nvidia-cvs : diff --git a/src/add-ons/accelerants/radeon/Jamfile b/src/add-ons/accelerants/radeon/Jamfile index c5f6e371d6..337f8aaf11 100644 --- a/src/add-ons/accelerants/radeon/Jamfile +++ b/src/add-ons/accelerants/radeon/Jamfile @@ -6,7 +6,7 @@ UsePrivateHeaders graphics ; UsePrivateHeaders [ FDirName graphics radeon ] ; UsePrivateHeaders [ FDirName graphics common ] ; -Addon radeon.accelerant : accelerants : +Addon radeon.accelerant : Acceleration.c CP.c Cursor.c @@ -33,7 +33,6 @@ Addon radeon.accelerant : accelerants : settings.cpp theatre_out.c vesa_modes.c - : false : libaccelerantscommon.a libradeon.a be ; diff --git a/src/add-ons/accelerants/s3savage/Jamfile b/src/add-ons/accelerants/s3savage/Jamfile index 146fb77e40..728b13d0e7 100644 --- a/src/add-ons/accelerants/s3savage/Jamfile +++ b/src/add-ons/accelerants/s3savage/Jamfile @@ -5,7 +5,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders graphics ; UsePrivateHeaders [ FDirName graphics s3savage ] ; -Addon s3savage.accelerant : accelerants : +Addon s3savage.accelerant : Acceleration.c Cursor.c EngineManagement.c @@ -20,7 +20,6 @@ Addon s3savage.accelerant : accelerants : s3drv.c s3vga.c - : false : be ; diff --git a/src/add-ons/accelerants/skeleton/Jamfile b/src/add-ons/accelerants/skeleton/Jamfile index 7c172b7360..99a0b36a01 100644 --- a/src/add-ons/accelerants/skeleton/Jamfile +++ b/src/add-ons/accelerants/skeleton/Jamfile @@ -6,7 +6,7 @@ UsePrivateHeaders graphics ; UsePrivateHeaders [ FDirName graphics skeleton ] ; UseHeaders [ FDirName $(SUBDIR) engine ] ; -Addon skel.accelerant : accelerants : +Addon skel.accelerant : Acceleration.c Cursor.c EngineManagement.c @@ -18,7 +18,7 @@ Addon skel.accelerant : accelerants : Overlay.c ProposeDisplayMode.c SetDisplayMode.c - : false : libskeleton_engine.a + : libskeleton_engine.a ; Package haiku-skeleton-cvs : diff --git a/src/add-ons/accelerants/tdfx/Jamfile b/src/add-ons/accelerants/tdfx/Jamfile index bd15f98547..6ba6435c2e 100644 --- a/src/add-ons/accelerants/tdfx/Jamfile +++ b/src/add-ons/accelerants/tdfx/Jamfile @@ -4,7 +4,7 @@ UsePrivateHeaders graphics ; UsePrivateHeaders [ FDirName graphics tdfx ] ; -Addon tdfx.accelerant : accelerants : +Addon tdfx.accelerant : voodoo3_accelerant.c Acceleration.c Cursor.c diff --git a/src/add-ons/accelerants/vesa/Jamfile b/src/add-ons/accelerants/vesa/Jamfile index 1c79b1f5a0..89f59c1773 100644 --- a/src/add-ons/accelerants/vesa/Jamfile +++ b/src/add-ons/accelerants/vesa/Jamfile @@ -5,11 +5,10 @@ UsePrivateHeaders [ FDirName graphics vesa ] ; #AddResources vesa.accelerant : vesa.accelerant.rdef ; -Addon vesa.accelerant : accelerants : +Addon vesa.accelerant : accelerant.cpp dpms.cpp engine.cpp hooks.cpp mode.cpp - : false # this add-on is not executable - ; +; diff --git a/src/add-ons/accelerants/via/Jamfile b/src/add-ons/accelerants/via/Jamfile index ad1f760a91..fc5fa2b9b0 100644 --- a/src/add-ons/accelerants/via/Jamfile +++ b/src/add-ons/accelerants/via/Jamfile @@ -6,7 +6,7 @@ UsePrivateHeaders graphics ; UsePrivateHeaders [ FDirName graphics via ] ; UseHeaders [ FDirName $(SUBDIR) engine ] ; -Addon via.accelerant : accelerants : +Addon via.accelerant : Acceleration.c Cursor.c EngineManagement.c @@ -18,7 +18,7 @@ Addon via.accelerant : accelerants : Overlay.c ProposeDisplayMode.c SetDisplayMode.c - : false : libvia_engine.a + : libvia_engine.a ; Package haiku-via_gfx-cvs : diff --git a/src/add-ons/accelerants/vmware/Jamfile b/src/add-ons/accelerants/vmware/Jamfile index c796600ea4..89b3f290ee 100644 --- a/src/add-ons/accelerants/vmware/Jamfile +++ b/src/add-ons/accelerants/vmware/Jamfile @@ -5,7 +5,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders [ FDirName graphics vmware ] ; UsePrivateHeaders graphics ; -Addon vmware.accelerant : accelerants : +Addon vmware.accelerant : Acceleration.c Cursor.c EngineManagment.c @@ -16,7 +16,6 @@ Addon vmware.accelerant : accelerants : InitAccelerant.c ProposeDisplayMode.c SetDisplayMode.c - : false ; Package haiku-vmware-video-svn : diff --git a/src/add-ons/decorators/BeDecorator/Jamfile b/src/add-ons/decorators/BeDecorator/Jamfile index fa79fab3ad..bd96f4cb65 100644 --- a/src/add-ons/decorators/BeDecorator/Jamfile +++ b/src/add-ons/decorators/BeDecorator/Jamfile @@ -5,8 +5,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) src servers app ] ; UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ; UsePrivateHeaders app shared interface graphics ; -Addon ClassicBe : decorators : +Addon ClassicBe : BeDecorator.cpp - : false : be app_server ; diff --git a/src/add-ons/decorators/MacDecorator/Jamfile b/src/add-ons/decorators/MacDecorator/Jamfile index c9e0b33de7..9b21a3ef68 100644 --- a/src/add-ons/decorators/MacDecorator/Jamfile +++ b/src/add-ons/decorators/MacDecorator/Jamfile @@ -4,8 +4,7 @@ UseFreeTypeHeaders ; UseHeaders [ FDirName $(HAIKU_TOP) src servers app server ] ; UsePrivateHeaders [ FDirName servers app ] ; -Addon MacDecorator : decorators : +Addon MacDecorator : MacDecorator.cpp - : false : be libappserver.so ; diff --git a/src/add-ons/decorators/WinDecorator/Jamfile b/src/add-ons/decorators/WinDecorator/Jamfile index 50af34c071..3edd77c26e 100644 --- a/src/add-ons/decorators/WinDecorator/Jamfile +++ b/src/add-ons/decorators/WinDecorator/Jamfile @@ -4,8 +4,7 @@ UseFreeTypeHeaders ; UseHeaders [ FDirName $(HAIKU_TOP) src servers app server ] ; UsePrivateHeaders [ FDirName servers app ] ; -Addon WinDecorator : decorators : +Addon WinDecorator : WinDecorator.cpp - : false : be libappserver.so ; diff --git a/src/add-ons/disk_scanner/partition/Jamfile b/src/add-ons/disk_scanner/partition/Jamfile index eeb0dba2ec..5304e0d51a 100644 --- a/src/add-ons/disk_scanner/partition/Jamfile +++ b/src/add-ons/disk_scanner/partition/Jamfile @@ -3,7 +3,7 @@ SubDir HAIKU_TOP src add-ons disk_scanner partition ; UsePrivateHeaders shared ; UsePrivateHeaders storage ; -Addon intel : disk_scanner : intel.cpp : false +Addon intel : intel.cpp : libdiskdevice.so be ; AbsSymLink intel : intel : /boot/home/config/add-ons/disk_scanner/partition ; diff --git a/src/add-ons/input_server/devices/easypen/Jamfile b/src/add-ons/input_server/devices/easypen/Jamfile index 1c26c4e585..5f111a5b72 100644 --- a/src/add-ons/input_server/devices/easypen/Jamfile +++ b/src/add-ons/input_server/devices/easypen/Jamfile @@ -4,8 +4,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders input ; -Addon easypen : input_server/devices : +Addon easypen : EasyPenInputDevice.cpp - : false : be device input_server ; diff --git a/src/add-ons/input_server/devices/keyboard/Jamfile b/src/add-ons/input_server/devices/keyboard/Jamfile index 52bb04a88e..d59993a286 100644 --- a/src/add-ons/input_server/devices/keyboard/Jamfile +++ b/src/add-ons/input_server/devices/keyboard/Jamfile @@ -5,14 +5,13 @@ SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders input kernel tracker ; UseArchHeaders $(TARGET_ARCH) ; -Addon keyboard : input_server/devices : +Addon keyboard : KeyboardInputDevice.cpp Keymap.cpp TMWindow.cpp TMListItem.cpp - : false : input_server be ; Package haiku-inputkit-cvs : diff --git a/src/add-ons/input_server/devices/mouse/Jamfile b/src/add-ons/input_server/devices/mouse/Jamfile index 0394df9dcc..657caa2a52 100644 --- a/src/add-ons/input_server/devices/mouse/Jamfile +++ b/src/add-ons/input_server/devices/mouse/Jamfile @@ -4,9 +4,8 @@ SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders input ; -Addon mouse : input_server/devices : +Addon mouse : MouseInputDevice.cpp - : false : be input_server ; Package haiku-inputkit-cvs : diff --git a/src/add-ons/input_server/devices/serial_mouse/Jamfile b/src/add-ons/input_server/devices/serial_mouse/Jamfile index 7ac0914a58..a8a37d3743 100644 --- a/src/add-ons/input_server/devices/serial_mouse/Jamfile +++ b/src/add-ons/input_server/devices/serial_mouse/Jamfile @@ -4,10 +4,9 @@ SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders input ; -Addon serial_mouse : input_server/devices : +Addon serial_mouse : MouseInputDevice.cpp SerialMouse.cpp - : false : be device input_server ; Package haiku-inputkit-cvs : diff --git a/src/add-ons/input_server/devices/tablet/Jamfile b/src/add-ons/input_server/devices/tablet/Jamfile index 15ed842585..aa2a65fc31 100644 --- a/src/add-ons/input_server/devices/tablet/Jamfile +++ b/src/add-ons/input_server/devices/tablet/Jamfile @@ -4,9 +4,8 @@ SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders input ; -Addon tablet : input_server/devices : +Addon tablet : TabletInputDevice.cpp - : false : be input_server ; Package haiku-inputkit-cvs : diff --git a/src/add-ons/input_server/filters/screensaver/Jamfile b/src/add-ons/input_server/filters/screensaver/Jamfile index bce87dc50d..8a3d1dfbee 100644 --- a/src/add-ons/input_server/filters/screensaver/Jamfile +++ b/src/add-ons/input_server/filters/screensaver/Jamfile @@ -4,9 +4,8 @@ SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders screen_saver ; -Addon screen_saver : input_server/filters : +Addon screen_saver : ScreenSaverFilter.cpp - : false : be libscreensaver.so input_server ; Package haiku-screensaverkit-cvs : diff --git a/src/add-ons/input_server/methods/canna/Jamfile b/src/add-ons/input_server/methods/canna/Jamfile index aee25fe4be..193cface1f 100644 --- a/src/add-ons/input_server/methods/canna/Jamfile +++ b/src/add-ons/input_server/methods/canna/Jamfile @@ -11,13 +11,12 @@ if $(TARGET_PLATFORM) != haiku { SubDirC++Flags -fmultiple-symbol-spaces ; } -Addon canna : input_server/methods : +Addon canna : CannaInterface.cpp CannaLooper.cpp CannaMethod.cpp KouhoWindow.cpp PaletteWindow.cpp - : false : be textencoding input_server libcanna.a librk.a ; Package haiku-cannaIM-cvs : diff --git a/src/add-ons/kernel/disk_scanner/fs/Jamfile b/src/add-ons/kernel/disk_scanner/fs/Jamfile index 260e2e0bc4..877cd99f46 100644 --- a/src/add-ons/kernel/disk_scanner/fs/Jamfile +++ b/src/add-ons/kernel/disk_scanner/fs/Jamfile @@ -5,7 +5,7 @@ UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; UsePrivateHeaders [ FDirName storage ] ; # For now build a userland version only. -Addon bfs : userland file_systems : +Addon bfs : bfs.c ; diff --git a/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile b/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile index ece2906377..e0433792d6 100644 --- a/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile +++ b/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile @@ -31,16 +31,13 @@ SubDirHdrs [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems udf ] ; # Note that the add-on is named "i-udf-ds" to put it alphabetically # before the standard iso9660 add-on, thus giving it first dibs at # iso9660/UDF hybrid discs. -Addon i-udf-ds : [ FDirName drive_setup fs ] : +Addon i-udf-ds : udf-ds.cpp Recognition.cpp UdfDebug.cpp UdfString.cpp UdfStructures.cpp Utils.cpp - - : false - : ; SEARCH on [ FGristFiles diff --git a/src/add-ons/kernel/partitioning_systems/amiga/Jamfile b/src/add-ons/kernel/partitioning_systems/amiga/Jamfile index da636ec4bc..bf47e6b40e 100644 --- a/src/add-ons/kernel/partitioning_systems/amiga/Jamfile +++ b/src/add-ons/kernel/partitioning_systems/amiga/Jamfile @@ -8,7 +8,7 @@ KernelAddon amiga_rdb : amiga_rdb.cpp ; -#Addon amiga_rdb : userland partitioning_systems : +#Addon amiga_rdb : # amiga_rdb.cpp # ; # diff --git a/src/add-ons/kernel/partitioning_systems/apple/Jamfile b/src/add-ons/kernel/partitioning_systems/apple/Jamfile index 0d6d71630a..b5ff6d46be 100644 --- a/src/add-ons/kernel/partitioning_systems/apple/Jamfile +++ b/src/add-ons/kernel/partitioning_systems/apple/Jamfile @@ -8,7 +8,7 @@ KernelAddon apple : apple.cpp ; -#Addon apple : userland partitioning_systems : +#Addon apple : # apple.cpp # ; # diff --git a/src/add-ons/kernel/partitioning_systems/intel/Jamfile b/src/add-ons/kernel/partitioning_systems/intel/Jamfile index 99b98948a6..ace3046dc4 100644 --- a/src/add-ons/kernel/partitioning_systems/intel/Jamfile +++ b/src/add-ons/kernel/partitioning_systems/intel/Jamfile @@ -13,7 +13,7 @@ KernelAddon intel : # Also build a userland version # ToDo: it's probably not a good idea to build them into the same directory -#Addon intel : userland partitioning_systems : +#Addon intel : # intel.cpp # PartitionMap.cpp # PartitionMapParser.cpp diff --git a/src/add-ons/kernel/partitioning_systems/session/Jamfile b/src/add-ons/kernel/partitioning_systems/session/Jamfile index a8ac234e6c..95e71fe9e0 100644 --- a/src/add-ons/kernel/partitioning_systems/session/Jamfile +++ b/src/add-ons/kernel/partitioning_systems/session/Jamfile @@ -22,7 +22,7 @@ KernelAddon session : ; # also build a userland version -#Addon session : userland partitioning_systems : +#Addon session : # [ FGristFiles $(session_files:S=$(SUFOBJ)) ] #; # 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 f6456e7f46..3e76c7be68 100644 --- a/src/add-ons/mail_daemon/inbound_filters/match_header/Jamfile +++ b/src/add-ons/mail_daemon/inbound_filters/match_header/Jamfile @@ -11,7 +11,7 @@ UsePublicHeaders [ FDirName add-ons mail_daemon ] ; SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ; -Addon Match\ Header : mail_daemon inbound_filters : +Addon Match\ Header : ConfigView.cpp RuleFilter.cpp StringMatcher.cpp ; diff --git a/src/add-ons/mail_daemon/inbound_filters/r5_filter/Jamfile b/src/add-ons/mail_daemon/inbound_filters/r5_filter/Jamfile index 0904890274..dd0aa4f6bd 100644 --- a/src/add-ons/mail_daemon/inbound_filters/r5_filter/Jamfile +++ b/src/add-ons/mail_daemon/inbound_filters/r5_filter/Jamfile @@ -11,7 +11,7 @@ UsePublicHeaders [ FDirName add-ons mail_daemon ] ; SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ; -Addon R5\ Daemon\ Filter : mail_daemon inbound_filters : +Addon R5\ Daemon\ Filter : filter.cpp ; LinkAgainst R5\ Daemon\ Filter : 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 c6f36ea26d..381f149dbd 100644 --- a/src/add-ons/mail_daemon/inbound_filters/spam_filter/Jamfile +++ b/src/add-ons/mail_daemon/inbound_filters/spam_filter/Jamfile @@ -11,7 +11,7 @@ UsePublicHeaders [ FDirName add-ons mail_daemon ] ; SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ; -Addon Spam\ Filter : mail_daemon inbound_filters : +Addon Spam\ Filter : SpamFilterConfig.cpp SpamFilter.cpp ; diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile index 720f5b3082..91b1daca86 100644 --- a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile +++ b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile @@ -16,7 +16,7 @@ if $(USESSL) { SubDirHdrs [ FDirName / boot home config include ] ; } -Addon IMAP : mail_daemon inbound_protocols : +Addon IMAP : imap_client.cpp imap_config.cpp NestedString.cpp ; diff --git a/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile b/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile index 9492d6c76f..11de363741 100644 --- a/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile +++ b/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile @@ -16,7 +16,7 @@ if $(USESSL) { SubDirHdrs [ FDirName / boot home config include ] ; } -Addon POP3 : mail_daemon inbound_protocols : +Addon POP3 : MessageIO.cpp pop3.cpp SimpleMailProtocol.cpp diff --git a/src/add-ons/mail_daemon/outbound_filters/fortune/Jamfile b/src/add-ons/mail_daemon/outbound_filters/fortune/Jamfile index 3a017338b5..8ef03583a7 100644 --- a/src/add-ons/mail_daemon/outbound_filters/fortune/Jamfile +++ b/src/add-ons/mail_daemon/outbound_filters/fortune/Jamfile @@ -11,7 +11,7 @@ UsePublicHeaders [ FDirName add-ons mail_daemon ] ; SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ; -Addon Fortune : mail_daemon outbound_filters : +Addon Fortune : ConfigView.cpp filter.cpp ; diff --git a/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile b/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile index 126bcb97e5..c8d227b284 100644 --- a/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile +++ b/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile @@ -16,7 +16,7 @@ if $(USESSL) { SubDirHdrs [ FDirName / boot home config include ] ; } -Addon SMTP : mail_daemon outbound_protocols : +Addon SMTP : smtp.cpp md5c.c ; diff --git a/src/add-ons/mail_daemon/system_filters/inbox/Jamfile b/src/add-ons/mail_daemon/system_filters/inbox/Jamfile index b9ec2b89f1..b022268c61 100644 --- a/src/add-ons/mail_daemon/system_filters/inbox/Jamfile +++ b/src/add-ons/mail_daemon/system_filters/inbox/Jamfile @@ -11,7 +11,7 @@ UsePublicHeaders [ FDirName add-ons mail_daemon ] ; SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ; -Addon Inbox : mail_daemon system_filters : +Addon Inbox : filter.cpp ; LinkAgainst Inbox : diff --git a/src/add-ons/mail_daemon/system_filters/notifier/Jamfile b/src/add-ons/mail_daemon/system_filters/notifier/Jamfile index a186f455a0..e4af5c47c4 100644 --- a/src/add-ons/mail_daemon/system_filters/notifier/Jamfile +++ b/src/add-ons/mail_daemon/system_filters/notifier/Jamfile @@ -11,7 +11,7 @@ UsePublicHeaders [ FDirName add-ons mail_daemon ] ; SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ; -Addon New\ Mail\ Notification : mail_daemon system_filters : +Addon New\ Mail\ Notification : filter.cpp ConfigView.cpp ; LinkAgainst New\ Mail\ Notification : diff --git a/src/add-ons/mail_daemon/system_filters/outbox/Jamfile b/src/add-ons/mail_daemon/system_filters/outbox/Jamfile index a4a277cb95..0948e507f4 100644 --- a/src/add-ons/mail_daemon/system_filters/outbox/Jamfile +++ b/src/add-ons/mail_daemon/system_filters/outbox/Jamfile @@ -11,7 +11,7 @@ UsePublicHeaders [ FDirName add-ons mail_daemon ] ; SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ; -Addon Outbox : mail_daemon system_filters : +Addon Outbox : filter.cpp ; LinkAgainst Outbox : diff --git a/src/add-ons/mail_daemon/system_filters/parser/Jamfile b/src/add-ons/mail_daemon/system_filters/parser/Jamfile index 8f4e4d0c85..907f91887d 100644 --- a/src/add-ons/mail_daemon/system_filters/parser/Jamfile +++ b/src/add-ons/mail_daemon/system_filters/parser/Jamfile @@ -11,7 +11,7 @@ UsePublicHeaders [ FDirName add-ons mail_daemon ] ; SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ; -Addon Message\ Parser : mail_daemon system_filters : +Addon Message\ Parser : filter.cpp ; LinkAgainst Message\ Parser : diff --git a/src/add-ons/media/media-add-ons/demultiplexer/Jamfile b/src/add-ons/media/media-add-ons/demultiplexer/Jamfile index 2fb678e094..4b182da050 100644 --- a/src/add-ons/media/media-add-ons/demultiplexer/Jamfile +++ b/src/add-ons/media/media-add-ons/demultiplexer/Jamfile @@ -2,11 +2,10 @@ SubDir HAIKU_TOP src add-ons media media-add-ons demultiplexer ; UsePrivateHeaders demultiplexer ; -Addon demultiplexer.media_addon : media : +Addon demultiplexer.media_addon : MediaDemultiplexerNode.cpp MediaDemultiplexerAddOn.cpp MediaOutputInfo.cpp misc.cpp - : true : be media ; 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 ae77306b25..880315fefc 100644 --- a/src/add-ons/media/media-add-ons/esound_sink/Jamfile +++ b/src/add-ons/media/media-add-ons/esound_sink/Jamfile @@ -6,11 +6,10 @@ if $(TARGET_PLATFORM) != haiku { SubDirC++Flags -fmultiple-symbol-spaces ; } -Addon ESDSink.media_addon : media : +Addon ESDSink.media_addon : ESDEndpoint.cpp ESDSinkAddOn.cpp ESDSinkNode.cpp - : false : be media network ; diff --git a/src/add-ons/media/media-add-ons/legacy/Jamfile b/src/add-ons/media/media-add-ons/legacy/Jamfile index 5454543b8f..6d96ebf626 100644 --- a/src/add-ons/media/media-add-ons/legacy/Jamfile +++ b/src/add-ons/media/media-add-ons/legacy/Jamfile @@ -2,11 +2,10 @@ SubDir HAIKU_TOP src add-ons media media-add-ons legacy ; UsePrivateHeaders media ; -Addon legacy.media_addon : media : +Addon legacy.media_addon : LegacyAudioConsumer.cpp LegacyAudioDevice.cpp LegacyAudioProducer.cpp LegacyMediaAddOn.cpp - : false : be media ; diff --git a/src/add-ons/media/media-add-ons/mixer/Jamfile b/src/add-ons/media/media-add-ons/mixer/Jamfile index 51ab6885c3..201e4a2f6e 100644 --- a/src/add-ons/media/media-add-ons/mixer/Jamfile +++ b/src/add-ons/media/media-add-ons/mixer/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons media media-add-ons mixer ; SetSubDirSupportedPlatformsBeOSCompatible ; -Addon mixer.media_addon : media : +Addon mixer.media_addon : AudioMixer.cpp ByteSwap.cpp MixerAddOn.cpp @@ -12,7 +12,6 @@ Addon mixer.media_addon : media : MixerSettings.cpp MixerUtils.cpp Resampler.cpp - : false : be media ; 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 ffb27b471d..09e17a5684 100644 --- a/src/add-ons/media/media-add-ons/multi_audio/Jamfile +++ b/src/add-ons/media/media-add-ons/multi_audio/Jamfile @@ -6,11 +6,10 @@ if $(TARGET_PLATFORM) != haiku { SubDirC++Flags -fmultiple-symbol-spaces ; } -Addon hmulti_audio.media_addon : media : +Addon hmulti_audio.media_addon : MultiAudioAddOn.cpp MultiAudioDevice.cpp MultiAudioNode.cpp - : false : be media ; diff --git a/src/add-ons/media/media-add-ons/radeon/Jamfile b/src/add-ons/media/media-add-ons/radeon/Jamfile index 9f1e176e53..fdba0ddd08 100644 --- a/src/add-ons/media/media-add-ons/radeon/Jamfile +++ b/src/add-ons/media/media-add-ons/radeon/Jamfile @@ -4,7 +4,7 @@ UsePrivateHeaders graphics ; UsePrivateHeaders [ FDirName graphics common ] ; UsePrivateHeaders [ FDirName graphics radeon ] ; -Addon radeon.media_addon : media : +Addon radeon.media_addon : RadeonAddOn.cpp RadeonProducer.cpp CC.cpp diff --git a/src/add-ons/media/media-add-ons/reader/Jamfile b/src/add-ons/media/media-add-ons/reader/Jamfile index f73d7a1fcd..d1903af933 100644 --- a/src/add-ons/media/media-add-ons/reader/Jamfile +++ b/src/add-ons/media/media-add-ons/reader/Jamfile @@ -2,13 +2,12 @@ SubDir HAIKU_TOP src add-ons media media-add-ons reader ; UsePrivateHeaders media ; -Addon reader.media_addon : media : +Addon reader.media_addon : ../AbstractFileInterfaceNode.cpp ../AbstractFileInterfaceAddOn.cpp MediaReader.cpp MediaReaderAddOn.cpp misc.cpp + : be media : true ; - -LinkAgainst reader.media_addon : be media ; 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 3c2717e06a..633cdd6600 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 @@ -1,8 +1,7 @@ SubDir HAIKU_TOP src add-ons media media-add-ons tone_producer_demo ; -Addon tone_producer_demo.media_addon : media : +Addon tone_producer_demo.media_addon : ToneProducerAddOn.cpp ToneProducer.cpp + : be media ; - -LinkAgainst tone_producer_demo.media_addon : be media ; 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 52088512de..e5d2648af0 100644 --- a/src/add-ons/media/media-add-ons/usb_vision/Jamfile +++ b/src/add-ons/media/media-add-ons/usb_vision/Jamfile @@ -4,10 +4,9 @@ SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders usb_vision ; -Addon usb_vision.media_addon : media : +Addon usb_vision.media_addon : AddOn.cpp Producer.cpp TunerLocale.cpp + : be media $(TARGET_LIBSTDC++) ; - -LinkAgainst usb_vision.media_addon : be media $(TARGET_LIBSTDC++) ; 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 b7ac62726e..7cf662c530 100644 --- a/src/add-ons/media/media-add-ons/usb_webcam/Jamfile +++ b/src/add-ons/media/media-add-ons/usb_webcam/Jamfile @@ -64,7 +64,7 @@ USBWebcamHeaderGen [ FGristFiles CamInternalSensors.h ] USBWebcamHeaderGen [ FGristFiles CamInternalColorSpaceTransforms.h ] : B_WEBCAM_DECLARE_CSTRANSFORM : $(csTransformsSources) ; -Addon usb_webcam.media_addon : media : +Addon usb_webcam.media_addon : $(addonSources) $(csTransformsSources) $(sensorsSources) @@ -79,10 +79,9 @@ Addon usb_webcam.media_addon : media : CamRoster.cpp CamSensor.cpp CamStreamingDeframer.cpp + : be media $(usbKitLibraryName) ; -LinkAgainst usb_webcam.media_addon : be media $(usbKitLibraryName) ; - # force dependancies Includes [ FGristFiles CamRoster.cpp ] : [ FGristFiles CamInternalAddons.h ] ; Includes [ FGristFiles CamDevice.cpp ] : [ FGristFiles CamInternalSensors.h ] ; 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 631b28651d..0e36be7513 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 @@ -1,8 +1,7 @@ SubDir HAIKU_TOP src add-ons media media-add-ons video_producer_demo ; -Addon video_producer_demo.media_addon : media : +Addon video_producer_demo.media_addon : AddOn.cpp Producer.cpp + : be media ; - -LinkAgainst video_producer_demo.media_addon : be media ; diff --git a/src/add-ons/media/media-add-ons/writer/Jamfile b/src/add-ons/media/media-add-ons/writer/Jamfile index cf07da36f1..ee86fe3d59 100644 --- a/src/add-ons/media/media-add-ons/writer/Jamfile +++ b/src/add-ons/media/media-add-ons/writer/Jamfile @@ -2,13 +2,12 @@ SubDir HAIKU_TOP src add-ons media media-add-ons writer ; UsePrivateHeaders media ; -Addon writer.media_addon : media : +Addon writer.media_addon : ../AbstractFileInterfaceNode.cpp ../AbstractFileInterfaceAddOn.cpp MediaWriter.cpp MediaWriterAddOn.cpp misc.cpp + : be media : true ; - -LinkAgainst writer.media_addon : be media ; diff --git a/src/add-ons/media/plugins/ac3_decoder/Jamfile b/src/add-ons/media/plugins/ac3_decoder/Jamfile index 1e043b91a0..4c5b74d08f 100644 --- a/src/add-ons/media/plugins/ac3_decoder/Jamfile +++ b/src/add-ons/media/plugins/ac3_decoder/Jamfile @@ -2,14 +2,9 @@ SubDir HAIKU_TOP src add-ons media plugins ac3_decoder ; UsePrivateHeaders media ; -Addon ac3_decoder : media plugins : +Addon ac3_decoder : ac3_decoder.cpp - : - false - : - liba52.a + : liba52.a be libmedia.so ; -LinkAgainst ac3_decoder : be libmedia.so ; - 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 0130367c52..337ca1ae12 100644 --- a/src/add-ons/media/plugins/aiff_reader/Jamfile +++ b/src/add-ons/media/plugins/aiff_reader/Jamfile @@ -4,7 +4,6 @@ SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders media ; -Addon aiff_reader : media plugins : +Addon aiff_reader : aiff_reader.cpp - : false : be libmedia.so ; diff --git a/src/add-ons/media/plugins/au_reader/Jamfile b/src/add-ons/media/plugins/au_reader/Jamfile index 15f57c34cb..703d1ba5b7 100644 --- a/src/add-ons/media/plugins/au_reader/Jamfile +++ b/src/add-ons/media/plugins/au_reader/Jamfile @@ -4,8 +4,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders media ; -Addon au_reader : media plugins : +Addon au_reader : au_reader.cpp - : false : be libmedia.so ; diff --git a/src/add-ons/media/plugins/avcodec/Jamfile b/src/add-ons/media/plugins/avcodec/Jamfile index 2d464a8b1e..c31c955048 100644 --- a/src/add-ons/media/plugins/avcodec/Jamfile +++ b/src/add-ons/media/plugins/avcodec/Jamfile @@ -6,15 +6,13 @@ UsePrivateHeaders media ; SubDirHdrs [ FDirName $(SUBDIR) libavcodec ] ; -Addon avcodec : media plugins : +Addon avcodec : avcodec.cpp codectbl.cpp gfx_conv_c.cpp gfx_conv_c_lookup.cpp # gfx_conv_mmx.cpp gfx_util.cpp - : - false : libavcodec.a be diff --git a/src/add-ons/media/plugins/avi_reader/Jamfile b/src/add-ons/media/plugins/avi_reader/Jamfile index c07f4bed08..86952e0a0f 100644 --- a/src/add-ons/media/plugins/avi_reader/Jamfile +++ b/src/add-ons/media/plugins/avi_reader/Jamfile @@ -6,11 +6,9 @@ UsePrivateHeaders media ; SubDirHdrs [ FDirName $(SUBDIR) libOpenDML ] ; -Addon avi_reader : media plugins : +Addon avi_reader : avi_reader.cpp : - false - : libopendml.a be libmedia.so ; diff --git a/src/add-ons/media/plugins/matroska/Jamfile b/src/add-ons/media/plugins/matroska/Jamfile index 700512e07b..5b9a33b4b8 100644 --- a/src/add-ons/media/plugins/matroska/Jamfile +++ b/src/add-ons/media/plugins/matroska/Jamfile @@ -8,13 +8,11 @@ UsePrivateHeaders media ; SubDirHdrs [ FDirName $(SUBDIR) libMatroskaParser ] ; SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) ogg libogg ] ; -Addon matroska : media plugins : +Addon matroska : matroska_codecs.cpp matroska_reader.cpp matroska_util.cpp : - false - : # libebml.a # libmatroska.a libMatroskaParser.a diff --git a/src/add-ons/media/plugins/mov_reader/Jamfile b/src/add-ons/media/plugins/mov_reader/Jamfile index 51714516b6..30ca45a091 100644 --- a/src/add-ons/media/plugins/mov_reader/Jamfile +++ b/src/add-ons/media/plugins/mov_reader/Jamfile @@ -6,11 +6,9 @@ UsePrivateHeaders media ; SubDirHdrs [ FDirName $(SUBDIR) libMOV ] ; -Addon mov_reader : media plugins : +Addon mov_reader : mov_reader.cpp : - false - : libmovreader.a libz.a be libmedia.so $(TARGET_LIBSTDC++) ; diff --git a/src/add-ons/media/plugins/mp3_decoder/Jamfile b/src/add-ons/media/plugins/mp3_decoder/Jamfile index 02fe715eeb..2a1e317fba 100644 --- a/src/add-ons/media/plugins/mp3_decoder/Jamfile +++ b/src/add-ons/media/plugins/mp3_decoder/Jamfile @@ -6,10 +6,8 @@ UsePrivateHeaders media ; SubDirHdrs [ FDirName $(SUBDIR) mpglib ] ; -Addon mp3_decoder : media plugins : +Addon mp3_decoder : mp3DecoderPlugin.cpp - : - false : libmpglib.a be diff --git a/src/add-ons/media/plugins/mp3_reader/Jamfile b/src/add-ons/media/plugins/mp3_reader/Jamfile index 9427251123..cfa27102aa 100644 --- a/src/add-ons/media/plugins/mp3_reader/Jamfile +++ b/src/add-ons/media/plugins/mp3_reader/Jamfile @@ -4,8 +4,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders media ; -Addon mp3_reader : media plugins : +Addon mp3_reader : MP3ReaderPlugin.cpp - : false : be libmedia.so ; diff --git a/src/add-ons/media/plugins/mp4_reader/Jamfile b/src/add-ons/media/plugins/mp4_reader/Jamfile index 635503db59..5b151aa552 100644 --- a/src/add-ons/media/plugins/mp4_reader/Jamfile +++ b/src/add-ons/media/plugins/mp4_reader/Jamfile @@ -6,11 +6,9 @@ UsePrivateHeaders media ; SubDirHdrs [ FDirName $(SUBDIR) libMP4 ] ; -Addon mp4_reader : media plugins : +Addon mp4_reader : mp4_reader.cpp : - false - : libmp4reader.a libz.a be libmedia.so $(TARGET_LIBSTDC++) diff --git a/src/add-ons/media/plugins/musepack/Jamfile b/src/add-ons/media/plugins/musepack/Jamfile index b92235e615..937b960588 100644 --- a/src/add-ons/media/plugins/musepack/Jamfile +++ b/src/add-ons/media/plugins/musepack/Jamfile @@ -6,11 +6,10 @@ UsePrivateHeaders media ; SubDirHdrs [ FDirName $(SUBDIR) mpc ] ; -Addon musepack : media plugins : +Addon musepack : MusePack.cpp MusePackReader.cpp MusePackDecoder.cpp - : false : libmusepack.a be libmedia.so ; diff --git a/src/add-ons/media/plugins/ogg/Jamfile b/src/add-ons/media/plugins/ogg/Jamfile index 5991ce2699..44da15b653 100644 --- a/src/add-ons/media/plugins/ogg/Jamfile +++ b/src/add-ons/media/plugins/ogg/Jamfile @@ -6,7 +6,7 @@ UsePrivateHeaders media ; SubDirSysHdrs [ FDirName $(SUBDIR) libogg ] ; -Addon ogg : media plugins : +Addon ogg : OggReaderPlugin.cpp OggTrack.cpp OggStream.cpp @@ -18,7 +18,6 @@ Addon ogg : media plugins : OggTobiasSeekable.cpp OggVorbisStream.cpp OggVorbisSeekable.cpp - : false : libogg.a be libmedia.so $(TARGET_LIBSTDC++) ; diff --git a/src/add-ons/media/plugins/raw_decoder/Jamfile b/src/add-ons/media/plugins/raw_decoder/Jamfile index 439bab90bb..4f434e41fb 100644 --- a/src/add-ons/media/plugins/raw_decoder/Jamfile +++ b/src/add-ons/media/plugins/raw_decoder/Jamfile @@ -4,10 +4,9 @@ SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders media ; -Addon raw_decoder : media plugins : +Addon raw_decoder : AudioConversion.cpp RawDecoderPlugin.cpp - : false : be libmedia.so ; diff --git a/src/add-ons/media/plugins/speex/Jamfile b/src/add-ons/media/plugins/speex/Jamfile index 2f45e981bf..61a089c24a 100644 --- a/src/add-ons/media/plugins/speex/Jamfile +++ b/src/add-ons/media/plugins/speex/Jamfile @@ -8,10 +8,9 @@ SubDirHdrs $(SUBDIR) .. ogg ; SubDirSysHdrs $(SUBDIR) .. ogg libogg ; SubDirHdrs $(SUBDIR) libspeex ; -Addon speex : media plugins : +Addon speex : speexCodecPlugin.cpp speexCodecDefaults.cpp - : false : libspeex.a be libmedia.so ; diff --git a/src/add-ons/media/plugins/vorbis/Jamfile b/src/add-ons/media/plugins/vorbis/Jamfile index 9a8cab1142..3839613b86 100644 --- a/src/add-ons/media/plugins/vorbis/Jamfile +++ b/src/add-ons/media/plugins/vorbis/Jamfile @@ -8,9 +8,8 @@ SubDirHdrs $(SUBDIR) .. ogg ; SubDirSysHdrs $(SUBDIR) .. ogg libogg ; SubDirHdrs $(SUBDIR) libvorbis vorbis ; -Addon vorbis : media plugins : +Addon vorbis : vorbisCodecPlugin.cpp - : false : libvorbis.a libogg.a be libmedia.so ; diff --git a/src/add-ons/media/plugins/wav_reader/Jamfile b/src/add-ons/media/plugins/wav_reader/Jamfile index 0a4833c4ba..65032bffe8 100644 --- a/src/add-ons/media/plugins/wav_reader/Jamfile +++ b/src/add-ons/media/plugins/wav_reader/Jamfile @@ -4,8 +4,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders media ; -Addon wav_reader : media plugins : +Addon wav_reader : WavReaderPlugin.cpp - : false : be libmedia.so ; diff --git a/src/add-ons/opengl/mesa_software_renderer/Jamfile b/src/add-ons/opengl/mesa_software_renderer/Jamfile index ea53576f38..38e6a835a2 100644 --- a/src/add-ons/opengl/mesa_software_renderer/Jamfile +++ b/src/add-ons/opengl/mesa_software_renderer/Jamfile @@ -35,8 +35,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa tnl ] ; UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa x86 ] ; UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa ppc ] ; -Addon Mesa\ Software\ Renderer : opengl : +Addon Mesa\ Software\ Renderer : MesaSoftwareRenderer.cpp - : false : libGL.so libmesa.a be ; diff --git a/src/add-ons/print/drivers/canon_lips/lips3/Jamfile b/src/add-ons/print/drivers/canon_lips/lips3/Jamfile index d8ee25b627..f31d122c91 100644 --- a/src/add-ons/print/drivers/canon_lips/lips3/Jamfile +++ b/src/add-ons/print/drivers/canon_lips/lips3/Jamfile @@ -7,18 +7,17 @@ SubDirHdrs [ FDirName $(HAIKU_TOP) headers private print utils ] ; AddResources Canon\ LIPS3\ Compatible : Lips3.rdef ; -Addon Canon\ LIPS3\ Compatible : Print : +Addon Canon\ LIPS3\ Compatible : Lips3Entry.cpp Lips3.cpp Lips3Cap.cpp Compress3.cpp -; - -LinkAgainst Canon\ LIPS3\ Compatible : + : be libprint.a libprintutils.a - $(TARGET_LIBSTDC++) ; + $(TARGET_LIBSTDC++) +; Package haiku-printingkit-cvs : Canon\ LIPS3\ Compatible : diff --git a/src/add-ons/print/drivers/canon_lips/lips4/Jamfile b/src/add-ons/print/drivers/canon_lips/lips4/Jamfile index 80036ff0de..c233c2db5f 100644 --- a/src/add-ons/print/drivers/canon_lips/lips4/Jamfile +++ b/src/add-ons/print/drivers/canon_lips/lips4/Jamfile @@ -7,17 +7,16 @@ SubDirHdrs [ FDirName $(HAIKU_TOP) headers private print utils ] ; AddResources Canon\ LIPS4\ Compatible : Lips4.rdef ; -Addon Canon\ LIPS4\ Compatible : Print : +Addon Canon\ LIPS4\ Compatible : Lips4Entry.cpp Lips4.cpp Lips4Cap.cpp -; - -LinkAgainst Canon\ LIPS4\ Compatible : + : be libprint.a libprintutils.a - $(TARGET_LIBSTDC++) ; + $(TARGET_LIBSTDC++) +; Package haiku-printingkit-cvs : Canon\ LIPS4\ Compatible : diff --git a/src/add-ons/print/drivers/pcl5/Jamfile b/src/add-ons/print/drivers/pcl5/Jamfile index acfd7a84b9..c40df8026f 100644 --- a/src/add-ons/print/drivers/pcl5/Jamfile +++ b/src/add-ons/print/drivers/pcl5/Jamfile @@ -7,17 +7,16 @@ SubDirHdrs [ FDirName $(HAIKU_TOP) headers private print utils ] ; AddResources PCL5\ Compatible : PCL5.rsrc ; -Addon PCL5\ Compatible : Print : +Addon PCL5\ Compatible : PCL5Entry.cpp PCL5.cpp PCL5Cap.cpp -; - -LinkAgainst PCL5\ Compatible : + : be libprint.a libprintutils.a - $(TARGET_LIBSTDC++) ; + $(TARGET_LIBSTDC++) +; Package haiku-printingkit-cvs : PCL5\ Compatible : diff --git a/src/add-ons/print/drivers/pcl6/Jamfile b/src/add-ons/print/drivers/pcl6/Jamfile index a978f0b3f1..fe037a4c19 100644 --- a/src/add-ons/print/drivers/pcl6/Jamfile +++ b/src/add-ons/print/drivers/pcl6/Jamfile @@ -7,7 +7,7 @@ SubDirHdrs [ FDirName $(HAIKU_TOP) headers private print utils ] ; AddResources PCL6\ Compatible : PCL6.rsrc ; -Addon PCL6\ Compatible : Print : +Addon PCL6\ Compatible : DeltaRowCompression.cpp PCL6Entry.cpp PCL6.cpp @@ -15,13 +15,12 @@ Addon PCL6\ Compatible : Print : PCL6Rasterizer.cpp PCL6Writer.cpp Rasterizer.cpp -; - -LinkAgainst PCL6\ Compatible : + : be libprint.a libprintutils.a - $(TARGET_LIBSTDC++) ; + $(TARGET_LIBSTDC++) +; Package haiku-printingkit-cvs : PCL6\ Compatible : diff --git a/src/add-ons/print/drivers/pdf/source/Jamfile b/src/add-ons/print/drivers/pdf/source/Jamfile index c81a160f0f..aab33d90ab 100644 --- a/src/add-ons/print/drivers/pdf/source/Jamfile +++ b/src/add-ons/print/drivers/pdf/source/Jamfile @@ -10,7 +10,7 @@ AddResources PDF\ Writer : PDFWriter.rdef ; -Addon PDF\ Writer : Print : +Addon PDF\ Writer : AboutText.cpp AdvancedSettingsWindow.cpp Bezier.cpp @@ -42,10 +42,8 @@ Addon PDF\ Writer : Print : Scanner.cpp StatusWindow.cpp SubPath.cpp - XReferences.cpp -; - -LinkAgainst PDF\ Writer : + XReferences.cpp + : be textencoding translation diff --git a/src/add-ons/print/drivers/postscript/Jamfile b/src/add-ons/print/drivers/postscript/Jamfile index 7db90e52e5..8455aede14 100644 --- a/src/add-ons/print/drivers/postscript/Jamfile +++ b/src/add-ons/print/drivers/postscript/Jamfile @@ -7,17 +7,16 @@ SubDirHdrs [ FDirName $(HAIKU_TOP) headers private print utils ] ; AddResources PS\ Compatible : PS.rsrc ; -Addon PS\ Compatible : Print : +Addon PS\ Compatible : PSEntry.cpp PS.cpp PSCap.cpp -; - -LinkAgainst PS\ Compatible : + : be libprint.a libprintutils.a - $(TARGET_LIBSTDC++) ; + $(TARGET_LIBSTDC++) +; Package haiku-printingkit-cvs : PS\ Compatible : diff --git a/src/add-ons/print/drivers/preview/Jamfile b/src/add-ons/print/drivers/preview/Jamfile index 15d7dd73c0..b6f9b2f07b 100644 --- a/src/add-ons/print/drivers/preview/Jamfile +++ b/src/add-ons/print/drivers/preview/Jamfile @@ -9,7 +9,7 @@ UsePrivateHeaders interface ; AddResources Preview : Preview.rsrc ; -Addon Preview : Print : +Addon Preview : PrinterSetupWindow.cpp PageSetupWindow.cpp JobSetupWindow.cpp @@ -17,12 +17,11 @@ Addon Preview : Print : Preview.cpp PrinterDriver.cpp PreviewDriver.cpp -; - -LinkAgainst Preview : + : be root - libprintutils.a ; + libprintutils.a +; Package haiku-printingkit-cvs : Preview : diff --git a/src/add-ons/print/transports/hp_jetdirect/Jamfile b/src/add-ons/print/transports/hp_jetdirect/Jamfile index 3d54135c15..0e22e46927 100644 --- a/src/add-ons/print/transports/hp_jetdirect/Jamfile +++ b/src/add-ons/print/transports/hp_jetdirect/Jamfile @@ -4,14 +4,13 @@ SetSubDirSupportedPlatformsBeOSCompatible ; SubDirHdrs [ FDirName $(HAIKU_TOP) src add-ons print transports shared ] ; -Addon HP\ JetDirect : Print transport : +Addon HP\ JetDirect : print_transport.cpp HPJetDirectTransport.cpp SetupWindow.cpp + : be $(NETAPI_LIB) ; -LinkAgainst HP\ JetDirect : be $(NETAPI_LIB) ; - Package haiku-printingkit-cvs : HP\ JetDirect : boot home config add-ons Print transport ; diff --git a/src/add-ons/print/transports/ipp/Jamfile b/src/add-ons/print/transports/ipp/Jamfile index aa895ffae5..c9c18bb196 100644 --- a/src/add-ons/print/transports/ipp/Jamfile +++ b/src/add-ons/print/transports/ipp/Jamfile @@ -4,7 +4,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ; SubDirHdrs [ FDirName $(HAIKU_TOP) src add-ons print transports shared ] ; -Addon IPP : Print transport : +Addon IPP : Ipp.cpp IppSetupDlg.cpp IppTransport.cpp @@ -15,6 +15,7 @@ Addon IPP : Print transport : Socket.o SocketStream.o DbgMsg.o + : be $(NETWORK_LIBS) $(TARGET_LIBSTDC++) ; ObjectReferences @@ -23,8 +24,6 @@ ObjectReferences DbgMsg.o ; -LinkAgainst IPP : be $(NETWORK_LIBS) $(TARGET_LIBSTDC++) ; - Package haiku-printingkit-cvs : IPP : boot home config add-ons Print transport ; diff --git a/src/add-ons/print/transports/lpr/Jamfile b/src/add-ons/print/transports/lpr/Jamfile index 237eb02d1a..1be0496eb3 100644 --- a/src/add-ons/print/transports/lpr/Jamfile +++ b/src/add-ons/print/transports/lpr/Jamfile @@ -4,7 +4,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ; SubDirHdrs [ FDirName $(HAIKU_TOP) src add-ons print transports shared ] ; -Addon LPR : Print transport : +Addon LPR : Lpr.cpp LprSetupDlg.cpp LprTransport.cpp @@ -13,6 +13,7 @@ Addon LPR : Print transport : Socket.o SocketStream.o DbgMsg.o + : be $(NETWORK_LIBS) $(TARGET_LIBSTDC++) ; ObjectReferences @@ -21,8 +22,6 @@ ObjectReferences DbgMsg.o ; -LinkAgainst LPR : be $(NETWORK_LIBS) $(TARGET_LIBSTDC++) ; - Package haiku-printingkit-cvs : LPR : boot home config add-ons Print transport ; diff --git a/src/add-ons/print/transports/parallel_port/Jamfile b/src/add-ons/print/transports/parallel_port/Jamfile index 5b7e0a1341..f79c26109c 100644 --- a/src/add-ons/print/transports/parallel_port/Jamfile +++ b/src/add-ons/print/transports/parallel_port/Jamfile @@ -5,13 +5,13 @@ SetSubDirSupportedPlatformsBeOSCompatible ; SubDirHdrs [ FDirName $(HAIKU_TOP) src add-ons print transports shared ] ; UsePrivateHeaders interface print ; -Addon Parallel\ Port : Print transport : +Addon Parallel\ Port : ParallelTransport.cpp PrintTransportAddOn.o + : be ; ObjectReferences PrintTransportAddOn.o ; -LinkAgainst Parallel\ Port : be ; Package haiku-printingkit-cvs : Parallel\ Port : diff --git a/src/add-ons/print/transports/print_to_file/Jamfile b/src/add-ons/print/transports/print_to_file/Jamfile index 09c6835bf8..5f3f78be79 100644 --- a/src/add-ons/print/transports/print_to_file/Jamfile +++ b/src/add-ons/print/transports/print_to_file/Jamfile @@ -2,13 +2,12 @@ SubDir HAIKU_TOP src add-ons print transports print_to_file ; SetSubDirSupportedPlatformsBeOSCompatible ; -Addon Print\ To\ File : Print transport : +Addon Print\ To\ File : print_transport.cpp FileSelector.cpp + : be tracker ; -LinkAgainst Print\ To\ File : be tracker ; - Package haiku-printingkit-cvs : Print\ To\ File : boot home config add-ons Print transport ; diff --git a/src/add-ons/print/transports/serial_port/Jamfile b/src/add-ons/print/transports/serial_port/Jamfile index c430a6c001..b407d0d7b6 100644 --- a/src/add-ons/print/transports/serial_port/Jamfile +++ b/src/add-ons/print/transports/serial_port/Jamfile @@ -5,13 +5,13 @@ SetSubDirSupportedPlatformsBeOSCompatible ; SubDirHdrs [ FDirName $(HAIKU_TOP) src add-ons print transports shared ] ; UsePrivateHeaders interface print ; -Addon Serial\ Port : Print transport : +Addon Serial\ Port : SerialTransport.cpp PrintTransportAddOn.o + : be ; ObjectReferences PrintTransportAddOn.o ; -LinkAgainst Serial\ Port : be ; Package haiku-printingkit-cvs : Serial\ Port : diff --git a/src/add-ons/print/transports/usb_port/Jamfile b/src/add-ons/print/transports/usb_port/Jamfile index 06b5179811..c57e4c3e32 100644 --- a/src/add-ons/print/transports/usb_port/Jamfile +++ b/src/add-ons/print/transports/usb_port/Jamfile @@ -5,13 +5,13 @@ SetSubDirSupportedPlatformsBeOSCompatible ; SubDirHdrs [ FDirName $(HAIKU_TOP) src add-ons print transports shared ] ; UsePrivateHeaders interface print ; -Addon USB\ Port : Print transport : +Addon USB\ Port : USBTransport.cpp PrintTransportAddOn.o + : be ; ObjectReferences PrintTransportAddOn.o ; -LinkAgainst USB\ Port : be ; Package haiku-printingkit-cvs : USB\ Port : diff --git a/src/add-ons/screen_savers/haiku/Jamfile b/src/add-ons/screen_savers/haiku/Jamfile index 290f73d5d9..b7ba8d4a86 100644 --- a/src/add-ons/screen_savers/haiku/Jamfile +++ b/src/add-ons/screen_savers/haiku/Jamfile @@ -2,9 +2,10 @@ SubDir HAIKU_TOP src add-ons screen_savers haiku ; SetSubDirSupportedPlatformsBeOSCompatible ; -Addon Haiku : "Screen Savers" : - ScreenSaver.cpp : false - : libbe.so libscreensaver.so ; +Addon Haiku : + ScreenSaver.cpp + : be screensaver +; Package haiku-screensaverkit-cvs : Haiku : diff --git a/src/add-ons/tracker/filetype/Jamfile b/src/add-ons/tracker/filetype/Jamfile index e21341fb22..be2a3fa8bc 100644 --- a/src/add-ons/tracker/filetype/Jamfile +++ b/src/add-ons/tracker/filetype/Jamfile @@ -4,9 +4,8 @@ SetSubDirSupportedPlatformsBeOSCompatible ; AddResources FileType-F : FileType.rdef ; -Addon FileType-F : Tracker : +Addon FileType-F : FileType.cpp - : false : be tracker - ; +; diff --git a/src/add-ons/tracker/mark_as/Jamfile b/src/add-ons/tracker/mark_as/Jamfile index e58f67c730..3f50c4df9e 100644 --- a/src/add-ons/tracker/mark_as/Jamfile +++ b/src/add-ons/tracker/mark_as/Jamfile @@ -5,17 +5,13 @@ SetSubDirSupportedPlatformsBeOSCompatible ; AddResources MarkAsNew-N : MarkAsNew.rdef ; AddResources MarkAsRead-R : MarkAsRead.rdef ; -Addon MarkAsNew-N : Tracker : +Addon MarkAsNew-N : MarkAsNew.cpp - - : false : be tracker - ; +; -Addon MarkAsRead-R : Tracker : +Addon MarkAsRead-R : MarkAsRead.cpp - - : false : be tracker - ; +; diff --git a/src/tests/add-ons/kernel/disk_scanner/Jamfile b/src/tests/add-ons/kernel/disk_scanner/Jamfile index 3d3f78dfec..b35db11f31 100644 --- a/src/tests/add-ons/kernel/disk_scanner/Jamfile +++ b/src/tests/add-ons/kernel/disk_scanner/Jamfile @@ -20,7 +20,7 @@ SubDir HAIKU_TOP src tests add-ons kernel disk_scanner ; # SubDirC++Flags $(defines) ; #} # -#Addon disk_scanner : userland disk_scanner : +#Addon disk_scanner : # disk_scanner.c #; #LinkAgainst disk_scanner : libkernelland_emu.so ; diff --git a/src/tests/add-ons/kernel/disk_scanner/fs/Jamfile b/src/tests/add-ons/kernel/disk_scanner/fs/Jamfile index aa87592d0d..93ca0518e1 100644 --- a/src/tests/add-ons/kernel/disk_scanner/fs/Jamfile +++ b/src/tests/add-ons/kernel/disk_scanner/fs/Jamfile @@ -13,15 +13,15 @@ UsePrivateHeaders $(DOT) ; # bfs -Addon bfs : userland disk_scanner fs : +Addon bfs : bfs.c + : libkernelland_emu.so ; -LinkAgainst bfs : libkernelland_emu.so ; # iso9660 -Addon iso9660 : userland disk_scanner fs : +Addon iso9660 : iso9660.cpp + : libkernelland_emu.so ; -LinkAgainst iso9660 : libkernelland_emu.so ; diff --git a/src/tests/add-ons/kernel/disk_scanner/partition/Jamfile b/src/tests/add-ons/kernel/disk_scanner/partition/Jamfile index 720563be5f..fffd3a263b 100644 --- a/src/tests/add-ons/kernel/disk_scanner/partition/Jamfile +++ b/src/tests/add-ons/kernel/disk_scanner/partition/Jamfile @@ -13,7 +13,7 @@ UsePrivateHeaders $(DOT) ; # intel -Addon intel : userland disk_scanner partition : +Addon intel : intel.cpp intel_parameters.cpp intel_partition_map.cpp + : libkernelland_emu.so ; -LinkAgainst intel : libkernelland_emu.so ; diff --git a/src/tests/add-ons/kernel/disk_scanner/session/Jamfile b/src/tests/add-ons/kernel/disk_scanner/session/Jamfile index c10165b239..492ea11d09 100644 --- a/src/tests/add-ons/kernel/disk_scanner/session/Jamfile +++ b/src/tests/add-ons/kernel/disk_scanner/session/Jamfile @@ -13,7 +13,7 @@ UsePrivateHeaders $(DOT) ; # cdrom -Addon cdrom : userland disk_scanner session : +Addon cdrom : cdrom.cpp + : libkernelland_emu.so ; -LinkAgainst cdrom : libkernelland_emu.so ; diff --git a/src/tests/add-ons/kernel/file_systems/udf/r5/drive_setup_addon/Jamfile b/src/tests/add-ons/kernel/file_systems/udf/r5/drive_setup_addon/Jamfile index 5f849d91f7..93205ed7d1 100644 --- a/src/tests/add-ons/kernel/file_systems/udf/r5/drive_setup_addon/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/udf/r5/drive_setup_addon/Jamfile @@ -33,16 +33,13 @@ SubDirHdrs [ FDirName $(SUBDIR) .. ] ; # Note that the add-on is named "i-udf-ds" to put it alphabetically # before the standard iso9660 add-on, thus giving it first dibs at # iso9660/UDF hybrid discs. -Addon i-udf-ds : [ FDirName drive_setup fs ] : +Addon i-udf-ds : udf-ds.cpp Recognition.cpp UdfDebug.cpp UdfString.cpp UdfStructures.cpp Utils.cpp - - : false - : ; SEARCH on [ FGristFiles 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 a5ae0b9ecd..36bcac78e8 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/bfs/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/bfs/Jamfile @@ -26,7 +26,6 @@ UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; UsePrivateHeaders [ FDirName storage ] ; Addon bfs - : # relpath - obsolete : BlockAllocator.cpp BPlusTree.cpp @@ -41,6 +40,5 @@ Addon bfs kernel_interface.cpp - : false # is executable : libuserlandfs_haiku_kernel.so ; diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/client/Jamfile b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/client/Jamfile index e20f0f624c..fc7a971863 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/client/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/client/Jamfile @@ -27,7 +27,6 @@ if $(NETFS_ADD_SERVER_LOCALHOST) { } Addon netfs - : # relpath - obsolete : Debug.cpp Locker.cpp ObjectTracker.cpp @@ -87,7 +86,6 @@ Addon netfs VolumeEvent.cpp VolumeManager.cpp - : false # is executable : UserlandFSServer $(NETWORK_LIBS) ; diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/Jamfile b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/Jamfile index 0edcad998d..178fa4888a 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/Jamfile @@ -24,7 +24,6 @@ if $(OSPLAT) = X86 { SEARCH_SOURCE += [ FDirName $(userlandFSTop) src shared ] ; Addon ramfs - : # relpath - obsolete : Debug.cpp Locker.cpp String.cpp @@ -57,6 +56,5 @@ Addon ramfs SizeIndex.cpp SymLink.cpp Volume.cpp - : false # is executable : UserlandFSServer ; diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/Jamfile b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/Jamfile index c5aa39f398..ee7fe48c1f 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/Jamfile @@ -13,7 +13,6 @@ SubDirHdrs [ FDirName $(userlandFSIncludes) public ] ; SubDirSysHdrs [ FDirName $(userlandFSIncludes) public ] ; Addon reiserfs - : # relpath - obsolete : Block.cpp BlockCache.cpp @@ -32,6 +31,5 @@ Addon reiserfs String.cpp SuperBlock.cpp - : false # is executable : UserlandFSServer ; diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/ramfs/Jamfile b/src/tests/add-ons/kernel/file_systems/userlandfs/ramfs/Jamfile index c738743356..050728c576 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/ramfs/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/ramfs/Jamfile @@ -13,7 +13,6 @@ SEARCH_SOURCE += $(ramFSTop) ; SEARCH_SOURCE += [ FDirName $(userlandFSTop) shared ] ; Addon ramfs - : # relpath - obsolete : Debug.cpp Locker.cpp String.cpp @@ -47,7 +46,6 @@ Addon ramfs SymLink.cpp Volume.cpp - : false # is executable : libuserlandfs_haiku_kernel.so ; 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 c33d9e8ed5..c03c4aabde 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 @@ -24,7 +24,6 @@ SEARCH_SOURCE += $(ramFSTop) ; SEARCH_SOURCE += [ FDirName $(userlandFSTop) shared ] ; Addon ramfs - : # relpath - obsolete : Debug.cpp Locker.cpp String.cpp @@ -57,6 +56,5 @@ Addon ramfs SizeIndex.cpp SymLink.cpp Volume.cpp - : false # is executable : libuserlandfs_beos_kernel.so ; 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 0aca5b3529..5efa363be6 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/Jamfile @@ -14,7 +14,6 @@ SEARCH_SOURCE += $(reiserFSTop) ; SEARCH_SOURCE += [ FDirName $(userlandFSTop) shared ] ; Addon reiserfs - : # relpath - obsolete : Debug.cpp Locker.cpp @@ -32,7 +31,6 @@ Addon reiserfs VNode.cpp Volume.cpp - : false # is executable : libuserlandfs_haiku_kernel.so ; 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 8d4ec15cdc..63e3471989 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 @@ -16,7 +16,6 @@ DEFINES += _DRIVERS_SELECT_H ; SEARCH_SOURCE += $(reiserFSTop) ; Addon reiserfs - : # relpath - obsolete : Block.cpp BlockCache.cpp @@ -34,6 +33,5 @@ Addon reiserfs String.cpp SuperBlock.cpp - : false # is executable : libuserlandfs_beos_kernel.so ; diff --git a/src/tests/add-ons/kernel/network/core/Jamfile b/src/tests/add-ons/kernel/network/core/Jamfile index 5c96fc36c9..2b8c61e06e 100644 --- a/src/tests/add-ons/kernel/network/core/Jamfile +++ b/src/tests/add-ons/kernel/network/core/Jamfile @@ -8,7 +8,7 @@ UsePrivateHeaders net ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network core ] ; -Addon core : userland obos_network : +Addon core : cksum.c core.c if.c @@ -24,9 +24,9 @@ Addon core : userland obos_network : route.c sockbuf.c socket.c + : net_stack_tester ; -LinkAgainst core : net_stack_tester ; # Installation -- in the test directory for the time being HaikuInstall install-userland-networking diff --git a/src/tests/add-ons/kernel/network/interfaces/ethernet/Jamfile b/src/tests/add-ons/kernel/network/interfaces/ethernet/Jamfile index 1941e21446..8c88fe452a 100644 --- a/src/tests/add-ons/kernel/network/interfaces/ethernet/Jamfile +++ b/src/tests/add-ons/kernel/network/interfaces/ethernet/Jamfile @@ -8,11 +8,11 @@ UsePrivateHeaders net ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network interfaces ethernet ] ; -Addon ethernet : userland obos_network interfaces : +Addon ethernet : ethernet.c + : net_stack_tester ; -LinkAgainst ethernet : net_stack_tester ; # Installation -- in the test directory for the time being HaikuInstall install-userland-networking diff --git a/src/tests/add-ons/kernel/network/interfaces/loopback/Jamfile b/src/tests/add-ons/kernel/network/interfaces/loopback/Jamfile index 32303d63de..c55a592a2b 100644 --- a/src/tests/add-ons/kernel/network/interfaces/loopback/Jamfile +++ b/src/tests/add-ons/kernel/network/interfaces/loopback/Jamfile @@ -8,12 +8,11 @@ UsePrivateHeaders net ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network interfaces loopback ] ; -Addon loopback : userland obos_network interfaces : +Addon loopback : loopback.c + : net_stack_tester ; -LinkAgainst loopback : net_stack_tester ; - # Installation -- in the test directory for the time being HaikuInstall install-userland-networking : [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network interfaces ] diff --git a/src/tests/add-ons/kernel/network/interfaces/ppp/Jamfile b/src/tests/add-ons/kernel/network/interfaces/ppp/Jamfile index becaab5739..3214262d24 100644 --- a/src/tests/add-ons/kernel/network/interfaces/ppp/Jamfile +++ b/src/tests/add-ons/kernel/network/interfaces/ppp/Jamfile @@ -9,12 +9,9 @@ UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkern SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network interfaces ppp ] ; -Addon ppp : userland obos_network interfaces : +Addon ppp : ppp.cpp PPPManager.cpp -; - -LinkAgainst ppp : libkernelppp.a net_stack_tester be ; diff --git a/src/tests/add-ons/kernel/network/ppp/ipcp/Jamfile b/src/tests/add-ons/kernel/network/ppp/ipcp/Jamfile index d58740b3e9..0088a32bcd 100644 --- a/src/tests/add-ons/kernel/network/ppp/ipcp/Jamfile +++ b/src/tests/add-ons/kernel/network/ppp/ipcp/Jamfile @@ -9,12 +9,10 @@ UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkern SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp ipcp ] ; -Addon ipcp : userland obos_network ppp : +Addon ipcp : ipcp.cpp Protocol.cpp -; - -LinkAgainst ipcp : + : libkernelppp.a net_stack_tester be diff --git a/src/tests/add-ons/kernel/network/ppp/modem/Jamfile b/src/tests/add-ons/kernel/network/ppp/modem/Jamfile index a30a8f428e..ac545d561f 100644 --- a/src/tests/add-ons/kernel/network/ppp/modem/Jamfile +++ b/src/tests/add-ons/kernel/network/ppp/modem/Jamfile @@ -9,13 +9,10 @@ UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkern SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp modem ] ; -Addon modem : userland obos_network ppp : +Addon modem : modem.cpp ModemDevice.cpp ACFCHandler.cpp -; - -LinkAgainst modem : libkernelppp.a net_stack_tester be diff --git a/src/tests/add-ons/kernel/network/ppp/pap/Jamfile b/src/tests/add-ons/kernel/network/ppp/pap/Jamfile index b4632e7a4c..2c742125fa 100644 --- a/src/tests/add-ons/kernel/network/ppp/pap/Jamfile +++ b/src/tests/add-ons/kernel/network/ppp/pap/Jamfile @@ -9,12 +9,9 @@ UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkern SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp pap ] ; -Addon pap : userland obos_network ppp : +Addon pap : pap.cpp Protocol.cpp -; - -LinkAgainst pap : libkernelppp.a net_stack_tester be diff --git a/src/tests/add-ons/kernel/network/ppp/pppoe/Jamfile b/src/tests/add-ons/kernel/network/ppp/pppoe/Jamfile index 61a715078b..cef061db0b 100644 --- a/src/tests/add-ons/kernel/network/ppp/pppoe/Jamfile +++ b/src/tests/add-ons/kernel/network/ppp/pppoe/Jamfile @@ -9,13 +9,10 @@ UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkern SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp pppoe ] ; -Addon pppoe : userland obos_network ppp : +Addon pppoe : pppoe.cpp PPPoEDevice.cpp DiscoveryPacket.cpp -; - -LinkAgainst pppoe : libkernelppp.a net_stack_tester be diff --git a/src/tests/add-ons/kernel/network/protocols/icmp/Jamfile b/src/tests/add-ons/kernel/network/protocols/icmp/Jamfile index 6179c170d8..19ffd5e980 100644 --- a/src/tests/add-ons/kernel/network/protocols/icmp/Jamfile +++ b/src/tests/add-ons/kernel/network/protocols/icmp/Jamfile @@ -8,11 +8,11 @@ UsePrivateHeaders net ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols icmp ] ; -Addon icmp : userland obos_network protocols : +Addon icmp : icmp.c + : net_stack_tester ; -LinkAgainst icmp : net_stack_tester ; # Installation -- in the test directory for the time being HaikuInstall install-userland-networking diff --git a/src/tests/add-ons/kernel/network/protocols/ipv4/Jamfile b/src/tests/add-ons/kernel/network/protocols/ipv4/Jamfile index a4f03387a5..4a1fdf2618 100644 --- a/src/tests/add-ons/kernel/network/protocols/ipv4/Jamfile +++ b/src/tests/add-ons/kernel/network/protocols/ipv4/Jamfile @@ -8,12 +8,11 @@ UsePrivateHeaders net ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols ipv4 ] ; -Addon ipv4 : userland obos_network protocols : +Addon ipv4 : ipv4.c + : net_stack_tester ; -LinkAgainst ipv4 : net_stack_tester ; - # Installation -- in the test directory for the time being HaikuInstall install-userland-networking : [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network protocols ] diff --git a/src/tests/add-ons/kernel/network/protocols/raw/Jamfile b/src/tests/add-ons/kernel/network/protocols/raw/Jamfile index 9005d85ca0..4f6518d347 100644 --- a/src/tests/add-ons/kernel/network/protocols/raw/Jamfile +++ b/src/tests/add-ons/kernel/network/protocols/raw/Jamfile @@ -8,12 +8,11 @@ UsePrivateHeaders net ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols raw ] ; -Addon raw : userland obos_network protocols : +Addon raw : raw.c + : net_stack_tester ; -LinkAgainst raw : net_stack_tester ; - # Installation -- in the test directory for the time being HaikuInstall install-userland-networking : [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network protocols ] diff --git a/src/tests/add-ons/kernel/network/protocols/route/Jamfile b/src/tests/add-ons/kernel/network/protocols/route/Jamfile index 86b65353c2..31020587fe 100644 --- a/src/tests/add-ons/kernel/network/protocols/route/Jamfile +++ b/src/tests/add-ons/kernel/network/protocols/route/Jamfile @@ -8,12 +8,11 @@ UsePrivateHeaders net ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols route ] ; -Addon route : userland obos_network protocols : +Addon route : route.c + : net_stack_tester ; -LinkAgainst route : net_stack_tester ; - # Installation -- in the test directory for the time being HaikuInstall install-userland-networking : [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network protocols ] diff --git a/src/tests/add-ons/kernel/network/protocols/tcp/Jamfile b/src/tests/add-ons/kernel/network/protocols/tcp/Jamfile index e61bab02bb..bab8021dc3 100644 --- a/src/tests/add-ons/kernel/network/protocols/tcp/Jamfile +++ b/src/tests/add-ons/kernel/network/protocols/tcp/Jamfile @@ -8,17 +8,16 @@ UsePrivateHeaders net ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols tcp ] ; -Addon tcp : userland obos_network protocols : +Addon tcp : tcp.c tcp_debug.c tcp_input.c tcp_output.c tcp_timer.c arc4random.c + : net_stack_tester ; -LinkAgainst tcp : net_stack_tester ; - # Installation -- in the test directory for the time being HaikuInstall install-userland-networking : [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network protocols ] diff --git a/src/tests/add-ons/kernel/network/protocols/udp/Jamfile b/src/tests/add-ons/kernel/network/protocols/udp/Jamfile index 6b23a73279..313040f251 100644 --- a/src/tests/add-ons/kernel/network/protocols/udp/Jamfile +++ b/src/tests/add-ons/kernel/network/protocols/udp/Jamfile @@ -8,12 +8,11 @@ UsePrivateHeaders net ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols udp ] ; -Addon udp : userland obos_network protocols : +Addon udp : udp.c + : net_stack_tester ; -LinkAgainst udp : net_stack_tester ; - # Installation -- in the test directory for the time being HaikuInstall install-userland-networking : [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network protocols ] diff --git a/src/tests/kits/net/new_stack/atomizer/Jamfile b/src/tests/kits/net/new_stack/atomizer/Jamfile index 10507300b2..d9ea351cda 100644 --- a/src/tests/kits/net/new_stack/atomizer/Jamfile +++ b/src/tests/kits/net/new_stack/atomizer/Jamfile @@ -2,8 +2,7 @@ SubDir HAIKU_TOP src tests kits net new_stack atomizer ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel generic atomizer ] ; -Addon atomizer : userland generic : +Addon atomizer : atomizer.c + : new_stack_tester ; - -LinkAgainst atomizer : new_stack_tester ; diff --git a/src/tests/kits/net/new_stack/framings/ethernet/Jamfile b/src/tests/kits/net/new_stack/framings/ethernet/Jamfile index c4e58272f6..9b8f6ca51d 100644 --- a/src/tests/kits/net/new_stack/framings/ethernet/Jamfile +++ b/src/tests/kits/net/new_stack/framings/ethernet/Jamfile @@ -2,8 +2,7 @@ SubDir HAIKU_TOP src tests kits net new_stack framings ethernet ; UseHeaders [ FDirName $(HAIKU_TOP) src tests kits net new_stack headers ] ; -Addon ethernet_frame : userland network_v2 framings : +Addon ethernet_frame : ethernet_frame.c + : new_stack_tester be ; - -LinkAgainst ethernet_frame : new_stack_tester be ; diff --git a/src/tests/kits/net/new_stack/interfaces/ether_drivers/Jamfile b/src/tests/kits/net/new_stack/interfaces/ether_drivers/Jamfile index ef4dd3e2ed..e3b4042422 100644 --- a/src/tests/kits/net/new_stack/interfaces/ether_drivers/Jamfile +++ b/src/tests/kits/net/new_stack/interfaces/ether_drivers/Jamfile @@ -2,8 +2,7 @@ SubDir HAIKU_TOP src tests kits net new_stack interfaces ether_drivers ; UseHeaders [ FDirName $(HAIKU_TOP) src tests kits net new_stack headers ] ; -Addon ether_drivers : userland network_v2 interfaces : +Addon ether_drivers : ether_drivers.c + : new_stack_tester be ; - -LinkAgainst ether_drivers : new_stack_tester be ; diff --git a/src/tests/kits/net/new_stack/interfaces/loopback/Jamfile b/src/tests/kits/net/new_stack/interfaces/loopback/Jamfile index 2c783b6ac6..413d65f199 100644 --- a/src/tests/kits/net/new_stack/interfaces/loopback/Jamfile +++ b/src/tests/kits/net/new_stack/interfaces/loopback/Jamfile @@ -2,8 +2,7 @@ SubDir HAIKU_TOP src tests kits net new_stack interfaces loopback ; UseHeaders [ FDirName $(HAIKU_TOP) src tests kits net new_stack headers ] ; -Addon loopback : userland network_v2 interfaces : +Addon loopback : loopback.c + : new_stack_tester be ; - -LinkAgainst loopback : new_stack_tester be ; diff --git a/src/tests/kits/net/new_stack/memory_pool/Jamfile b/src/tests/kits/net/new_stack/memory_pool/Jamfile index 9fdbb8f465..c621026e51 100644 --- a/src/tests/kits/net/new_stack/memory_pool/Jamfile +++ b/src/tests/kits/net/new_stack/memory_pool/Jamfile @@ -2,8 +2,7 @@ SubDir HAIKU_TOP src tests kits net new_stack memory_pool ; UseHeaders [ FDirName $(HAIKU_TOP) src tests kits net new_stack headers ] ; -Addon memory_pool : userland generic : +Addon memory_pool : memory_pool.c + : new_stack_tester ; - -LinkAgainst memory_pool : new_stack_tester ; diff --git a/src/tests/kits/net/new_stack/protocols/arp/Jamfile b/src/tests/kits/net/new_stack/protocols/arp/Jamfile index 8d68cf5ddb..52a43bfa6f 100644 --- a/src/tests/kits/net/new_stack/protocols/arp/Jamfile +++ b/src/tests/kits/net/new_stack/protocols/arp/Jamfile @@ -2,8 +2,7 @@ SubDir HAIKU_TOP src tests kits net new_stack protocols arp ; UseHeaders [ FDirName $(HAIKU_TOP) src tests kits net new_stack headers ] ; -Addon arp : userland network_v2 protocols : +Addon arp : arp.c + : new_stack_tester be ; - -LinkAgainst arp : new_stack_tester be ; diff --git a/src/tests/kits/net/new_stack/protocols/ipv4/Jamfile b/src/tests/kits/net/new_stack/protocols/ipv4/Jamfile index b821dfff58..f780a58830 100644 --- a/src/tests/kits/net/new_stack/protocols/ipv4/Jamfile +++ b/src/tests/kits/net/new_stack/protocols/ipv4/Jamfile @@ -2,8 +2,7 @@ SubDir HAIKU_TOP src tests kits net new_stack protocols ipv4 ; UseHeaders [ FDirName $(HAIKU_TOP) src tests kits net new_stack headers ] ; -Addon ipv4 : userland network_v2 protocols : +Addon ipv4 : ipv4.c + : new_stack_tester be ; - -LinkAgainst ipv4 : new_stack_tester be ; diff --git a/src/tests/kits/net/new_stack/stack/Jamfile b/src/tests/kits/net/new_stack/stack/Jamfile index 9d362344db..a3be9466ef 100644 --- a/src/tests/kits/net/new_stack/stack/Jamfile +++ b/src/tests/kits/net/new_stack/stack/Jamfile @@ -2,13 +2,12 @@ SubDir HAIKU_TOP src tests kits net new_stack stack ; UseHeaders [ FDirName $(HAIKU_TOP) src tests kits net new_stack headers ] ; -Addon stack : userland network_v2 : +Addon stack : stack.c attribute.c layers_manager.c buffer.c timer.c dump.c + : new_stack_tester be ; - -LinkAgainst stack : new_stack_tester be ; diff --git a/src/tests/servers/input/msgspy/Jamfile b/src/tests/servers/input/msgspy/Jamfile index 3fd2c7fe7f..9d15156ad6 100644 --- a/src/tests/servers/input/msgspy/Jamfile +++ b/src/tests/servers/input/msgspy/Jamfile @@ -1,5 +1,4 @@ SubDir HAIKU_TOP src tests servers input msgspy ; -Addon MsgSpy : input_server filters : MsgSpy.cpp ; -LinkAgainst MsgSpy : be /system/servers/input_server ; +Addon MsgSpy : MsgSpy.cpp : be /system/servers/input_server ; diff --git a/src/tests/servers/input/view_input_device/Jamfile b/src/tests/servers/input/view_input_device/Jamfile index d3c99dcafe..f77970ecd1 100644 --- a/src/tests/servers/input/view_input_device/Jamfile +++ b/src/tests/servers/input/view_input_device/Jamfile @@ -2,7 +2,6 @@ SubDir HAIKU_TOP src tests servers input view_input_device ; SetSubDirSupportedPlatforms libbe_test ; -Addon ViewInputDevice : input_server devices : ViewInputDevice.cpp ; -LinkAgainst ViewInputDevice : be input_server be ; +Addon ViewInputDevice : ViewInputDevice.cpp : be input_server be ; MakeLocate ViewInputDevice : [ FDirName $(HAIKU_TEST_DIR) servers input view_input_device input_server devices ] ;