diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-03-27 19:33:54 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-03-28 00:17:36 +0200 |
| commit | 3fcf0008d382b3f8677b02adfb3b01914d1123dc (patch) | |
| tree | e6c8e5f7fb4f70e4e7d98a3aa534fca622be4c04 /desktop | |
| parent | 3801c6ea7cf41a31173e2e96fea59ad8e0321e79 (diff) | |
Need deployment component too when HAVE_FEATURE_EXTENSIONS
Don't look just at DESKTOP or not when deciding whether to compile that stuff.
Change-Id: Ic9961ba27eb4a1e9360c67dd844c9243f1eff00e
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Library_deployment.mk | 5 | ||||
| -rw-r--r-- | desktop/Module_desktop.mk | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk index a0256744f379..b378562a2400 100644 --- a/desktop/Library_deployment.mk +++ b/desktop/Library_deployment.mk @@ -56,6 +56,7 @@ $(eval $(call gb_Library_set_componentfile,deployment,desktop/source/deployment/ $(eval $(call gb_Library_add_exception_objects,deployment,\ desktop/source/deployment/dp_log \ + desktop/source/deployment/dp_persmap \ desktop/source/deployment/dp_services \ desktop/source/deployment/dp_xml \ desktop/source/deployment/manager/dp_activepackages \ @@ -91,10 +92,6 @@ $(eval $(call gb_Library_use_libraries,deployment,\ helplinker \ )) -$(eval $(call gb_Library_add_exception_objects,deployment,\ - desktop/source/deployment/dp_persmap \ -)) - endif # vim: set ts=4 sw=4 et: diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index a05cceba6c76..73bd2291b8ad 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Module_add_targets,desktop,\ AllLangResTarget_deploymentgui \ AllLangResTarget_dkt \ Library_deployment \ + Library_deploymentgui \ Library_deploymentmisc \ Library_offacc \ Library_sofficeapp \ @@ -51,7 +52,6 @@ endif ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,desktop,\ Executable_unopkg.bin \ - Library_deploymentgui \ Library_migrationoo2 \ Library_migrationoo3 \ Library_unopkgapp \ |