← Back to branch summary

~darkxst/ubuntu/quantal/gnome-shell/lp1128804

« back to all changes in this revision

Viewing changes to src/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Tim Lunn
  • Date: 2012-10-09 20:42:33 UTC
  • mfrom: (57.1.7 quantal)
  • Revision ID: package-import@ubuntu.com-20121009204233-chcl8989muuzfpws
Tags: 3.6.0-0ubuntu3
https://launchpad.net/bugs/1064269
* debian/patches/ubuntu-lightdm-user-switching.patch
  - Fix user switching when running lightdm.  LP: #1064269
 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Makefile.am
131
131
        shell-wm.h                      \
132
132
        shell-xfixes-cursor.h
133
133
 
134
 
if BUILD_WITH_FOLKS
135
 
shell_public_headers_h += shell-contact-system.h
136
 
endif
137
 
 
138
134
shell_private_sources = \
139
135
        gactionmuxer.h                  \
140
136
        gactionmuxer.c                  \
187
183
        shell-xfixes-cursor.c           \
188
184
        $(NULL)
189
185
 
190
 
if BUILD_WITH_FOLKS
191
 
libgnome_shell_la_SOURCES += shell-contact-system.c
192
 
endif
193
 
 
194
186
libgnome_shell_la_gir_sources = \
195
187
        $(filter-out %-private.h $(shell_private_sources), $(shell_public_headers_h) $(libgnome_shell_la_SOURCES))
196
188
 
200
192
gnome_shell_real_LDADD = libgnome-shell.la libgnome-shell-js.la $(libgnome_shell_la_LIBADD)
201
193
gnome_shell_real_DEPENDENCIES = libgnome-shell.la
202
194
 
203
 
EXTRA_DIST += test-gapplication.js
204
 
 
205
195
########################################
206
196
 
207
197
libgnome_shell_js_la_SOURCES =          \
307
297
 
308
298
Shell-0.1.gir: libgnome-shell.la St-1.0.gir
309
299
Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0
310
 
if BUILD_WITH_FOLKS
311
 
Shell_0_1_gir_INCLUDES += Folks-0.6
312
 
endif
313
300
Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
314
301
Shell_0_1_gir_LIBS = libgnome-shell.la
315
302
Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources)