Removed the obsolete second argument ("relpath") of the Addon rule and

shuffled "isExecutable" to the end. The new order favors the common use
cases. Adjusted all Addon invocations and while at it also removed
separate LinkAgainst invocations.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20604 a95241bf-73f2-0310-859d-f6bbb57e9c96

build/jam/MainBuildRules

@@ -98,46 +98,42 @@ rule Server
 	Executable $(1) : $(2) : $(3) : $(4) ;
 }
 
-rule Addon
+rule Addon target : sources : libraries : isExecutable
 {
-	# Addon <name> : <relpath> : <sources> : <is executable> : <libraries> ;
+	# Addon <target> : <sources> : <is executable> : <libraries> ;
-	# <name>: Name of the add-on.
+	# <target>: The add-on.
-	# <relpath>: Path where the add-on shall live relative to the add-on dir.
 	# <sources>: Source files.
-	# <is executable>: true, if the target shall be executable as well.
 	# <libraries>: Libraries to be linked against.
-# TODO: <relpath> is no longer needed
+	# <isExecutable>: true, if the target shall be executable as well.
 
-	if ! [ IsPlatformSupportedForTarget $(1) ] {
+	if ! [ IsPlatformSupportedForTarget $(target) ] {
 		return ;
 	}
 
-	local isExecutable = $(4) ;
+	Main $(target) : $(sources) ;
-	
-	Main $(1) : $(3) ;
 
-	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) ;
+	LINKFLAGS on $(target) = [ on $(target) return $(LINKFLAGS) ] $(linkFlags) ;
-	LinkAgainst $(1) : $(5) ;
+	LinkAgainst $(target) : $(libraries) ;
 
-	AddSharedObjectGlueCode $(1) : $(isExecutable) ;
+	AddSharedObjectGlueCode $(target) : $(isExecutable) ;
 }
 
-rule Translator
+rule Translator target : sources : libraries
 {
-	# Translator <name> : <sources> : <libraries> ;
+	# Translator <target> : <sources> : <libraries> ;
 	# 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 <name> : <sources> : <libraries> ;
+	# ScreenSaver <target> : <sources> : <libraries> ;
-	Addon $(1) : screen_savers : $(2) : false : $(3) ;
+	Addon $(target) : $(sources) : $(libraries) : false ;
 }
 
 rule StaticLibrary

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

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 ;

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 ;
-	
+	

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 :

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 :

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 :

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
 ;
 

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
 ;
 

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 :

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

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
+;
-	;

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 :

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 :

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 <nogrist>app_server
 ;

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
 ;

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
 ;

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 <gui>intel : disk_scanner : intel.cpp : false
+Addon <gui>intel : intel.cpp 
 	: <boot!home!config!lib>libdiskdevice.so be ;
 AbsSymLink <boot!home!config!add-ons!disk_scanner!partition>intel : <gui>intel
 	: /boot/home/config/add-ons/disk_scanner/partition ;

src/add-ons/input_server/devices/easypen/Jamfile

@@ -4,8 +4,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
 
 UsePrivateHeaders input ;
 
-Addon <input>easypen : input_server/devices : 
+Addon <input>easypen : 
 	EasyPenInputDevice.cpp 
-	: false 
 	: be device input_server ;
 

src/add-ons/input_server/devices/keyboard/Jamfile

@@ -5,14 +5,13 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
 UsePrivateHeaders input kernel tracker ;
 UseArchHeaders $(TARGET_ARCH) ;
 
-Addon <input>keyboard : input_server/devices : 
+Addon <input>keyboard : 
 	KeyboardInputDevice.cpp
 	Keymap.cpp
 
 	TMWindow.cpp
 	TMListItem.cpp
 
-	: false 
 	: input_server be ;
 
 Package haiku-inputkit-cvs :

src/add-ons/input_server/devices/mouse/Jamfile

@@ -4,9 +4,8 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
 
 UsePrivateHeaders input ;
 
-Addon <input>mouse : input_server/devices : 
+Addon <input>mouse : 
 	MouseInputDevice.cpp 
-	: false 
 	: be input_server ;
 
 Package haiku-inputkit-cvs :

src/add-ons/input_server/devices/serial_mouse/Jamfile

@@ -4,10 +4,9 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
 
 UsePrivateHeaders input ;
 
-Addon <input>serial_mouse : input_server/devices : 
+Addon <input>serial_mouse : 
 	MouseInputDevice.cpp 
 	SerialMouse.cpp
-	: false 
 	: be device input_server ;
 
 Package haiku-inputkit-cvs :

src/add-ons/input_server/devices/tablet/Jamfile

@@ -4,9 +4,8 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
 
 UsePrivateHeaders input ;
 
-Addon <input>tablet : input_server/devices : 
+Addon <input>tablet : 
 	TabletInputDevice.cpp 
