diff options
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 15 | ||||
| -rw-r--r-- | postprocess/Rdb_services.mk | 3 |
2 files changed, 2 insertions, 16 deletions
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 0ea2c676d694..897ad6a8e3ff 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -431,22 +431,11 @@ postprocess_FILES_postgresql := $(call gb_XcuModuleTarget_get_target,connectivit postprocess_DRIVERS += postgresql endif -ifeq ($(USING_X11), TRUE) -ifneq (,$(or $(filter TRUETRUE,$(ENABLE_GCONF)$(ENABLE_LOCKDOWN))$(filter TRUE,$(ENABLE_GIO)))) +ifneq (,$(and $(USING_X11), $(ENABLE_GIO))) postprocess_XCDS += gnome.xcd postprocess_DEPS_gnome := main -ifeq ($(ENABLE_GCONF)$(ENABLE_LOCKDOWN),TRUETRUE) -postprocess_FILES_gnome += \ - $(postprocess_MOD)/org/openoffice/Office/Common-gconflockdown.xcu \ - $(postprocess_MOD)/org/openoffice/Office/Recovery-gconflockdown.xcu \ - $(postprocess_MOD)/org/openoffice/VCL-gconflockdown.xcu +postprocess_FILES_gnome += $(postprocess_MOD)/org/openoffice/ucb/Configuration-gio.xcu endif -ifeq ($(ENABLE_GIO),TRUE) -postprocess_FILES_gnome += \ - $(postprocess_MOD)/org/openoffice/ucb/Configuration-gio.xcu -endif -endif -endif # $(USING_X11) == TRUE ifeq ($(ENABLE_ONLINE_UPDATE),TRUE) postprocess_XCDS += onlineupdate.xcd diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 8ae952e36673..9c0d7684a037 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -192,9 +192,6 @@ $(eval $(call gb_Rdb_add_components,services,\ $(if $(ENABLE_OPENGL_CANVAS), \ canvas/source/opengl/oglcanvas \ ) \ - $(if $(ENABLE_GCONF), \ - shell/source/backends/gconfbe/gconfbe1 \ - ) \ $(if $(ENABLE_GIO), \ shell/source/sessioninstall/losessioninstall \ ucb/source/ucp/gio/ucpgio \ |