← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/Makefile-gvc.am

  • 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:
src/Makefile-gvc.am
1
 
noinst_LTLIBRARIES += libgvc.la
2
 
 
3
 
libgvc_la_CPPFLAGS =                    \
4
 
        $(WARN_CFLAGS)                  \
5
 
        $(GVC_CFLAGS)                   \
6
 
        -I$(srcdir)/gvc/                \
7
 
        -DWITH_INTROSPECTION            \
8
 
        -DG_LOG_DOMAIN="\"Gvc\""
9
 
 
10
 
libgvc_la_LIBADD =                      \
11
 
        $(GVC_LIBS)
12
 
 
13
 
libgvc_la_LDFLAGS = -avoid-version
14
 
 
15
 
libgvc_la_gir_sources = \
16
 
        gvc/gvc-mixer-stream.h          \
17
 
        gvc/gvc-mixer-stream.c          \
18
 
        gvc/gvc-channel-map.h           \
19
 
        gvc/gvc-channel-map.c           \
20
 
        gvc/gvc-mixer-card.c            \
21
 
        gvc/gvc-mixer-card.h            \
22
 
        gvc/gvc-mixer-sink.h            \
23
 
        gvc/gvc-mixer-sink.c            \
24
 
        gvc/gvc-mixer-source.h          \
25
 
        gvc/gvc-mixer-source.c          \
26
 
        gvc/gvc-mixer-sink-input.h      \
27
 
        gvc/gvc-mixer-sink-input.c      \
28
 
        gvc/gvc-mixer-source-output.h   \
29
 
        gvc/gvc-mixer-source-output.c   \
30
 
        gvc/gvc-mixer-event-role.h      \
31
 
        gvc/gvc-mixer-event-role.c      \
32
 
        gvc/gvc-mixer-control.h         \
33
 
        gvc/gvc-mixer-control.c
34
 
 
35
 
libgvc_la_private_sources =             \
36
 
        gvc/gvc-mixer-stream-private.h  \
37
 
        gvc/gvc-channel-map-private.h   \
38
 
        gvc/gvc-mixer-card-private.h    \
39
 
        gvc/gvc-mixer-control-private.h \
40
 
        gvc/gvc-pulseaudio-fake.h
41
 
 
42
 
libgvc_la_SOURCES =                     \
43
 
        $(libgvc_la_gir_sources)        \
44
 
        $(libgvc_la_private_sources)
45
 
 
46
 
Gvc-1.0.gir: libgvc.la
47
 
Gvc_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
48
 
Gvc_1_0_gir_CFLAGS = $(INCLUDES) -I$(srcdir)/gvc -DWITH_INTROSPECTION
49
 
Gvc_1_0_gir_LIBS = libgvc.la
50
 
Gvc_1_0_gir_FILES = $(addprefix $(srcdir)/,$(libgvc_la_gir_sources))
51
 
INTROSPECTION_GIRS += Gvc-1.0.gir
52
 
CLEANFILES += Gvc-1.0.gir