← Back to branch summary

~darkxst/ubuntu/saucy/gnome-shell/upstart_log

« back to all changes in this revision

Viewing changes to data/Makefile.in

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-05-31 12:01:12 UTC
  • mfrom: (1.1.49) (19.1.36 experimental)
  • Revision ID: package-import@ubuntu.com-20130531120112-ew91khxf051x9i2r
Tags: 3.8.2-1ubuntu1
https://launchpad.net/bugs/1185869
https://launchpad.net/bugs/1185721
https://launchpad.net/bugs/1064584
* Merge with Debian (LP: #1185869, #1185721). Remaining changes:
  - debian/control.in:
    + Build-depend on libsystemd-login-dev & libsystemd-daemon-dev
    + Depend on gdm instead of gdm3
    + Don't recommend gnome-session-fallback
  - debian/patches/40_change-pam-name-to-match-gdm.patch:
  - debian/patches/revert-suspend-break.patch:
    + Disabled, not needed on Ubuntu
  - debian/patches/ubuntu-lightdm-user-switching.patch:
    + Allow user switching when using LightDM. Thanks Gerhard Stein
      for rebasing against gnome-shell 3.8!
  - debian/patches/ubuntu_lock_on_suspend.patch
    + Respect Ubuntu's lock-on-suspend setting.
      Disabled until it can be rewritten.
  - debian/patches/git_relock_screen_after_crash.patch:
    + Add Upstream fix for unlocked session after crash (LP: #1064584)
* Note that the new GNOME Classic mode (which requires installing
  gnome-shell-extensions) won't work until gnome-session 3.8 is
  available in Ubuntu

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/Makefile.in
1
 
# Makefile.in generated by automake 1.12.2 from Makefile.am.
 
1
# Makefile.in generated by automake 1.13.1 from Makefile.am.
2
2
# @configure_input@
3
3
 
4
4
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
51
51
build_triplet = @build@
52
52
host_triplet = @host@
53
53
subdir = data
54
 
DIST_COMMON = $(dist_theme_DATA) $(srcdir)/Makefile.am \
55
 
        $(srcdir)/Makefile.in
 
54
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 
55
        $(dist_theme_DATA) $(dist_wanda_DATA)
56
56
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
57
57
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
58
58
        $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
116
116
         $(am__cd) "$$dir" && rm -f $$files; }; \
117
117
  }
118
118
am__installdirs = "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(desktopdir)" \
119
 
        "$(DESTDIR)$(themedir)" "$(DESTDIR)$(introspectiondir)" \
120
 
        "$(DESTDIR)$(keysdir)"
 
119
        "$(DESTDIR)$(themedir)" "$(DESTDIR)$(wandadir)" \
 
120
        "$(DESTDIR)$(introspectiondir)" "$(DESTDIR)$(keysdir)"
121
121
DATA = $(convert_DATA) $(desktop_DATA) $(dist_theme_DATA) \
122
 
        $(introspection_DATA) $(keys_DATA)
 
122
        $(dist_wanda_DATA) $(introspection_DATA) $(keys_DATA)
 
123
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
123
124
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
124
125
ACLOCAL = @ACLOCAL@
125
126
ALL_LINGUAS = @ALL_LINGUAS@
137
138
BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
138
139
CALENDAR_SERVER_CFLAGS = @CALENDAR_SERVER_CFLAGS@
139
140
CALENDAR_SERVER_LIBS = @CALENDAR_SERVER_LIBS@
 
141
CARIBOU_CFLAGS = @CARIBOU_CFLAGS@
 
142
CARIBOU_LIBS = @CARIBOU_LIBS@
140
143
CC = @CC@
141
144
CCDEPMODE = @CCDEPMODE@
142
145
CFLAGS = @CFLAGS@
159
162
FGREP = @FGREP@
160
163
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
161
164
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
162
 
