diff options
Diffstat (limited to 'data/Makefile.in')
| -rw-r--r-- | data/Makefile.in | 126 |
1 files changed, 77 insertions, 49 deletions
diff --git a/data/Makefile.in b/data/Makefile.in index fa8909e..388d645 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -35,7 +35,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(dist_convert_DATA) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -81,8 +82,9 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(dbus_servicesdir)" \ - "$(DESTDIR)$(schemadir)" -DATA = $(dbus_services_DATA) $(schema_DATA) + "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(logout_helperdir)" +DATA = $(dbus_services_DATA) $(dist_convert_DATA) \ + $(logout_helper_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -149,16 +151,13 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GCONFTOOL = @GCONFTOOL@ -GCONF_CFLAGS = @GCONF_CFLAGS@ -GCONF_LIBS = @GCONF_LIBS@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNOMELOCALEDIR = @GNOMELOCALEDIR@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTKLOGOUTHELPER_CFLAGS = @GTKLOGOUTHELPER_CFLAGS@ GTKLOGOUTHELPER_LIBS = @GTKLOGOUTHELPER_LIBS@ INDICATORDIR = @INDICATORDIR@ @@ -247,6 +246,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -282,29 +282,29 @@ SUBDIRS = \ dbus_servicesdir = $(DBUSSERVICEDIR) service_in_files = indicator-session.service.in dbus_services_DATA = $(service_in_files:.service.in=.service) - -############################## -# GConf Schema -############################## -schemadir = \ - $(GCONF_SCHEMA_FILE_DIR) - -schema_in_files = \ - indicator-session.schemas.in - -schema_DATA = \ - $(schema_in_files:.schemas.in=.schemas) - - -#$(dbus_services_DATA): $(service_in_files) Makefile -# sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ +gsettings_SCHEMAS = com.canonical.indicator.session.gschema.xml +convertdir = $(datadir)/GConf/gsettings +dist_convert_DATA = indicator-session.convert +logout_helper_desktop_in_in_files = \ + indicator-session-lock-screen.desktop.in.in \ + indicator-session-logout.desktop.in.in \ + indicator-session-restart.desktop.in.in \ + indicator-session-shutdown.desktop.in.in + +logout_helperdir = $(datadir)/applications +logout_helper_desktop_files = \ + $(logout_helper_desktop_in_in_files:.desktop.in.in=.desktop) + +logout_helper_DATA = $(logout_helper_desktop_files) EXTRA_DIST = \ $(service_in_files) \ - $(schema_in_files) + $(gsettings_SCHEMAS:.xml=.xml.in) \ + $(logout_helper_desktop_in_in_files) CLEANFILES = \ $(dbus_services_DATA) \ - $(schema_DATA) + $(gsettings_SCHEMAS) \ + $(logout_helper_desktop_files) all: all-recursive @@ -365,26 +365,46 @@ uninstall-dbus_servicesDATA: test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(dbus_servicesdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(dbus_servicesdir)" && rm -f $$files -install-schemaDATA: $(schema_DATA) +install-dist_convertDATA: $(dist_convert_DATA) + @$(NORMAL_INSTALL) + test -z "$(convertdir)" || $(MKDIR_P) "$(DESTDIR)$(convertdir)" + @list='$(dist_convert_DATA)'; test -n "$(convertdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(convertdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(convertdir)" || exit $$?; \ + done + +uninstall-dist_convertDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_convert_DATA)'; test -n "$(convertdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(convertdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(convertdir)" && rm -f $$files +install-logout_helperDATA: $(logout_helper_DATA) @$(NORMAL_INSTALL) - test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ + test -z "$(logout_helperdir)" || $(MKDIR_P) "$(DESTDIR)$(logout_helperdir)" + @list='$(logout_helper_DATA)'; test -n "$(logout_helperdir)" || list=; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ done | $(am__base_list) | \ while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(logout_helperdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(logout_helperdir)" || exit $$?; \ done -uninstall-schemaDATA: +uninstall-logout_helperDATA: @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ + @list='$(logout_helper_DATA)'; test -n "$(logout_helperdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(schemadir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(schemadir)" && rm -f $$files + echo " ( cd '$(DESTDIR)$(logout_helperdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(logout_helperdir)" && rm -f $$files # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -584,7 +604,7 @@ check: check-recursive all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(dbus_servicesdir)" "$(DESTDIR)$(schemadir)"; do \ + for dir in "$(DESTDIR)$(dbus_servicesdir)" "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(logout_helperdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -633,8 +653,8 @@ info: info-recursive info-am: -install-data-am: install-data-local install-dbus_servicesDATA \ - install-schemaDATA +install-data-am: install-dbus_servicesDATA install-dist_convertDATA \ + install-logout_helperDATA install-dvi: install-dvi-recursive @@ -678,7 +698,8 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-dbus_servicesDATA uninstall-schemaDATA +uninstall-am: uninstall-dbus_servicesDATA uninstall-dist_convertDATA \ + uninstall-logout_helperDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -688,27 +709,34 @@ uninstall-am: uninstall-dbus_servicesDATA uninstall-schemaDATA ctags ctags-recursive distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-data-local install-dbus_servicesDATA \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ + install-data-am install-dbus_servicesDATA \ + install-dist_convertDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-logout_helperDATA \ install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-schemaDATA install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ uninstall uninstall-am uninstall-dbus_servicesDATA \ - uninstall-schemaDATA + uninstall-dist_convertDATA uninstall-logout_helperDATA %.service: %.service.in sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ @INTLTOOL_SCHEMAS_RULE@ +@INTLTOOL_XML_NOMERGE_RULE@ + +@GSETTINGS_RULES@ + +@INTLTOOL_DESKTOP_RULE@ -@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: -@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ -@GCONF_SCHEMAS_INSTALL_TRUE@ gconftool-2 --makefile-install-rule $(schema_DATA) -@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: +%.desktop.in: %.desktop.in.in + sed \ + -e "s|\@libexecdir\@|$(libexecdir)|" \ + -e "s|\@bindir\@|$(bindir)|" \ + $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. |