← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/indicator-session/oneiric-proposed

« back to all changes in this revision

Viewing changes to data/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Ken VanDine
  • Date: 2011-08-25 08:58:56 UTC
  • mfrom: (1.1.34 upstream)
  • Revision ID: james.westby@ubuntu.com-20110825085856-qtuta6vqal1iw7mt
Tags: 0.3.3-0ubuntu1
https://launchpad.net/bugs/831758
https://launchpad.net/bugs/825111
https://launchpad.net/bugs/552048
https://launchpad.net/bugs/557608
https://launchpad.net/bugs/656323
* New upstream release.
  - User menu should still show even if there is only 1 user (LP: #831758)
  - Bluetooth item in menu not needed (LP: #825111)
  - Newly created users are not added to the menu until next 
    login (LP: #552048)
  - Users list in shutdown menu is not updated on user 
    deletion (LP: #557608)
  - should use gsettings rather than gconf (LP: #656323)
* debian/control
  - Bump dbusmenu build dep to >= 0.4.92

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/Makefile.in
35
35
build_triplet = @build@
36
36
host_triplet = @host@
37
37
subdir = data
38
 
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 
38
DIST_COMMON = $(dist_convert_DATA) $(srcdir)/Makefile.am \
 
39
        $(srcdir)/Makefile.in
39
40
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
40
 
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 
41
am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
 
42
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 
43
        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 
44
        $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
41
45
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
42
46
        $(ACLOCAL_M4)
43
47
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
81
85
  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
82
86
  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
83
87
am__installdirs = "$(DESTDIR)$(dbus_servicesdir)" \
84
 
        "$(DESTDIR)$(schemadir)"
85
 
DATA = $(dbus_services_DATA) $(schema_DATA)
 
88
        "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(logout_helperdir)"
 
89
DATA = $(dbus_services_DATA) $(dist_convert_DATA) \
 
90
        $(logout_helper_DATA)
86
91
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
87
92
  distclean-recursive maintainer-clean-recursive
88
93
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
149
154
EGREP = @EGREP@
150
155
EXEEXT = @EXEEXT@
151
156
FGREP = @FGREP@
152
 
GCONFTOOL = @GCONFTOOL@
153
 
GCONF_CFLAGS = @GCONF_CFLAGS@
154
 
GCONF_LIBS = @GCONF_LIBS@
155
 
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
156
 
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
157
157
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 
158
GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
158
159
GMOFILES = @GMOFILES@
159
160
GMSGFMT = @GMSGFMT@
160
161
GNOMELOCALEDIR = @GNOMELOCALEDIR@
161
162
GREP = @GREP@
 
163
GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
162
164
GTKLOGOUTHELPER_CFLAGS = @GTKLOGOUTHELPER_CFLAGS@
163
165
GTKLOGOUTHELPER_LIBS = @GTKLOGOUTHELPER_LIBS@
164
166
INDICATORDIR = @INDICATORDIR@
247
249
docdir = @docdir@
248
250
dvidir = @dvidir@
249
251
exec_prefix = @exec_prefix@
 
252
gsettingsschemadir = @gsettingsschemadir@
250
253
host = @host@
251
254
host_alias = @host_alias@
252
255
host_cpu = @host_cpu@
282
285
dbus_servicesdir = $(DBUSSERVICEDIR)
283
286
service_in_files = indicator-session.service.in
284
287
dbus_services_DATA = $(service_in_files:.service.in=.service)
285
 
 
286
 
##############################
287
 
# GConf Schema
288
 
##############################
289
 
schemadir = \
290
 
        $(GCONF_SCHEMA_FILE_DIR)
291
 
 
292
 
schema_in_files = \
293
 
        indicator-session.schemas.in
294
 
 
295
 
schema_DATA = \
296
 
        $(schema_in_files:.schemas.in=.schemas)
297
 
 
298
 
 
299
 
#$(dbus_services_DATA): $(service_in_files) Makefile
300
 
#       sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
288
gsettings_SCHEMAS = com.canonical.indicator.session.gschema.xml
 
289
convertdir = $(datadir)/GConf/gsettings
 
290
dist_convert_DATA = indicator-session.convert
 
291
logout_helper_desktop_in_in_files = \
 
292
        indicator-session-lock-screen.desktop.in.in \
 
293
        indicator-session-logout.desktop.in.in \
 
294
        indicator-session-restart.desktop.in.in \
 
295
        indicator-session-shutdown.desktop.in.in
 
296
 
 
297
logout_helperdir = $(datadir)/applications
 
298
logout_helper_desktop_files = \
 
299
        $(logout_helper_desktop_in_in_files:.desktop.in.in=.desktop)
 
300
 
 
301
logout_helper_DATA = $(logout_helper_desktop_files)
301
302
EXTRA_DIST = \
302
303
        $(service_in_files)                     \
303
 
        $(schema_in_files)
 
304
        $(gsettings_SCHEMAS:.xml=.xml.in) \
 
305
        $(logout_helper_desktop_in_in_files)
304
306
 
305
307
CLEANFILES = \
306
308
        $(dbus_services_DATA)                   \
307
 
        $(schema_DATA)
 
309
        $(gsettings_SCHEMAS) \
 
310
        $(logout_helper_desktop_files)
308
311
 
309
312
all: all-recursive
310
313
 
365
368
        test -n "$$files" || exit 0; \
366
369
        echo " ( cd '$(DESTDIR)$(dbus_servicesdir)' && rm -f" $$files ")"; \
367
370
        cd "$(DESTDIR)$(dbus_servicesdir)" && rm -f $$files
368
 
install-schemaDATA: $(schema_DATA)
369
 
        @$(NORMAL_INSTALL)
370
 
        test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)"
371
 
        @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \
372
 
        for p in $$list; do \
373
 
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
374
 
          echo "$$d$$p"; \
375
 
        done | $(am__base_list) | \
376
 
        while read files; do \
377
 
          echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \
378
 
          $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \
379
 
        done
380
 
 
381
 
uninstall-schemaDATA:
382
 
        @$(NORMAL_UNINSTALL)
383
 
        @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \
384
 
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
385
 
        test -n "$$files" || exit 0; \
386
 
        echo " ( cd '$(DESTDIR)$(schemadir)' && rm -f" $$files ")"; \
387
 
        cd "$(DESTDIR)$(schemadir)" && rm -f $$files
 
371
install-dist_convertDATA: $(dist_convert_DATA)
 
372
        @$(NORMAL_INSTALL)
 
373
        test -z "$(convertdir)" || $(MKDIR_P) "$(DESTDIR)$(convertdir)"
 
374
        @list='$(dist_convert_DATA)'; test -n "$(convertdir)" || list=; \
 
375
        for p in $$list; do \
 
376
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 
377
          echo "$$d$$p"; \
 
378
        done | $(am__base_list) | \
 
379
        while read files; do \
 
380
          echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(convertdir)'"; \
 
381
          $(INSTALL_DATA) $$files "$(DESTDIR)$(convertdir)" || exit $$?; \
 
382
        done
 
383
 
 
384
uninstall-dist_convertDATA:
 
385
        @$(NORMAL_UNINSTALL)
 
386
        @list='$(dist_convert_DATA)'; test -n "$(convertdir)" || list=; \
 
387
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 
388
        test -n "$$files" || exit 0; \
 
389
        echo " ( cd '$(DESTDIR)$(convertdir)' && rm -f" $$files ")"; \
 
390
        cd "$(DESTDIR)$(convertdir)" && rm -f $$files
 
391
install-logout_helperDATA: $(logout_helper_DATA)
 
392
        @$(NORMAL_INSTALL)
 
393
        test -z "$(logout_helperdir)" || $(MKDIR_P) "$(DESTDIR)$(logout_helperdir)"
 
394
        @list='$(logout_helper_DATA)'; test -n "$(logout_helperdir)" || list=; \
 
395
        for p in $$list; do \
 
396
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 
397
          echo "$$d$$p"; \
 
398
        done | $(am__base_list) | \
 
399
        while read files; do \
 
400
          echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(logout_helperdir)'"; \
 
401
          $(INSTALL_DATA) $$files "$(DESTDIR)$(logout_helperdir)" || exit $$?; \
 
402
        done
 
403
 
 
404
uninstall-logout_helperDATA:
 
405
        @$(NORMAL_UNINSTALL)
 
406
        @list='$(logout_helper_DATA)'; test -n "$(logout_helperdir)" || list=; \
 
407
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 
408
        test -n "$$files" || exit 0; \
 
409
        echo " ( cd '$(DESTDIR)$(logout_helperdir)' && rm -f" $$files ")"; \
 
410
        cd "$(DESTDIR)$(logout_helperdir)" && rm -f $$files
388
411
 
389
412
# This directory's subdirectories are mostly independent; you can cd
390
413
# into them and run `make' without going through this Makefile.
584
607
all-am: Makefile $(DATA)
585
608
installdirs: installdirs-recursive
586
609
installdirs-am:
587
 
        for dir in "$(DESTDIR)$(dbus_servicesdir)" "$(DESTDIR)$(schemadir)"; do \
 
610
        for dir in "$(DESTDIR)$(dbus_servicesdir)" "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(logout_helperdir)"; do \
588
611
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
589
612
        done
590
613
install: install-recursive
633
656
 
634
657
info-am:
635
658
 
636
 
install-data-am: install-data-local install-dbus_servicesDATA \
637
 
        install-schemaDATA
 
659
install-data-am: install-dbus_servicesDATA install-dist_convertDATA \
 
660
        install-logout_helperDATA
638
661
 
639
662
install-dvi: install-dvi-recursive
640
663
 
678
701
 
679
702
ps-am:
680
703
 
681
 
uninstall-am: uninstall-dbus_servicesDATA uninstall-schemaDATA
 
704
uninstall-am: uninstall-dbus_servicesDATA uninstall-dist_convertDATA \
 
705
        uninstall-logout_helperDATA
682
706
 
683
707
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
684
708
        install-am install-strip tags-recursive
688
712
        ctags ctags-recursive distclean distclean-generic \
689
713
        distclean-libtool distclean-tags distdir dvi dvi-am html \
690
714
        html-am info info-am install install-am install-data \
691
 
        install-data-am install-data-local install-dbus_servicesDATA \
692
 
        install-dvi install-dvi-am install-exec install-exec-am \
693
 
        install-html install-html-am install-info install-info-am \
 
715
        install-data-am install-dbus_servicesDATA \
 
716
        install-dist_convertDATA install-dvi install-dvi-am \
 
717
        install-exec install-exec-am install-html install-html-am \
 
718
        install-info install-info-am install-logout_helperDATA \
694
719
        install-man install-pdf install-pdf-am install-ps \
695
 
        install-ps-am install-schemaDATA install-strip installcheck \
696
 
        installcheck-am installdirs installdirs-am maintainer-clean \
 
720
        install-ps-am install-strip installcheck installcheck-am \
 
721
        installdirs installdirs-am maintainer-clean \
697
722
        maintainer-clean-generic mostlyclean mostlyclean-generic \
698
723
        mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
699
724
        uninstall uninstall-am uninstall-dbus_servicesDATA \
700
 
        uninstall-schemaDATA
 
725
        uninstall-dist_convertDATA uninstall-logout_helperDATA
701
726
 
702
727
 
703
728
%.service: %.service.in
704
729
        sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
705
730
 
706
731
@INTLTOOL_SCHEMAS_RULE@
707
 
 
708
 
@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local:
709
 
@GCONF_SCHEMAS_INSTALL_TRUE@    GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
710
 
@GCONF_SCHEMAS_INSTALL_TRUE@            gconftool-2 --makefile-install-rule $(schema_DATA)
711
 
@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local:
 
732
@INTLTOOL_XML_NOMERGE_RULE@
 
733
 
 
734
@GSETTINGS_RULES@
 
735
 
 
736
@INTLTOOL_DESKTOP_RULE@
 
737
 
 
738
%.desktop.in: %.desktop.in.in
 
739
        sed \
 
740
                -e "s|\@libexecdir\@|$(libexecdir)|" \
 
741
                -e "s|\@bindir\@|$(bindir)|" \
 
742
                $< > $@
712
743
 
713
744
# Tell versions [3.59,3.63) of GNU make to not export all variables.
714
745
# Otherwise a system limit (for SysV at least) may be exceeded.