diff options
Diffstat (limited to 'desktop')
25 files changed, 50 insertions, 25 deletions
diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk index d75f80614d29..1c712acd537b 100644 --- a/desktop/Executable_crashrep.com.mk +++ b/desktop/Executable_crashrep.com.mk @@ -39,9 +39,10 @@ $(eval $(call gb_Executable_add_defs,crashrep_com,\ $(eval $(call gb_Executable_use_libraries,crashrep_com,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,crashrep_com)) + $(eval $(call gb_Executable_add_exception_objects,crashrep_com,\ desktop/win32/source/guistdio/guistdio \ )) diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk index 08c413a53387..d881087c969c 100644 --- a/desktop/Executable_officeloader.mk +++ b/desktop/Executable_officeloader.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Executable_set_include,officeloader,\ $(eval $(call gb_Executable_use_libraries,officeloader,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,officeloader)) + # I'm not suer wht was the intent, but that break the link #$(eval $(call gb_Executable_set_ldflags,officeloader,\ # $(filter -bind_at_load,$$(LDFLAGS)) \ diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk index a4451f3d4325..0cded218f54f 100644 --- a/desktop/Executable_oosplash.mk +++ b/desktop/Executable_oosplash.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_set_include,oosplash,\ $(eval $(call gb_Executable_use_libraries,oosplash,\ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,oosplash)) + $(eval $(call gb_Executable_add_cobjects,oosplash,\ desktop/unx/source/args \ desktop/unx/source/file_image_unx \ diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk index 8500b1decd4a..8e2bc84ad6ef 100644 --- a/desktop/Executable_quickstart.mk +++ b/desktop/Executable_quickstart.mk @@ -40,9 +40,10 @@ $(eval $(call gb_Executable_use_libraries,quickstart,\ oleaut32 \ shell32 \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,quickstart)) + ifeq ($(COM),GCC) $(eval $(call gb_Executable_use_libraries,quickstart,\ diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk index 7a517aa8f06e..2da4803c9f31 100644 --- a/desktop/Executable_sbase.mk +++ b/desktop/Executable_sbase.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,sbase,\ $(eval $(call gb_Executable_use_libraries,sbase,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,sbase)) + $(eval $(call gb_Executable_add_libs,sbase,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk index 7ba226e06146..9d8c906240f7 100644 --- a/desktop/Executable_scalc.mk +++ b/desktop/Executable_scalc.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,scalc,\ $(eval $(call gb_Executable_use_libraries,scalc,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,scalc)) + $(eval $(call gb_Executable_add_libs,scalc,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk index 558b8d340a8b..37605330bfb8 100644 --- a/desktop/Executable_sdraw.mk +++ b/desktop/Executable_sdraw.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,sdraw,\ $(eval $(call gb_Executable_use_libraries,sdraw,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,sdraw)) + $(eval $(call gb_Executable_add_libs,sdraw,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk index 66002ce86f4f..da674755db7e 100644 --- a/desktop/Executable_simpress.mk +++ b/desktop/Executable_simpress.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,simpress,\ $(eval $(call gb_Executable_use_libraries,simpress,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,simpress)) + $(eval $(call gb_Executable_add_libs,simpress,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk index 3315f718b1e5..261fada2d03c 100644 --- a/desktop/Executable_smath.mk +++ b/desktop/Executable_smath.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,smath,\ $(eval $(call gb_Executable_use_libraries,smath,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,smath)) + $(eval $(call gb_Executable_add_libs,smath,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index 126f728cea36..98271c98d55b 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Executable_use_libraries,soffice.bin,\ sal \ sofficeapp \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,soffice.bin)) + $(eval $(call gb_Executable_add_cobjects,soffice.bin,\ desktop/source/app/main \ )) diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk index 17ac2d07cd8d..afe746dc01d9 100644 --- a/desktop/Executable_soffice.mk +++ b/desktop/Executable_soffice.mk @@ -34,9 +34,10 @@ $(eval $(call gb_Executable_use_libraries,soffice,\ shell32 \ shlwapi \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,soffice)) + $(eval $(call gb_Executable_use_static_libraries,soffice,\ ooopathutils \ winextendloaderenv \ diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk index efddda2f1fc0..83c725701c27 100644 --- a/desktop/Executable_soffice_bin.mk +++ b/desktop/Executable_soffice_bin.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Executable_use_libraries,soffice_bin,\ sal \ sofficeapp \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,soffice_bin)) + $(eval $(call gb_Executable_add_cobjects,soffice_bin,\ desktop/source/app/main \ )) diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk index 1a62d5db772e..2bade4a68e1e 100644 --- a/desktop/Executable_sweb.mk +++ b/desktop/Executable_sweb.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,sweb,\ $(eval $(call gb_Executable_use_libraries,sweb,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,sweb)) + $(eval $(call gb_Executable_add_libs,sweb,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk index 68047ecdac1d..2e9d22fb1e9d 100644 --- a/desktop/Executable_swriter.mk +++ b/desktop/Executable_swriter.mk @@ -35,9 +35,10 @@ $(eval $(call gb_Executable_add_defs,swriter,\ $(eval $(call gb_Executable_use_libraries,swriter,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,swriter)) + $(eval $(call gb_Executable_add_libs,swriter,\ $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk index ab71f1d1a56d..d2ff1a3db48b 100644 --- a/desktop/Executable_unopkg.bin.mk +++ b/desktop/Executable_unopkg.bin.mk @@ -46,9 +46,10 @@ $(eval $(call gb_Executable_use_libraries,$(desktop_UNOPKGBIN),\ tl \ unopkgapp \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,$(desktop_UNOPKGBIN))) + $(eval $(call gb_Executable_add_cobjects,$(desktop_UNOPKGBIN),\ desktop/source/pkgchk/unopkg/unopkg_main \ )) diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk index f5fb20e062f0..9937fdf0abe5 100644 --- a/desktop/Library_deployment.mk +++ b/desktop/Library_deployment.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,deployment,\ utl \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,deployment)) + ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Library_use_externals,deployment,\ berkeleydb \ diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk index 865add0e01a3..f81be8c52f41 100644 --- a/desktop/Library_deploymentgui.mk +++ b/desktop/Library_deploymentgui.mk @@ -54,9 +54,10 @@ $(eval $(call gb_Library_use_libraries,deploymentgui,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,deploymentgui)) + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_libraries,deploymentgui,\ diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk index 93f66de60f26..e5b179abc38d 100644 --- a/desktop/Library_deploymentmisc.mk +++ b/desktop/Library_deploymentmisc.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,deploymentmisc,\ utl \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,deploymentmisc)) + ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Library_use_externals,deploymentmisc,\ berkeleydb \ diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk index 3187188728af..8c803522193b 100644 --- a/desktop/Library_migrationoo2.mk +++ b/desktop/Library_migrationoo2.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,migrationoo2,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,migrationoo2)) + $(eval $(call gb_Library_use_externals,migrationoo2,\ berkeleydb \ )) diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk index fd7201f4321c..41bc2c1b4a07 100644 --- a/desktop/Library_migrationoo3.mk +++ b/desktop/Library_migrationoo3.mk @@ -40,9 +40,10 @@ $(eval $(call gb_Library_use_libraries,migrationoo3,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,migrationoo3)) + $(eval $(call gb_Library_use_externals,migrationoo3,\ berkeleydb \ )) diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk index 18653a3fca65..769cf5a56945 100644 --- a/desktop/Library_offacc.mk +++ b/desktop/Library_offacc.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,offacc,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,offacc)) + $(eval $(call gb_Library_set_componentfile,offacc,desktop/source/offacc/offacc)) $(eval $(call gb_Library_add_exception_objects,offacc,\ diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index ea039d4a8f8a..af9f39f7d72c 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -61,9 +61,10 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sofficeapp)) + ifeq ($(GUIBASE),cocoatouch) $(eval $(call gb_Library_add_cflags,sofficeapp,\ $(gb_OBJCFLAGS) \ diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk index a950d31438c1..97c0cbf67dac 100644 --- a/desktop/Library_spl.mk +++ b/desktop/Library_spl.mk @@ -44,9 +44,10 @@ $(eval $(call gb_Library_use_libraries,spl,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,spl)) + $(eval $(call gb_Library_set_componentfile,spl,desktop/source/splash/spl)) $(eval $(call gb_Library_add_exception_objects,spl,\ diff --git a/desktop/Library_spl_unx.mk b/desktop/Library_spl_unx.mk index 08412d5ac192..92059c690010 100644 --- a/desktop/Library_spl_unx.mk +++ b/desktop/Library_spl_unx.mk @@ -33,9 +33,10 @@ $(eval $(call gb_Library_use_libraries,spl_unx,\ cppu \ cppuhelper \ sal \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,spl_unx)) + $(eval $(call gb_Library_set_componentfile,spl_unx,desktop/unx/splash/splash)) $(eval $(call gb_Library_add_exception_objects,spl_unx,\ diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk index 0d6222ab0e3d..4958c6fa47ca 100644 --- a/desktop/Library_unopkgapp.mk +++ b/desktop/Library_unopkgapp.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,unopkgapp,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,unopkgapp)) + $(eval $(call gb_Library_add_exception_objects,unopkgapp,\ desktop/source/pkgchk/unopkg/unopkg_app \ desktop/source/pkgchk/unopkg/unopkg_cmdenv \ |