From 6f6f7a17dc82248446dc4eddfd51af08362fc352 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 26 Sep 2012 23:45:28 +0200 Subject: gbuild: split uwinapi out of gb_STDLIBS Change-Id: I53316e0b9369d806197bccb42cf22d3497af43e7 --- desktop/Executable_crashrep.com.mk | 1 + desktop/Executable_officeloader.mk | 1 + desktop/Executable_quickstart.mk | 1 + desktop/Executable_sbase.mk | 1 + desktop/Executable_scalc.mk | 1 + desktop/Executable_sdraw.mk | 1 + desktop/Executable_simpress.mk | 1 + desktop/Executable_smath.mk | 1 + desktop/Executable_soffice.bin.mk | 1 + desktop/Executable_soffice.mk | 1 + desktop/Executable_soffice_bin.mk | 1 + desktop/Executable_sweb.mk | 1 + desktop/Executable_swriter.mk | 1 + desktop/Executable_unopkg.bin.mk | 1 + desktop/Library_deployment.mk | 1 + desktop/Library_deploymentgui.mk | 1 + desktop/Library_deploymentmisc.mk | 1 + desktop/Library_migrationoo2.mk | 1 + desktop/Library_migrationoo3.mk | 1 + desktop/Library_offacc.mk | 1 + desktop/Library_sofficeapp.mk | 1 + desktop/Library_spl.mk | 1 + desktop/Library_unopkgapp.mk | 1 + 23 files changed, 23 insertions(+) (limited to 'desktop') diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk index 96ed6f76cc60..d75f80614d29 100644 --- a/desktop/Executable_crashrep.com.mk +++ b/desktop/Executable_crashrep.com.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Executable_add_defs,crashrep_com,\ )) $(eval $(call gb_Executable_use_libraries,crashrep_com,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk index e3a766f2dd27..08c413a53387 100644 --- a/desktop/Executable_officeloader.mk +++ b/desktop/Executable_officeloader.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Executable_set_include,officeloader,\ $(eval $(call gb_Executable_use_libraries,officeloader,\ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk index b3fbde1eaaf1..8500b1decd4a 100644 --- a/desktop/Executable_quickstart.mk +++ b/desktop/Executable_quickstart.mk @@ -39,6 +39,7 @@ $(eval $(call gb_Executable_use_libraries,quickstart,\ ole32 \ oleaut32 \ shell32 \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk index 375cba33385f..7a517aa8f06e 100644 --- a/desktop/Executable_sbase.mk +++ b/desktop/Executable_sbase.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,sbase,\ )) $(eval $(call gb_Executable_use_libraries,sbase,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk index ce90099a532b..7ba226e06146 100644 --- a/desktop/Executable_scalc.mk +++ b/desktop/Executable_scalc.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,scalc,\ )) $(eval $(call gb_Executable_use_libraries,scalc,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk index 4642445173b4..558b8d340a8b 100644 --- a/desktop/Executable_sdraw.mk +++ b/desktop/Executable_sdraw.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,sdraw,\ )) $(eval $(call gb_Executable_use_libraries,sdraw,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk index c3026435e3f4..66002ce86f4f 100644 --- a/desktop/Executable_simpress.mk +++ b/desktop/Executable_simpress.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,simpress,\ )) $(eval $(call gb_Executable_use_libraries,simpress,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk index 4c7c4afb8232..3315f718b1e5 100644 --- a/desktop/Executable_smath.mk +++ b/desktop/Executable_smath.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,smath,\ )) $(eval $(call gb_Executable_use_libraries,smath,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index d1c6aec55939..126f728cea36 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Executable_set_include,soffice.bin,\ $(eval $(call gb_Executable_use_libraries,soffice.bin,\ sal \ sofficeapp \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk index 18efbbdf8770..17ac2d07cd8d 100644 --- a/desktop/Executable_soffice.mk +++ b/desktop/Executable_soffice.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Executable_use_libraries,soffice,\ advapi32 \ shell32 \ shlwapi \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk index e87b8a041d2b..efddda2f1fc0 100644 --- a/desktop/Executable_soffice_bin.mk +++ b/desktop/Executable_soffice_bin.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Executable_set_include,soffice_bin,\ $(eval $(call gb_Executable_use_libraries,soffice_bin,\ sal \ sofficeapp \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk index 870cf7d6c86a..1a62d5db772e 100644 --- a/desktop/Executable_sweb.mk +++ b/desktop/Executable_sweb.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,sweb,\ )) $(eval $(call gb_Executable_use_libraries,sweb,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk index acd299b641ca..68047ecdac1d 100644 --- a/desktop/Executable_swriter.mk +++ b/desktop/Executable_swriter.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Executable_add_defs,swriter,\ )) $(eval $(call gb_Executable_use_libraries,swriter,\ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk index 9303eefeefb1..ab71f1d1a56d 100644 --- a/desktop/Executable_unopkg.bin.mk +++ b/desktop/Executable_unopkg.bin.mk @@ -45,6 +45,7 @@ $(eval $(call gb_Executable_use_libraries,$(desktop_UNOPKGBIN),\ sal \ tl \ unopkgapp \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk index 3910fb910757..f5fb20e062f0 100644 --- a/desktop/Library_deployment.mk +++ b/desktop/Library_deployment.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,deployment,\ ucbhelper \ utl \ xmlscript \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk index f5f48e47d118..865add0e01a3 100644 --- a/desktop/Library_deploymentgui.mk +++ b/desktop/Library_deploymentgui.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,deploymentgui,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk index 72ac02bd7c2a..93f66de60f26 100644 --- a/desktop/Library_deploymentmisc.mk +++ b/desktop/Library_deploymentmisc.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,deploymentmisc,\ ucbhelper \ utl \ xmlscript \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk index 838b475da267..3187188728af 100644 --- a/desktop/Library_migrationoo2.mk +++ b/desktop/Library_migrationoo2.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,migrationoo2,\ sal \ tl \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk index d39497e32ea3..fd7201f4321c 100644 --- a/desktop/Library_migrationoo3.mk +++ b/desktop/Library_migrationoo3.mk @@ -39,6 +39,7 @@ $(eval $(call gb_Library_use_libraries,migrationoo3,\ sal \ tl \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk index f75728dab7bc..18653a3fca65 100644 --- a/desktop/Library_offacc.mk +++ b/desktop/Library_offacc.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_libraries,offacc,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 9e4fa379374b..ea039d4a8f8a 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -60,6 +60,7 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk index 0d45c5991078..a950d31438c1 100644 --- a/desktop/Library_spl.mk +++ b/desktop/Library_spl.mk @@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,spl,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk index 081fee923a33..0d6222ab0e3d 100644 --- a/desktop/Library_unopkgapp.mk +++ b/desktop/Library_unopkgapp.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,unopkgapp,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) -- cgit From 816ec4b0933e36ac468230365359c3b9d8d52986 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 27 Sep 2012 00:49:12 +0200 Subject: gbuild: replace direct gb_STDLIBS use with ... ... new gb_LinkTarget_add_standard_system_libs Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69 --- desktop/Executable_crashrep.com.mk | 3 ++- desktop/Executable_officeloader.mk | 3 ++- desktop/Executable_oosplash.mk | 3 ++- desktop/Executable_quickstart.mk | 3 ++- desktop/Executable_sbase.mk | 3 ++- desktop/Executable_scalc.mk | 3 ++- desktop/Executable_sdraw.mk | 3 ++- desktop/Executable_simpress.mk | 3 ++- desktop/Executable_smath.mk | 3 ++- desktop/Executable_soffice.bin.mk | 3 ++- desktop/Executable_soffice.mk | 3 ++- desktop/Executable_soffice_bin.mk | 3 ++- desktop/Executable_sweb.mk | 3 ++- desktop/Executable_swriter.mk | 3 ++- desktop/Executable_unopkg.bin.mk | 3 ++- desktop/Library_deployment.mk | 3 ++- desktop/Library_deploymentgui.mk | 3 ++- desktop/Library_deploymentmisc.mk | 3 ++- desktop/Library_migrationoo2.mk | 3 ++- desktop/Library_migrationoo3.mk | 3 ++- desktop/Library_offacc.mk | 3 ++- desktop/Library_sofficeapp.mk | 3 ++- desktop/Library_spl.mk | 3 ++- desktop/Library_spl_unx.mk | 3 ++- desktop/Library_unopkgapp.mk | 3 ++- 25 files changed, 50 insertions(+), 25 deletions(-) (limited to 'desktop') 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 \ -- cgit From 8831c592e80288be39a9e5f4d20e617b55682003 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 15:31:46 +0200 Subject: gbuild: gb_Library_PLAINLIBS_NONE cleanup for WNT: add a new gb_LinkTarget_use_system_win32_libs to abstract different linker options on MSVC and GCC. Change-Id: Ic9bf2545f59bf7871e6fc06b290c486ddfbec03d --- desktop/Executable_quickstart.mk | 11 +++++++---- desktop/Executable_soffice.mk | 5 ++++- desktop/Library_deploymentgui.mk | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) (limited to 'desktop') diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk index 8e2bc84ad6ef..aecd9b37dd2b 100644 --- a/desktop/Executable_quickstart.mk +++ b/desktop/Executable_quickstart.mk @@ -33,12 +33,15 @@ $(eval $(call gb_Executable_set_include,quickstart,\ $$(INCLUDE) \ )) -$(eval $(call gb_Executable_use_libraries,quickstart,\ +$(eval $(call gb_Executable_use_system_win32_libs,quickstart,\ comdlg32 \ gdi32 \ ole32 \ oleaut32 \ shell32 \ +)) + +$(eval $(call gb_Executable_use_libraries,quickstart,\ $(gb_UWINAPI) \ )) @@ -46,14 +49,14 @@ $(eval $(call gb_Executable_add_standard_system_libs,quickstart)) ifeq ($(COM),GCC) -$(eval $(call gb_Executable_use_libraries,quickstart,\ +$(eval $(call gb_Executable_use_system_win32_libs,quickstart,\ uuid \ )) else -$(eval $(call gb_Executable_add_libs,quickstart,\ - comsupp.lib \ +$(eval $(call gb_Executable_use_system_win32_libs,quickstart,\ + comsupp \ )) endif diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk index afe746dc01d9..302c978a0096 100644 --- a/desktop/Executable_soffice.mk +++ b/desktop/Executable_soffice.mk @@ -30,10 +30,13 @@ $(eval $(call gb_Executable_Executable,soffice)) $(eval $(call gb_Executable_set_targettype_gui,soffice,YES)) $(eval $(call gb_Executable_use_libraries,soffice,\ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Executable_use_system_win32_libs,soffice,\ advapi32 \ shell32 \ shlwapi \ - $(gb_UWINAPI) \ )) $(eval $(call gb_Executable_add_standard_system_libs,soffice)) diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk index f81be8c52f41..712a020262ab 100644 --- a/desktop/Library_deploymentgui.mk +++ b/desktop/Library_deploymentgui.mk @@ -60,7 +60,7 @@ $(eval $(call gb_Library_add_standard_system_libs,deploymentgui)) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,deploymentgui,\ +$(eval $(call gb_Library_use_system_win32_libs,deploymentgui,\ ole32 \ )) -- cgit From f011af716e2978cbf9fcb7748dc868c503edddff Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 16:29:24 +0200 Subject: gbuild: invert handling of standard system libraries: Always link in gb_STDLIBS, except when the library explicitly opts out with gb_LinkTarget_disable_standard_system_libs. Change-Id: I489a99114fbfa46d0421a27cf6c7b899dc268a4a --- desktop/Executable_crashrep.com.mk | 2 -- desktop/Executable_officeloader.mk | 2 -- desktop/Executable_oosplash.mk | 2 -- desktop/Executable_quickstart.mk | 2 -- desktop/Executable_sbase.mk | 2 -- desktop/Executable_scalc.mk | 2 -- desktop/Executable_sdraw.mk | 2 -- desktop/Executable_simpress.mk | 2 -- desktop/Executable_smath.mk | 2 -- desktop/Executable_soffice.bin.mk | 2 -- desktop/Executable_soffice.mk | 2 -- desktop/Executable_soffice_bin.mk | 2 -- desktop/Executable_sweb.mk | 2 -- desktop/Executable_swriter.mk | 2 -- desktop/Executable_unopkg.bin.mk | 2 -- desktop/Library_deployment.mk | 2 -- desktop/Library_deploymentgui.mk | 2 -- desktop/Library_deploymentmisc.mk | 2 -- desktop/Library_migrationoo2.mk | 2 -- desktop/Library_migrationoo3.mk | 2 -- desktop/Library_offacc.mk | 2 -- desktop/Library_sofficeapp.mk | 2 -- desktop/Library_spl.mk | 2 -- desktop/Library_spl_unx.mk | 2 -- desktop/Library_unopkgapp.mk | 2 -- 25 files changed, 50 deletions(-) (limited to 'desktop') diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk index 1c712acd537b..c42d6301a085 100644 --- a/desktop/Executable_crashrep.com.mk +++ b/desktop/Executable_crashrep.com.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Executable_use_libraries,crashrep_com,\ $(gb_UWINAPI) \ )) -$(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 d881087c969c..d29e0d31108b 100644 --- a/desktop/Executable_officeloader.mk +++ b/desktop/Executable_officeloader.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Executable_use_libraries,officeloader,\ $(gb_UWINAPI) \ )) -$(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 0cded218f54f..3fa96d4f57ce 100644 --- a/desktop/Executable_oosplash.mk +++ b/desktop/Executable_oosplash.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,oosplash,\ sal \ )) -$(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 aecd9b37dd2b..555917edf714 100644 --- a/desktop/Executable_quickstart.mk +++ b/desktop/Executable_quickstart.mk @@ -45,8 +45,6 @@ $(eval $(call gb_Executable_use_libraries,quickstart,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,quickstart)) - ifeq ($(COM),GCC) $(eval $(call gb_Executable_use_system_win32_libs,quickstart,\ diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk index 2da4803c9f31..3036b5de5cb2 100644 --- a/desktop/Executable_sbase.mk +++ b/desktop/Executable_sbase.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,sbase,\ $(gb_UWINAPI) \ )) -$(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 9d8c906240f7..aa4ce8f7e219 100644 --- a/desktop/Executable_scalc.mk +++ b/desktop/Executable_scalc.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,scalc,\ $(gb_UWINAPI) \ )) -$(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 37605330bfb8..c3f20a674b2a 100644 --- a/desktop/Executable_sdraw.mk +++ b/desktop/Executable_sdraw.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,sdraw,\ $(gb_UWINAPI) \ )) -$(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 da674755db7e..34d7e13f3913 100644 --- a/desktop/Executable_simpress.mk +++ b/desktop/Executable_simpress.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,simpress,\ $(gb_UWINAPI) \ )) -$(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 261fada2d03c..9ff184704fa2 100644 --- a/desktop/Executable_smath.mk +++ b/desktop/Executable_smath.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,smath,\ $(gb_UWINAPI) \ )) -$(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 98271c98d55b..4de733cb3036 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Executable_use_libraries,soffice.bin,\ $(gb_UWINAPI) \ )) -$(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 302c978a0096..d28a20a1ddc9 100644 --- a/desktop/Executable_soffice.mk +++ b/desktop/Executable_soffice.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Executable_use_system_win32_libs,soffice,\ shlwapi \ )) -$(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 83c725701c27..5bcf14ac10b5 100644 --- a/desktop/Executable_soffice_bin.mk +++ b/desktop/Executable_soffice_bin.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Executable_use_libraries,soffice_bin,\ $(gb_UWINAPI) \ )) -$(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 2bade4a68e1e..2182da57db77 100644 --- a/desktop/Executable_sweb.mk +++ b/desktop/Executable_sweb.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,sweb,\ $(gb_UWINAPI) \ )) -$(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 2e9d22fb1e9d..e82215317179 100644 --- a/desktop/Executable_swriter.mk +++ b/desktop/Executable_swriter.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,swriter,\ $(gb_UWINAPI) \ )) -$(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 d2ff1a3db48b..a15831627d6a 100644 --- a/desktop/Executable_unopkg.bin.mk +++ b/desktop/Executable_unopkg.bin.mk @@ -48,8 +48,6 @@ $(eval $(call gb_Executable_use_libraries,$(desktop_UNOPKGBIN),\ $(gb_UWINAPI) \ )) -$(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 9937fdf0abe5..8298eb9915cf 100644 --- a/desktop/Library_deployment.mk +++ b/desktop/Library_deployment.mk @@ -50,8 +50,6 @@ $(eval $(call gb_Library_use_libraries,deployment,\ $(gb_UWINAPI) \ )) -$(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 712a020262ab..a7955115d3f8 100644 --- a/desktop/Library_deploymentgui.mk +++ b/desktop/Library_deploymentgui.mk @@ -56,8 +56,6 @@ $(eval $(call gb_Library_use_libraries,deploymentgui,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,deploymentgui)) - ifeq ($(OS),WNT) $(eval $(call gb_Library_use_system_win32_libs,deploymentgui,\ diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk index e5b179abc38d..2124ea59be1a 100644 --- a/desktop/Library_deploymentmisc.mk +++ b/desktop/Library_deploymentmisc.mk @@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,deploymentmisc,\ $(gb_UWINAPI) \ )) -$(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 8c803522193b..36f430d4dcac 100644 --- a/desktop/Library_migrationoo2.mk +++ b/desktop/Library_migrationoo2.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,migrationoo2,\ $(gb_UWINAPI) \ )) -$(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 41bc2c1b4a07..6c0783b53b9d 100644 --- a/desktop/Library_migrationoo3.mk +++ b/desktop/Library_migrationoo3.mk @@ -42,8 +42,6 @@ $(eval $(call gb_Library_use_libraries,migrationoo3,\ $(gb_UWINAPI) \ )) -$(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 769cf5a56945..8272b4d49920 100644 --- a/desktop/Library_offacc.mk +++ b/desktop/Library_offacc.mk @@ -40,8 +40,6 @@ $(eval $(call gb_Library_use_libraries,offacc,\ $(gb_UWINAPI) \ )) -$(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 af9f39f7d72c..377fe1ac2172 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -63,8 +63,6 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\ $(gb_UWINAPI) \ )) -$(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 97c0cbf67dac..cc5086db0f68 100644 --- a/desktop/Library_spl.mk +++ b/desktop/Library_spl.mk @@ -46,8 +46,6 @@ $(eval $(call gb_Library_use_libraries,spl,\ $(gb_UWINAPI) \ )) -$(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 92059c690010..577a018849d3 100644 --- a/desktop/Library_spl_unx.mk +++ b/desktop/Library_spl_unx.mk @@ -35,8 +35,6 @@ $(eval $(call gb_Library_use_libraries,spl_unx,\ sal \ )) -$(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 4958c6fa47ca..5ce00afd5de6 100644 --- a/desktop/Library_unopkgapp.mk +++ b/desktop/Library_unopkgapp.mk @@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,unopkgapp,\ $(gb_UWINAPI) \ )) -$(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 \ -- cgit From f5f06fb016766cc40817f1fcc3feec0b464845b0 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 29 Sep 2012 17:20:22 +0200 Subject: Use comphelper::getComponentContext ...and some further clean up. Change-Id: Id294c0f38fe0041646fc86cacbd2e19734c746a9 --- desktop/Library_offacc.mk | 1 + desktop/inc/app.hxx | 2 -- desktop/source/app/app.cxx | 5 +++-- desktop/source/app/appinit.cxx | 19 ------------------- desktop/source/offacc/acceptor.cxx | 18 ++++-------------- 5 files changed, 8 insertions(+), 37 deletions(-) (limited to 'desktop') diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk index 8272b4d49920..6e3c84589d76 100644 --- a/desktop/Library_offacc.mk +++ b/desktop/Library_offacc.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Library_set_include,offacc,\ $(eval $(call gb_Library_use_sdk_api,offacc)) $(eval $(call gb_Library_use_libraries,offacc,\ + comphelper \ cppu \ cppuhelper \ sal \ diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 7b8359d44d15..4f56c32560e7 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -144,8 +144,6 @@ class Desktop : public Application void RegisterServices(); void DeregisterServices(); - void DestroyApplicationServiceManager( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xSMgr ); - void CreateTemporaryDirectory(); void RemoveTemporaryDirectory(); diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 4741ce6833a8..cff9f8ed65e6 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -665,8 +665,9 @@ void Desktop::DeInit() // close splashscreen if it's still open CloseSplashScreen(); - Reference xXMultiServiceFactory(::comphelper::getProcessServiceFactory()); - DestroyApplicationServiceManager( xXMultiServiceFactory ); + Reference< XComponent >( + comphelper::getProcessComponentContext(), UNO_QUERY_THROW )-> + dispose(); // nobody should get a destroyd service factory... ::comphelper::setProcessServiceFactory( NULL ); diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index 367b77ab08fd..157621ac92ed 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -128,25 +128,6 @@ void Desktop::InitApplicationServiceManager() comphelper::setProcessServiceFactory(sm); } -void Desktop::DestroyApplicationServiceManager( Reference< XMultiServiceFactory >& xSMgr ) -{ - Reference< XPropertySet > xProps( xSMgr, UNO_QUERY ); - if ( xProps.is() ) - { - try - { - Reference< XComponent > xComp; - if (xProps->getPropertyValue( OUString( "DefaultContext" )) >>= xComp ) - { - xComp->dispose(); - } - } - catch (const UnknownPropertyException&) - { - } - } -} - void Desktop::RegisterServices() { if( !m_bServicesRegistered ) diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx index 2fd0da302885..4510f65dcbc5 100644 --- a/desktop/source/offacc/acceptor.cxx +++ b/desktop/source/offacc/acceptor.cxx @@ -31,10 +31,9 @@ #include #include #include -#include #include #include - +#include #include namespace desktop @@ -45,15 +44,6 @@ extern "C" void workerfunc (void * acc) ((Acceptor*)acc)->run(); } -static Reference getComponentContext( const Reference& rFactory) -{ - Reference rContext; - Reference< XPropertySet > rPropSet( rFactory, UNO_QUERY ); - Any a = rPropSet->getPropertyValue( ::rtl::OUString( "DefaultContext" ) ); - a >>= rContext; - return rContext; -} - Mutex Acceptor::m_aMutex; Acceptor::Acceptor( const Reference< XMultiServiceFactory >& rFactory ) @@ -66,7 +56,7 @@ Acceptor::Acceptor( const Reference< XMultiServiceFactory >& rFactory ) { m_rSMgr = rFactory; // get component context - m_rContext = getComponentContext(m_rSMgr); + m_rContext = comphelper::getComponentContext(m_rSMgr); m_rAcceptor = Reference< XAcceptor > (m_rSMgr->createInstance( rtl::OUString("com.sun.star.connection.Acceptor" )), UNO_QUERY ); @@ -266,7 +256,7 @@ Reference SAL_CALL AccInstanceProvider::getInstance (const OUString& } else if(aName.compareToAscii( "StarOffice.ComponentContext" ) == 0 ) { - rInstance = getComponentContext( m_rSMgr ); + rInstance = comphelper::getComponentContext( m_rSMgr ); } else if ( aName.compareToAscii("StarOffice.NamingService" ) == 0 ) { @@ -278,7 +268,7 @@ Reference SAL_CALL AccInstanceProvider::getInstance (const OUString& rNamingService->registerObject( OUString("StarOffice.ServiceManager" ), m_rSMgr ); rNamingService->registerObject( - OUString("StarOffice.ComponentContext" ), getComponentContext( m_rSMgr )); + OUString("StarOffice.ComponentContext" ), comphelper::getComponentContext( m_rSMgr )); rInstance = rNamingService; } } -- cgit From 39bac3f6c0a29d4d6ef7d6a636b8204cf12b4866 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 1 Oct 2012 15:19:10 +0200 Subject: translations is a source-only module Change-Id: I9fcddfcdfa2d60860a7b016dbb870a3b6e8f3ea4 --- desktop/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'desktop') diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst index c9644a09a253..be8baca84930 100644 --- a/desktop/prj/build.lst +++ b/desktop/prj/build.lst @@ -1,3 +1,3 @@ -dt desktop : TRANSLATIONS:translations sfx2 stoc BERKELEYDB:berkeleydb BOOST:boost svx DESKTOP:xmlhelp sal salhelper unoil officecfg offapi filter LIBXSLT:libxslt DESKTOP:helpcompiler NULL +dt desktop : sfx2 stoc BERKELEYDB:berkeleydb BOOST:boost svx DESKTOP:xmlhelp sal salhelper unoil officecfg offapi filter LIBXSLT:libxslt DESKTOP:helpcompiler NULL dt desktop usr1 - all dt_mkout NULL dt desktop\prj nmake - all dt_prj NULL -- cgit