-	: false 
 	: be input_server ;
 
 Package haiku-inputkit-cvs :

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 :

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 :

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 <file_system>bfs : userland file_systems :
+Addon <file_system>bfs :
 	bfs.c
 ;
 

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

src/add-ons/kernel/partitioning_systems/amiga/Jamfile

@@ -8,7 +8,7 @@ KernelAddon amiga_rdb :
 	amiga_rdb.cpp
 	;
 
-#Addon <partitioning_system>amiga_rdb : userland partitioning_systems :
+#Addon <partitioning_system>amiga_rdb :
 #	amiga_rdb.cpp
 #	;
 #

src/add-ons/kernel/partitioning_systems/apple/Jamfile

@@ -8,7 +8,7 @@ KernelAddon apple :
 	apple.cpp
 	;
 
-#Addon <partitioning_system>apple : userland partitioning_systems :
+#Addon <partitioning_system>apple :
 #	apple.cpp
 #	;
 #

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 <partitioning_system>intel : userland partitioning_systems :
+#Addon <partitioning_system>intel :
 #	intel.cpp
 #	PartitionMap.cpp
 #	PartitionMapParser.cpp

src/add-ons/kernel/partitioning_systems/session/Jamfile

@@ -22,7 +22,7 @@ KernelAddon session :
 ;
 
 # also build a userland version
-#Addon <partitioning_system>session : userland partitioning_systems :
+#Addon <partitioning_system>session :
 #	[ FGristFiles $(session_files:S=$(SUFOBJ)) ]
 #;
 #

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 ;

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 :

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 ;
 

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 ;

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

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 ;
 

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 ;
 

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 :

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 :

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 :

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 :

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
 ;

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
 ;
 

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
 ;

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
 ;
 

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
 ;
 

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

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 ;

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 ;

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++) ;

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 ] ;

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 ;

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 ;

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
-	: 
+	: liba52.a be libmedia.so
-	false
-	:  
-	liba52.a
 ;
 
-LinkAgainst ac3_decoder : be libmedia.so ;
-
 SubIncludeGPL HAIKU_TOP src add-ons media plugins ac3_decoder liba52 ;

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 ;

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
 ;

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

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
 ;

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

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++)
 ;

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

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
 ;

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++)

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
 ;
 

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++)
 ;
 

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
 ;
 

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
 ;
 

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
 ;
 

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
 ;

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
 ;

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 :

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 :

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 :

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 :

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	
+	XReferences.cpp
-;
+	:
-
-LinkAgainst PDF\ Writer : 
 	be 
 	textencoding 
 	translation

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 :

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 :

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 ;

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
 	<src!add-ons!print!transports!shared>DbgMsg.o
 ;
 
-LinkAgainst IPP : be $(NETWORK_LIBS) $(TARGET_LIBSTDC++) ;
-
 Package haiku-printingkit-cvs :
 	IPP :
 	boot home config add-ons Print transport ;

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
 	<src!add-ons!print!transports!shared>DbgMsg.o
 ;
 
-LinkAgainst LPR : be $(NETWORK_LIBS) $(TARGET_LIBSTDC++) ;
-
 Package haiku-printingkit-cvs :
 	LPR :
 	boot home config add-ons Print transport ;

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 <src!add-ons!print!shared>PrintTransportAddOn.o ;
-LinkAgainst Parallel\ Port : be ;
 
 Package haiku-printingkit-cvs :
 	Parallel\ Port :

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 ;

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 <src!add-ons!print!shared>PrintTransportAddOn.o ;
-LinkAgainst Serial\ Port : be ;
 
 Package haiku-printingkit-cvs :
 	Serial\ Port :

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 <src!add-ons!print!shared>PrintTransportAddOn.o ;
-LinkAgainst USB\ Port : be ;
 
 Package haiku-printingkit-cvs :
 	USB\ Port :

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" :
+Addon Haiku :
-	ScreenSaver.cpp : false
+	ScreenSaver.cpp
-	: libbe.so libscreensaver.so ;
+	: be screensaver
+;
 
 Package haiku-screensaverkit-cvs :
 	Haiku :

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
-	;
+;

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
-	;
+;
 

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 <userland>disk_scanner : userland disk_scanner :
+#Addon <userland>disk_scanner :
 #	disk_scanner.c
 #;
 #LinkAgainst <userland>disk_scanner : libkernelland_emu.so ;

src/tests/add-ons/kernel/disk_scanner/fs/Jamfile

@@ -13,15 +13,15 @@ UsePrivateHeaders $(DOT) ;
 
 # bfs
 
-Addon <userland>bfs : userland disk_scanner fs :
+Addon <userland>bfs :
 	bfs.c
+	: libkernelland_emu.so
 ;
-LinkAgainst <userland>bfs : libkernelland_emu.so ;
 
 # iso9660
 
-Addon <userland>iso9660 : userland disk_scanner fs :
+Addon <userland>iso9660 :
 	iso9660.cpp
+	: libkernelland_emu.so
 ;
-LinkAgainst <userland>iso9660 : libkernelland_emu.so ;
 

src/tests/add-ons/kernel/disk_scanner/partition/Jamfile

@@ -13,7 +13,7 @@ UsePrivateHeaders $(DOT) ;
 
 # intel
 
-Addon <userland>intel : userland disk_scanner partition :
+Addon <userland>intel :
 	intel.cpp intel_parameters.cpp intel_partition_map.cpp
+	: libkernelland_emu.so
 ;
-LinkAgainst <userland>intel : libkernelland_emu.so ;

src/tests/add-ons/kernel/disk_scanner/session/Jamfile

@@ -13,7 +13,7 @@ UsePrivateHeaders $(DOT) ;
 
 # cdrom
 
-Addon <userland>cdrom : userland disk_scanner session :
+Addon <userland>cdrom :
 	cdrom.cpp
+	: libkernelland_emu.so
 ;
-LinkAgainst <userland>cdrom : libkernelland_emu.so ;

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 <r5>i-udf-ds : [ FDirName drive_setup fs ] :
+Addon <r5>i-udf-ds :
 	udf-ds.cpp
 	Recognition.cpp
 	UdfDebug.cpp
 	UdfString.cpp
 	UdfStructures.cpp
 	Utils.cpp
-	
-	: false
-	:
 ;
 
 SEARCH on [ FGristFiles

src/tests/add-ons/kernel/file_systems/userlandfs/bfs/Jamfile

@@ -26,7 +26,6 @@ UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
 UsePrivateHeaders [ FDirName storage ] ;
 
 Addon <userland>bfs
-	: # relpath - obsolete
 	: 
 	BlockAllocator.cpp
 	BPlusTree.cpp
@@ -41,6 +40,5 @@ Addon <userland>bfs
 
 	kernel_interface.cpp
 
-	: false		# is executable
 	: libuserlandfs_haiku_kernel.so
 ;

src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/client/Jamfile

@@ -27,7 +27,6 @@ if $(NETFS_ADD_SERVER_LOCALHOST) {
 }
 
 Addon <test>netfs
-	: # relpath - obsolete
 	: Debug.cpp
 	  Locker.cpp
 	  ObjectTracker.cpp
@@ -87,7 +86,6 @@ Addon <test>netfs
 	  VolumeEvent.cpp
 	  VolumeManager.cpp
 
-	: false		# is executable
 	: <test>UserlandFSServer
 	  $(NETWORK_LIBS)
 ;

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 <test>ramfs
-	: # relpath - obsolete
 	: Debug.cpp
 	  Locker.cpp
 	  String.cpp
@@ -57,6 +56,5 @@ Addon <test>ramfs
 	  SizeIndex.cpp
 	  SymLink.cpp
 	  Volume.cpp
-	: false		# is executable
 	: <test>UserlandFSServer
 ;

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 <test>reiserfs
-	: # relpath - obsolete
 	: 
 	Block.cpp
 	BlockCache.cpp
@@ -32,6 +31,5 @@ Addon <test>reiserfs
 	String.cpp
 	SuperBlock.cpp
 
-	: false		# is executable
 	: <test>UserlandFSServer
 ;

src/tests/add-ons/kernel/file_systems/userlandfs/ramfs/Jamfile

@@ -13,7 +13,6 @@ SEARCH_SOURCE += $(ramFSTop) ;
 SEARCH_SOURCE += [ FDirName $(userlandFSTop) shared ] ;
 
 Addon <userland>ramfs
-	: # relpath - obsolete
 	: Debug.cpp
 	  Locker.cpp
 	  String.cpp
@@ -47,7 +46,6 @@ Addon <userland>ramfs
 	  SymLink.cpp
 	  Volume.cpp
 
-	: false		# is executable
 	: libuserlandfs_haiku_kernel.so
 ;
 

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 <userland-beos>ramfs
-	: # relpath - obsolete
 	: Debug.cpp
 	  Locker.cpp
 	  String.cpp
@@ -57,6 +56,5 @@ Addon <userland-beos>ramfs
 	  SizeIndex.cpp
 	  SymLink.cpp
 	  Volume.cpp
-	: false		# is executable
 	: libuserlandfs_beos_kernel.so
 ;

src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/Jamfile

@@ -14,7 +14,6 @@ SEARCH_SOURCE += $(reiserFSTop) ;
 SEARCH_SOURCE += [ FDirName $(userlandFSTop) shared ] ;
 
 Addon <userland>reiserfs
-	: # relpath - obsolete
 	: 
 	Debug.cpp
 	Locker.cpp
@@ -32,7 +31,6 @@ Addon <userland>reiserfs
 	VNode.cpp
 	Volume.cpp 
 
-	: false		# is executable
 	: libuserlandfs_haiku_kernel.so
 ;