[yelp/yelp-3-0] remove stale gconf bits
- From: Saleem Abdulrasool <asaleem src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [yelp/yelp-3-0] remove stale gconf bits
- Date: Tue, 23 Feb 2010 03:05:43 +0000 (UTC)
commit 952c6d28ee612abb884e6690b28eb9f1cb1f9ac4
Author: Saleem Abdulrasool <compnerd compnerd org>
Date: Mon Feb 22 18:33:53 2010 -0800
remove stale gconf bits
There is no consumer of gconf, remove the gconf schema as well as the
checks in autotools.
configure.in | 4 ---
data/Makefile.am | 14 +-----------
data/yelp.schemas.in | 57 --------------------------------------------------
3 files changed, 1 insertions(+), 74 deletions(-)
---
diff --git a/configure.in b/configure.in
index 42764e9..767738f 100644
--- a/configure.in
+++ b/configure.in
@@ -25,9 +25,6 @@ IT_PROG_INTLTOOL([0.35.0])
GTK_DOC_CHECK(1.9)
-AC_PATH_PROG(GCONFTOOL, gconftool-2)
-AM_GCONF_SOURCE_2
-
GNOME_DEBUG_CHECK
GNOME_COMPILE_WARNINGS([maximum])
@@ -57,7 +54,6 @@ AM_GLIB_DEFINE_LOCALEDIR([GNOMELOCALEDIR])
PKG_CHECK_MODULES(YELP,
[
gio-2.0
- gconf-2.0
gio-2.0
gio-unix-2.0
gnome-doc-utils >= 0.17.2
diff --git a/data/Makefile.am b/data/Makefile.am
index 9925faa..0728af1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,9 +3,6 @@ SUBDIRS = icons ui
@INTLTOOL_XML_RULE@
@INTLTOOL_SCHEMAS_RULE@
-schemasdir = $(GCONF_SCHEMA_FILE_DIR)
-schemas_DATA = yelp.schemas
-
tocdir = $(datadir)/yelp
toc_DATA = man.xml toc.xml scrollkeeper.xml info.xml
@@ -16,20 +13,11 @@ jsdir = $(datadir)/yelp
js_DATA = yelp.js
EXTRA_DIST = \
- yelp.schemas yelp.schemas.in \
man.xml man.xml.in \
toc.xml toc.xml.in \
info.xml info.xml.in \
scrollkeeper.xml default.css \
yelp.js
-install-data-local: $(schemas_DATA)
-if GCONF_SCHEMAS_INSTALL
- if test -z "$(DESTDIR)"; then \
- for p in $^ ; do \
- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p >&1 > /dev/null; \
- done \
- fi
-endif
+CLEANFILES = toc.xml man.xml info.xml
-CLEANFILES = $(schemas_DATA) toc.xml man.xml info.xml
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]