diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-10-16 12:15:55 +0100 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2015-10-16 13:50:28 +0000 |
| commit | 3cf557c12d27f1b2250e69a543136da098112d80 (patch) | |
| tree | a4b988a42e3cef7a019f118914572063c0f73d37 /RepositoryExternal.mk | |
| parent | e00697d9738196f11f331335b256d7bacc17277d (diff) | |
drop gconf integration as per ESC decision
Conflicts:
shell/source/backends/gconfbe/gconfbackend.cxx
Change-Id: I609ec83ec59f5ae8d3a8c9c09649695bfcb03b87
Reviewed-on: https://gerrit.libreoffice.org/19408
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index c6bfa120aa3a..ccc22b8b566b 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3066,33 +3066,6 @@ endef endif # ENABLE_TDE -ifeq ($(ENABLE_GCONF),TRUE) - -define gb_LinkTarget__use_gconf -$(call gb_LinkTarget_set_include,$(1),\ - $(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem /,-isystem/,$(GCONF_CFLAGS)))) \ - $$(INCLUDE) \ -) - -$(call gb_LinkTarget_add_defs,$(1),\ - $(filter-out -I% -isystem%,$(subst -isystem /,-isystem/,$(GCONF_CFLAGS))) \ -) - -$(call gb_LinkTarget_add_libs,$(1),\ - $(GCONF_LIBS) \ -) - -endef - -else # !ENABLE_GCONF - -define gb_LinkTarget__use_gconf - -endef - -endif # ENABLE_GCONF - - # PYTHON # extra python_headers external because pyuno wrapper must not link python ifneq ($(SYSTEM_PYTHON),) |