diff --git a/headers/libs/icon/IconUtils.h b/headers/os/interface/IconUtils.h similarity index 100% rename from headers/libs/icon/IconUtils.h rename to headers/os/interface/IconUtils.h diff --git a/src/add-ons/screen_savers/icons/Jamfile b/src/add-ons/screen_savers/icons/Jamfile index 1c22062586..afb2834d85 100644 --- a/src/add-ons/screen_savers/icons/Jamfile +++ b/src/add-ons/screen_savers/icons/Jamfile @@ -1,10 +1,9 @@ SubDir HAIKU_TOP src add-ons screen_savers icons ; -UseLibraryHeaders icon ; UsePrivateHeaders screen_saver ; # For BuildScreenSaverDefaultSettingsView ScreenSaver Icons : - IconDisplay.cpp IconsSaver.cpp : - be libscreensaver.so libicon.a $(TARGET_LIBSUPC++) + IconDisplay.cpp IconsSaver.cpp : + be libscreensaver.so $(TARGET_LIBSUPC++) ; diff --git a/src/add-ons/translators/hvif/Jamfile b/src/add-ons/translators/hvif/Jamfile index 20b6d78bf5..0cc2230a24 100644 --- a/src/add-ons/translators/hvif/Jamfile +++ b/src/add-ons/translators/hvif/Jamfile @@ -1,7 +1,5 @@ SubDir HAIKU_TOP src add-ons translators hvif ; -UseLibraryHeaders icon ; - SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; AddResources HVIFTranslator : HVIFTranslator.rdef ; @@ -10,7 +8,7 @@ Translator HVIFTranslator : HVIFMain.cpp HVIFTranslator.cpp HVIFView.cpp - : be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) + : be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) $(HAIKU_LOCALE_LIBS) : true ; diff --git a/src/apps/diskprobe/Jamfile b/src/apps/diskprobe/Jamfile index 42daf2fd55..466886e450 100644 --- a/src/apps/diskprobe/Jamfile +++ b/src/apps/diskprobe/Jamfile @@ -2,7 +2,6 @@ SubDir HAIKU_TOP src apps diskprobe ; SetSubDirSupportedPlatformsBeOSCompatible ; -UseLibraryHeaders icon ; UsePrivateHeaders shared ; Application DiskProbe : diff --git a/src/apps/expander/Jamfile b/src/apps/expander/Jamfile index 4f21024e7e..c0290ae3bb 100644 --- a/src/apps/expander/Jamfile +++ b/src/apps/expander/Jamfile @@ -1,8 +1,6 @@ SubDir HAIKU_TOP src apps expander ; -UseLibraryHeaders icon ; - -Application Expander : +Application Expander : ExpanderApp.cpp ExpanderWindow.cpp ExpanderThread.cpp diff --git a/src/apps/networkstatus/Jamfile b/src/apps/networkstatus/Jamfile index ef83316adc..9cc32fba80 100644 --- a/src/apps/networkstatus/Jamfile +++ b/src/apps/networkstatus/Jamfile @@ -3,7 +3,7 @@ SubDir HAIKU_TOP src apps networkstatus ; SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders net shared ; -UseLibraryHeaders agg icon ; +UseLibraryHeaders agg ; local icon_libs ; if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { diff --git a/src/apps/pairs/Jamfile b/src/apps/pairs/Jamfile index 47deaff0cd..a8585d066f 100644 --- a/src/apps/pairs/Jamfile +++ b/src/apps/pairs/Jamfile @@ -1,7 +1,5 @@ SubDir HAIKU_TOP src apps pairs ; -UseLibraryHeaders icon ; - Application Pairs : Pairs.cpp PairsWindow.cpp diff --git a/src/apps/soundrecorder/Jamfile b/src/apps/soundrecorder/Jamfile index 139ea94573..5c798f5c5a 100644 --- a/src/apps/soundrecorder/Jamfile +++ b/src/apps/soundrecorder/Jamfile @@ -3,7 +3,6 @@ SubDir HAIKU_TOP src apps soundrecorder ; SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders shared ; -UseLibraryHeaders icon ; Application SoundRecorder : DrawButton.cpp diff --git a/src/bin/Jamfile b/src/bin/Jamfile index 1aad72e8b6..fa30f31d70 100644 --- a/src/bin/Jamfile +++ b/src/bin/Jamfile @@ -11,7 +11,6 @@ UsePrivateSystemHeaders ; SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_cache ; UseLibraryHeaders ncurses ; UseLibraryHeaders termcap ; -UseLibraryHeaders icon ; local haiku-utils_rsrc = [ FGristFiles haiku-utils.rsrc ] ; diff --git a/src/bin/desklink/Jamfile b/src/bin/desklink/Jamfile index 79906f5d70..74bf55d059 100644 --- a/src/bin/desklink/Jamfile +++ b/src/bin/desklink/Jamfile @@ -2,7 +2,6 @@ SubDir HAIKU_TOP src bin desklink ; SetSubDirSupportedPlatformsBeOSCompatible ; -UseLibraryHeaders icon ; UsePrivateHeaders app interface shared ; BinCommand desklink : diff --git a/src/kits/interface/Jamfile b/src/kits/interface/Jamfile index 47ac826e29..8b6e9e4a4e 100644 --- a/src/kits/interface/Jamfile +++ b/src/kits/interface/Jamfile @@ -24,7 +24,7 @@ if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { SetSubDirSupportedPlatforms haiku libbe_test ; -UseLibraryHeaders agg icon ; +UseLibraryHeaders agg ; UsePrivateHeaders app input print interface libbe shared support tracker ; SEARCH_SOURCE += [ FDirName $(SUBDIR) textview_support ] ; diff --git a/src/kits/locale/Jamfile b/src/kits/locale/Jamfile index 73df30bda3..15ff077e7e 100644 --- a/src/kits/locale/Jamfile +++ b/src/kits/locale/Jamfile @@ -3,8 +3,7 @@ SubDir HAIKU_TOP src kits locale ; AddSubDirSupportedPlatforms libbe_test ; UsePrivateHeaders libbe locale shared ; -UsePublicHeaders locale storage icon ; -UseLibraryHeaders icon ; +UsePublicHeaders locale storage ; local sources = cat.cpp @@ -75,5 +74,5 @@ DoCatalogs liblocale.so AboutWindow.cpp ColorControl.cpp StringForSize.cpp - TextView.cpp + TextView.cpp ; diff --git a/src/kits/shared/Jamfile b/src/kits/shared/Jamfile index d26c4085a8..9a4007600d 100644 --- a/src/kits/shared/Jamfile +++ b/src/kits/shared/Jamfile @@ -3,7 +3,7 @@ SubDir HAIKU_TOP src kits shared ; SetSubDirSupportedPlatformsBeOSCompatible ; AddSubDirSupportedPlatforms libbe_test ; -UseLibraryHeaders agg icon ; +UseLibraryHeaders agg ; UsePrivateHeaders shared libbe ; UseHeaders [ FDirName $(HAIKU_COMMON_DEBUG_OBJECT_DIR) servers input ] ; UseHeaders [ FDirName $(HAIKU_TOP) src kits ] ; diff --git a/src/kits/storage/Jamfile b/src/kits/storage/Jamfile index 7788eca938..ea3410946c 100644 --- a/src/kits/storage/Jamfile +++ b/src/kits/storage/Jamfile @@ -2,8 +2,6 @@ SubDir HAIKU_TOP src kits storage ; SetSubDirSupportedPlatforms haiku libbe_test ; -UseLibraryHeaders icon ; - UsePrivateHeaders app libroot shared storage ; UsePrivateSystemHeaders ; diff --git a/src/kits/tracker/Jamfile b/src/kits/tracker/Jamfile index 308aa74da2..0f4edfd3f8 100644 --- a/src/kits/tracker/Jamfile +++ b/src/kits/tracker/Jamfile @@ -5,8 +5,6 @@ AddSubDirSupportedPlatforms libbe_test ; UsePrivateHeaders interface mount shared storage support tracker ; -UseLibraryHeaders icon ; - AddResources libtracker.so : TrackerIcons.rdef libtracker.rdef ; SubDirC++Flags diff --git a/src/preferences/media/Jamfile b/src/preferences/media/Jamfile index fcfa0c3a69..ca1cd695fa 100644 --- a/src/preferences/media/Jamfile +++ b/src/preferences/media/Jamfile @@ -6,18 +6,17 @@ if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { SubDirC++Flags -fmultiple-symbol-spaces ; } -UseLibraryHeaders icon ; UsePrivateHeaders media shared ; Preference Media : Media.cpp - MediaAlert.cpp + MediaAlert.cpp MediaIcons.cpp MediaListItem.cpp MediaViews.cpp MediaWindow.cpp : media be $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++) - : media.rdef + : media.rdef ; DoCatalogs Media diff --git a/src/preferences/screen/Jamfile b/src/preferences/screen/Jamfile index c52bc7f8d9..f0999b5003 100644 --- a/src/preferences/screen/Jamfile +++ b/src/preferences/screen/Jamfile @@ -3,7 +3,6 @@ SubDir HAIKU_TOP src preferences screen ; SetSubDirSupportedPlatformsBeOSCompatible ; AddSubDirSupportedPlatforms libbe_test ; -UseLibraryHeaders icon ; UsePrivateHeaders [ FDirName graphics radeon ] ; UsePrivateHeaders interface ; diff --git a/src/servers/bluetooth/Jamfile b/src/servers/bluetooth/Jamfile index 1ef266ceaa..e620e4ec46 100644 --- a/src/servers/bluetooth/Jamfile +++ b/src/servers/bluetooth/Jamfile @@ -3,7 +3,6 @@ SubDir HAIKU_TOP src servers bluetooth ; SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders shared bluetooth net kernel ; -UseLibraryHeaders icon ; AddResources bluetooth_server : server-bluetooth.rdef ; @@ -15,7 +14,7 @@ Server bluetooth_server HCIControllerAccessor.cpp HCITransportAccessor.cpp LocalDeviceHandler.cpp - LocalDeviceImpl.cpp + LocalDeviceImpl.cpp Output.cpp : be network libbluetooth.so $(TARGET_LIBSTDC++) diff --git a/src/servers/mail/Jamfile b/src/servers/mail/Jamfile index 4eb4772382..b555a2a5ce 100644 --- a/src/servers/mail/Jamfile +++ b/src/servers/mail/Jamfile @@ -9,7 +9,6 @@ if $(TARGET_PLATFORM) != haiku { UsePublicHeaders [ FDirName add-ons mail_daemon ] ; UsePrivateHeaders mail ; UsePrivateHeaders shared ; -UseLibraryHeaders icon ; SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ; diff --git a/src/servers/midi/Jamfile b/src/servers/midi/Jamfile index 431689f7ed..fb54958865 100644 --- a/src/servers/midi/Jamfile +++ b/src/servers/midi/Jamfile @@ -2,20 +2,19 @@ SubDir HAIKU_TOP src servers midi ; SetSubDirSupportedPlatformsBeOSCompatible ; -UseLibraryHeaders icon ; UsePrivateHeaders midi shared storage ; Server midi_server : - MidiServerApp.cpp + MidiServerApp.cpp DeviceWatcher.cpp PortDrivers.cpp # storage NodeMonitorHandler.cpp - + : be midi2 libshared.a libicon.a $(TARGET_LIBSTDC++) : midi_server.rdef ; -SEARCH on [ FGristFiles NodeMonitorHandler.cpp ] +SEARCH on [ FGristFiles NodeMonitorHandler.cpp ] += [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) kits storage ] ; diff --git a/src/servers/notification/Jamfile b/src/servers/notification/Jamfile index c373722a64..fa091bc405 100644 --- a/src/servers/notification/Jamfile +++ b/src/servers/notification/Jamfile @@ -1,7 +1,6 @@ SubDir HAIKU_TOP src servers notification ; UsePrivateHeaders notification ; -UseLibraryHeaders icon ; Server notification_server : AppGroupView.cpp diff --git a/src/tests/kits/midi/patchbay/Jamfile b/src/tests/kits/midi/patchbay/Jamfile index c63bb9e2af..7cea736e59 100644 --- a/src/tests/kits/midi/patchbay/Jamfile +++ b/src/tests/kits/midi/patchbay/Jamfile @@ -2,10 +2,8 @@ SubDir HAIKU_TOP src tests kits midi patchbay ; SetSubDirSupportedPlatformsBeOSCompatible ; -UseLibraryHeaders icon ; - SimpleTest PatchBay - : + : PatchApp.cpp PatchWin.cpp PatchView.cpp @@ -13,7 +11,7 @@ SimpleTest PatchBay EndpointInfo.cpp MidiEventMeter.cpp TToolTip.cpp - : + : midi midi2 be libicon.a $(TARGET_LIBSTDC++) ; diff --git a/src/tests/kits/net/preflet/InterfacesAddOn/Jamfile b/src/tests/kits/net/preflet/InterfacesAddOn/Jamfile index 1c765f90bd..10e6fb5701 100644 --- a/src/tests/kits/net/preflet/InterfacesAddOn/Jamfile +++ b/src/tests/kits/net/preflet/InterfacesAddOn/Jamfile @@ -6,7 +6,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) src tests kits net preflet ] ; UseHeaders [ FDirName $(HAIKU_TOP) src servers net ] : true ; UsePrivateHeaders net shared ; -UseLibraryHeaders agg icon ; +UseLibraryHeaders agg ; AddResources Interfaces :