GIRDIR = @GIRDIR@
163
165
GJS_CONSOLE = @GJS_CONSOLE@
164
166
GLIB_CFLAGS = @GLIB_CFLAGS@
165
167
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
184
186
GTKDOC_REBASE = @GTKDOC_REBASE@
185
187
GVC_CFLAGS = @GVC_CFLAGS@
186
188
GVC_LIBS = @GVC_LIBS@
187
 
G_IR_COMPILER = @G_IR_COMPILER@
188
 
G_IR_GENERATE = @G_IR_GENERATE@
189
 
G_IR_SCANNER = @G_IR_SCANNER@
190
189
HAVE_BLUETOOTH = @HAVE_BLUETOOTH@
191
190
HTML_DIR = @HTML_DIR@
192
191
INSTALL = @INSTALL@
267
266
STRIP = @STRIP@
268
267
ST_CFLAGS = @ST_CFLAGS@
269
268
ST_LIBS = @ST_LIBS@
270
 
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
271
 
SYSTEMD_LIBS = @SYSTEMD_LIBS@
272
269
TEST_SHELL_RECORDER_CFLAGS = @TEST_SHELL_RECORDER_CFLAGS@
273
270
TEST_SHELL_RECORDER_LIBS = @TEST_SHELL_RECORDER_LIBS@
274
271
TRAY_CFLAGS = @TRAY_CFLAGS@
275
272
TRAY_LIBS = @TRAY_LIBS@
276
 
TYPELIBDIR = @TYPELIBDIR@
277
273
USE_NLS = @USE_NLS@
278
274
VERSION = @VERSION@
 
275
WARN_CFLAGS = @WARN_CFLAGS@
279
276
XGETTEXT = @XGETTEXT@
280
277
XGETTEXT_015 = @XGETTEXT_015@
281
278
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
339
336
top_build_prefix = @top_build_prefix@
340
337
top_builddir = @top_builddir@
341
338
top_srcdir = @top_srcdir@
 
339
wandadir = $(pkgdatadir)
 
340
dist_wanda_DATA = wanda.png
342
341
desktopdir = $(datadir)/applications
343
342
desktop_DATA = gnome-shell.desktop gnome-shell-extension-prefs.desktop
344
343
introspectiondir = $(datadir)/dbus-1/interfaces
345
 
introspection_DATA = org.gnome.ShellSearchProvider.xml
 
344
introspection_DATA = \
 
345
        org.gnome.Shell.Screencast.xml          \
 
346
        org.gnome.Shell.Screenshot.xml          \
 
347
        org.gnome.ShellSearchProvider.xml       \
 
348
        org.gnome.ShellSearchProvider2.xml
 
349
 
346
350
themedir = $(pkgdatadir)/theme
347
351
dist_theme_DATA = \
348
352
        theme/calendar-arrow-left.svg           \
362
366
        theme/gnome-shell.css                   \
363
367
        theme/logged-in-indicator.svg           \
364
368
        theme/message-tray-background.png       \
 
369
        theme/more-results.svg                  \
365
370
        theme/noise-texture.png                 \
366
371
        theme/panel-button-border.svg           \
367
372
        theme/panel-button-highlight-narrow.svg \
508
513
        @list='$(dist_theme_DATA)'; test -n "$(themedir)" || list=; \
509
514
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
510
515
        dir='$(DESTDIR)$(themedir)'; $(am__uninstall_files_from_dir)
 
516
install-dist_wandaDATA: $(dist_wanda_DATA)
 
517
        @$(NORMAL_INSTALL)
 
518
        @list='$(dist_wanda_DATA)'; test -n "$(wandadir)" || list=; \
 
519
        if test -n "$$list"; then \
 
520
          echo " $(MKDIR_P) '$(DESTDIR)$(wandadir)'"; \
 
521
          $(MKDIR_P) "$(DESTDIR)$(wandadir)" || exit 1; \
 
522
        fi; \
 
523
        for p in $$list; do \
 
524
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 
525
          echo "$$d$$p"; \
 
526
        done | $(am__base_list) | \
 
527
        while read files; do \
 
528
          echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(wandadir)'"; \
 
529
          $(INSTALL_DATA) $$files "$(DESTDIR)$(wandadir)" || exit $$?; \
 
