[giggle] Remove unneded GConf dependency
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [giggle] Remove unneded GConf dependency
- Date: Tue, 26 Oct 2010 15:47:55 +0000 (UTC)
commit 6a7a192da0c79e3db7d3614a384ee4aa92f241bc
Author: Javier Jardón <jjardon gnome org>
Date: Tue Oct 26 17:29:02 2010 +0200
Remove unneded GConf dependency
As the url-handlers detection is done through .desktop file
This completes commit 6a2d7dd99d7024f4dc6daa7f36971a555629f95e
configure.ac | 9 ---------
data/Makefile.am | 26 ++------------------------
data/giggle.schemas.in | 35 -----------------------------------
po/POTFILES.in | 1 -
4 files changed, 2 insertions(+), 69 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e3655be..fb6d0fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,15 +152,6 @@ AC_SUBST(PLATFORM_CFLAGS)
AC_SUBST(PLATFORM_LDFLAGS)
-dnl --------------------------------------
-dnl | GConftool detection for url-handlers |-------------------
-dnl --------------------------------------
-AC_PATH_PROG([GCONFTOOL], [gconftool-2], [no])
-if test "x$GCONFTOOL" != xno; then
- AM_GCONF_SOURCE_2
-fi
-
-
dnl -----------------------
dnl | GIT command detection |----------------------------------
dnl -----------------------
diff --git a/data/Makefile.am b/data/Makefile.am
index 6ee6fcc..b1a105c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -7,28 +7,6 @@ desktop_DATA=$(desktop_in_data:.desktop.in=.desktop)
desktopdir=$(datadir)/applications
@INTLTOOL_DESKTOP_RULE@
-schemas_in_data=giggle.schemas.in
-schemas_DATA=$(schemas_in_data:.schemas.in=.schemas)
-schemasdir=$(GCONF_SCHEMA_FILE_DIR)
- INTLTOOL_SCHEMAS_RULE@
+CLEANFILES=$(desktop_DATA)
-# don't do this if we are building in eg. rpm
-if GCONF_SCHEMAS_INSTALL
-install-data-local:
- @if test -z "$(DESTDIR)"; then \
- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
- $(GCONFTOOL) --makefile-install-rule \
- $(builddir)/$(schemas_DATA); \
- fi
-
-uninstall-local:
- @if test -z "$(DESTDIR)"; then \
- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
- $(GCONFTOOL) --makefile-uninstall-rule \
- $(builddir)/$(schemas_DATA); \
- fi
-endif
-
-CLEANFILES=$(desktop_DATA) $(schemas_DATA)
-
-EXTRA_DIST=giggle.desktop.in giggle.schemas.in
+EXTRA_DIST=giggle.desktop.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0c8273b..c6946da 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,4 @@
data/giggle.desktop.in
-data/giggle.schemas.in
[type: gettext/glade]data/main-window.ui
libgiggle/giggle-plugin.c
[type: gettext/glade]plugins/hello-world.xml
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]