[nautilus] Remove gconf schemas



commit 8497f4011e7c42010b9db669b31a09cae7f57844
Author: Alexander Larsson <alexl redhat com>
Date:   Fri Jul 23 12:29:34 2010 +0200

    Remove gconf schemas

 configure.in                                       |   12 -
 libnautilus-private/Makefile.am                    |   21 +-
 .../apps_nautilus_preferences.schemas.in           | 1205 --------------------
 3 files changed, 1 insertions(+), 1237 deletions(-)
---
diff --git a/configure.in b/configure.in
index 656faa4..3c7fc08 100644
--- a/configure.in
+++ b/configure.in
@@ -348,18 +348,6 @@ AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
 dnl Multimedia keys
 AC_CHECK_HEADERS([X11/XF86keysym.h])
 
-dnl ==============================================
-dnl Special GConf section 
-dnl ==============================================
-
-AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
-
-if test x"$GCONFTOOL" = xno; then
-  AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
-fi
-
-AM_GCONF_SOURCE_2
-
 ##################################################
 # Check for introspection
 ##################################################
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index 91ea9bf..d1d8e31 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -219,36 +219,17 @@ gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
 
 @GSETTINGS_RULES@
 
-schema_in_files =  apps_nautilus_preferences.schemas.in
-schemadir   = $(GCONF_SCHEMA_FILE_DIR)
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-
- INTLTOOL_SCHEMAS_RULE@
-
-# don't do this if we are building in eg. rpm
-if GCONF_SCHEMAS_INSTALL
-install-data-local:
-	if test -z "$(DESTDIR)" ; then \
-		for p in $(schema_DATA) ; do \
-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \
-		done \
-	fi
-endif
-
-EXTRA_DIST = 				\
+EXTRA_DIST =				\
 	nautilus-marshal.list		\
 	$(gsettingsschema_in_files)     \
-	$(schema_in_files)              \
 	$(BEAGLE_SOURCES)		\
 	$(TRACKER_SOURCES)		\
 	$(NULL)
 
 CLEANFILES = \
 	$(marshal_sources)				\
-	$(schema_DATA)			                \
 	$(gsettings_SCHEMAS)				\
 	$(NULL)
 
 dist-hook:
 	cd $(distdir); rm -f $(CLEANFILES)
-



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]