530
        done
 
531
 
 
532
uninstall-dist_wandaDATA:
 
533
        @$(NORMAL_UNINSTALL)
 
534
        @list='$(dist_wanda_DATA)'; test -n "$(wandadir)" || list=; \
 
535
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 
536
        dir='$(DESTDIR)$(wandadir)'; $(am__uninstall_files_from_dir)
511
537
install-introspectionDATA: $(introspection_DATA)
512
538
        @$(NORMAL_INSTALL)
513
539
        @list='$(introspection_DATA)'; test -n "$(introspectiondir)" || list=; \
550
576
        @list='$(keys_DATA)'; test -n "$(keysdir)" || list=; \
551
577
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
552
578
        dir='$(DESTDIR)$(keysdir)'; $(am__uninstall_files_from_dir)
553
 
tags: TAGS
554
 
TAGS:
 
579
tags TAGS:
555
580
 
556
 
ctags: CTAGS
557
 
CTAGS:
 
581
ctags CTAGS:
558
582
 
559
583
cscope cscopelist:
560
584
 
593
617
check: check-am
594
618
all-am: Makefile $(DATA) all-local
595
619
installdirs:
596
 
        for dir in "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(themedir)" "$(DESTDIR)$(introspectiondir)" "$(DESTDIR)$(keysdir)"; do \
 
620
        for dir in "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(themedir)" "$(DESTDIR)$(wandadir)" "$(DESTDIR)$(introspectiondir)" "$(DESTDIR)$(keysdir)"; do \
597
621
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
598
622
        done
599
623
install: install-am
648
672
info-am:
649
673
 
650
674
install-data-am: install-convertDATA install-desktopDATA \
651
 
        install-dist_themeDATA install-introspectionDATA \
652
 
        install-keysDATA
 
675
        install-dist_themeDATA install-dist_wandaDATA \
 
676
        install-introspectionDATA install-keysDATA
653
677
 
654
678
install-dvi: install-dvi-am
655
679
 
694
718
ps-am:
695
719
 
696
720
uninstall-am: uninstall-convertDATA uninstall-desktopDATA \
697
 
        uninstall-dist_themeDATA uninstall-introspectionDATA \
698
 
        uninstall-keysDATA
 
721
        uninstall-dist_themeDATA uninstall-dist_wandaDATA \
 
722
        uninstall-introspectionDATA uninstall-keysDATA
699
723
 
700
724
.MAKE: install-am install-strip
701
725
 
702
726
.PHONY: all all-am all-local check check-am clean clean-generic \
703
 
        clean-libtool distclean distclean-generic distclean-libtool \
704
 
        distdir dvi dvi-am html html-am info info-am install \
705
 
        install-am install-convertDATA install-data install-data-am \
706
 
        install-desktopDATA install-dist_themeDATA install-dvi \
 
727
        clean-libtool cscopelist-am ctags-am distclean \
 
728
        distclean-generic distclean-libtool distdir dvi dvi-am html \
 
729
        html-am info info-am install install-am install-convertDATA \
 
730
        install-data install-data-am install-desktopDATA \
 
731
        install-dist_themeDATA install-dist_wandaDATA install-dvi \
707
732
        install-dvi-am install-exec install-exec-am install-html \
708
733
        install-html-am install-info install-info-am \
709
734
        install-introspectionDATA install-keysDATA install-man \
711
736
        install-strip installcheck installcheck-am installdirs \
712
737
        maintainer-clean maintainer-clean-generic mostlyclean \
713
738
        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
714
 
        uninstall uninstall-am uninstall-convertDATA \
 
739
        tags-am uninstall uninstall-am uninstall-convertDATA \
715
740
        uninstall-desktopDATA uninstall-dist_themeDATA \
716
 
        uninstall-introspectionDATA uninstall-keysDATA
 
741
        uninstall-dist_wandaDATA uninstall-introspectionDATA \
 
742
        uninstall-keysDATA
717
743
 
718
744
 
719
745
# We substitute in bindir so it works as an autostart