X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=data%2FMakefile.am;h=f4295df5a0daeec5204e287fd532dca71ef9c825;hb=2dd348d6fe62d96589c81379bbd01314d6442dc0;hp=22ecc66732c6d2a6993f90ceed9c5673a2d8c10a;hpb=5b96694056a9bfbbeca84a44dfbe9eb82d684e10;p=evince.git

diff --git a/data/Makefile.am b/data/Makefile.am
index 22ecc667..f4295df5 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,8 +1,7 @@
 SUBDIRS = icons
 NULL=
 
-install-data-local: install-schemas update-icon-cache
-uninstall-local: uninstall-schemas
+install-data-local: update-icon-cache
 
 #
 # man file
@@ -36,48 +35,34 @@ DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in.in=.desktop)
 desktopdir = $(datadir)/applications
 desktop_DATA = $(DESKTOP_FILES)
 
-
 #
-# GConf schema
+# DBus servide file
 #
+if ENABLE_DBUS
+servicedir = $(datadir)/dbus-1/services
+service_in_files = org.gnome.evince.Daemon.service.in
+service_DATA = $(service_in_files:.service.in=.service)
 
-if WITH_GCONF
-@INTLTOOL_SCHEMAS_RULE@
-
-schema_in_files = evince.schemas.in
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-
-install-schemas: $(schema_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 \
-			$(top_builddir)/data/$$p; \
-	done \
-	fi
+$(service_DATA): $(service_in_files) Makefile
+	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 endif
 
-uninstall-schemas: $(schema_DATA)
-if GCONF_SCHEMAS_INSTALL
-	if test -z "$(DESTDIR)" ; then \
-	for p in $^ ; do \
-		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
-			$(GCONFTOOL) \
-			--makefile-uninstall-rule \
-			$(top_builddir)/data/$$p; \
-	done \
-	fi
-endif
+#
+# GSettings schema
+#
+gsettingsschema_in_files = org.gnome.Evince.gschema.xml.in
+# gsettings_SCHEMAS is a list of all the schemas you want to install
+gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
 
-else
+.PRECIOUS: $(gsettings_SCHEMAS)
 
-install-schemas:
-uninstall-schemas:
+@INTLTOOL_XML_NOMERGE_RULE@
 
-endif
+# include the appropriate makefile rules for schema handling
+@GSETTINGS_RULES@
+
+gsettingsconvertdir = $(datadir)/GConf/gsettings
+gsettingsconvert_DATA = evince.convert
 
 #
 # GTK icon cache
@@ -102,12 +87,15 @@ update-icon-cache:
 # Extra files to be included in the tarball
 #
 
-EXTRA_DIST =				\
-	$(ui_DATA)			\
-	$(DESKTOP_IN_FILES)		\
-	$(schema_in_files)		\
-	$(man_MANS)			\
-	$(NULL)				
+EXTRA_DIST =					\
+	$(ui_DATA)				\
+	$(DESKTOP_IN_FILES)			\
+	$(gsettingsschema_in_files)		\
+	org.gnome.evince.Daemon.service.in	\
+	$(man_MANS)				\
+	evince.ico				\
+	evince.convert				\
+	$(NULL)
 
 #
 # Clean up properly
@@ -115,6 +103,7 @@ EXTRA_DIST =				\
 
 DISTCLEANFILES = \
 	$(DESKTOP_FILES)	\
-	$(schema_DATA)
-
+	$(gsettings_SCHEMAS)	\
+	$(service_DATA)
 
+-include $(top_srcdir)/git.mk