← Back to branch summary

~jbicha/ubuntu/oneiric/gnome-shell/oneiric-3.2.2.1

« back to all changes in this revision

Viewing changes to src/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Michael Terry
  • Date: 2011-07-20 14:46:28 UTC
  • mfrom: (1.1.25 upstream)
  • Revision ID: james.westby@ubuntu.com-20110720144628-ipirjtz8od4uktpg
Tags: 3.1.3-0ubuntu1
* New upstream release
* debian/control.in:
  - Update dependency versions

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Makefile.am
100
100
        shell-perf-log.h                \
101
101
        shell-slicer.h                  \
102
102
        shell-stack.h                   \
 
103
        shell-tp-client.h                       \
103
104
        shell-tray-icon.h               \
104
105
        shell-tray-manager.h            \
105
106
        shell-util.h                    \
134
135
        shell-polkit-authentication-agent.c     \
135
136
        shell-slicer.c                  \
136
137
        shell-stack.c                   \
 
138
        shell-tp-client.c                       \
137
139
        shell-tray-icon.c               \
138
140
        shell-tray-manager.c            \
139
141
        shell-util.c                    \
184
186
 
185
187
########################################
186
188
 
187
 
# In order to run the interactive tests for GUI components, we need to have
188
 
# an executable that exports the St components. Libtool doesn't have a way
189
 
# to include all the symbols from a convenience library into a executable
190
 
# so what we do is build a small uninstalled library that pulls in the
191
 
# St convenience library and link the test running program to that.
192
 
 
193
 
noinst_LTLIBRARIES += libjs-test.la
194
 
 
195
 
libjs_test_la_LDFLAGS = -rpath $(libdir)
196
 
libjs_test_la_CPPFLAGS = $(JS_TEST_CFLAGS)
197
 
libjs_test_la_LIBADD = $(JS_TEST_LIBS) libst-1.0.la
198
 
 
199
 
# The tests use or reference a couple of Shell classes
200
 
libjs_test_la_SOURCES =                 \
201
 
        shell-generic-container.c       \
202
 
        shell-perf-log.c
203
 
 
204
189
noinst_PROGRAMS += run-js-test
205
190
 
206
 
run_js_test_CPPFLAGS = $(JS_TEST_CFLAGS)
207
 
run_js_test_LDADD = $(JS_TEST_LIBS) libjs-test.la
 
191
run_js_test_CPPFLAGS = $(gnome_shell_cflags)
 
192
run_js_test_LDADD = libgnome-shell.la $(libgnome_shell_la_LIBADD)
208
193
run_js_test_LDFLAGS = -export-dynamic
209
194
 
210
195
run_js_test_SOURCES =                   \
237
222
shell-enum-types.h: stamp-shell-enum-types.h Makefile
238
223
        @true
239
224
stamp-shell-enum-types.h: $(srcdir)/shell-enum-types.h.in $(shell_public_headers_h)
240
 
        $(AM_V_GEN) ( cd $(srcdir) && \
 
225
        $(AM_V_GEN) ( \
241
226
          $(GLIB_MKENUMS) \
242
227
            --template $< \
243
 
          $(shell_public_headers_h) ) > $(@F).tmp && \
 
228
          $(addprefix $(srcdir)/,$(shell_public_headers_h)) ) > $(@F).tmp && \
244
229
        (cmp -s $(@F).tmp shell-enum-types.h || mv $(@F).tmp shell-enum-types.h) && \
245
230
        rm -f $(@F).tmp && \
246
231
        echo timestamp > $(@F)
247
232
EXTRA_DIST += shell-enum-types.h.in
248
233
CLEANFILES += stamp-shell-enum-types.h
249
234
 
250
 
shell-enum-types.c: shell-enum-types.c.in stamp-shell-enum-types.h
251
 
        $(AM_V_GEN) ( cd $(srcdir) && \
 
235
shell-enum-types.c: $(srcdir)/shell-enum-types.c.in stamp-shell-enum-types.h
 
236
        $(AM_V_GEN) ( \
252
237
          $(GLIB_MKENUMS) \
253
238
            --template $< \
254
 
          $(shell_public_headers_h) ) > $(@F).tmp && \
 
239
          $(addprefix $(srcdir)/,$(shell_public_headers_h)) ) > $(@F).tmp && \
255
240
        mv $(@F).tmp $(@F) && \
256
241
        rm -f $(@F).tmp
257
242
EXTRA_DIST += shell-enum-types.c.in
273
258
Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2
274
259
Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
275
260
Shell_0_1_gir_LIBS = libgnome-shell.la
276
 
Shell_0_1_gir_FILES = $(addprefix $(srcdir)/,$(libgnome_shell_la_gir_sources))
 
261
Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources)
277
262
Shell_0_1_gir_SCANNERFLAGS = --include-uninstalled=$(builddir)/St-1.0.gir \
278
263
        --add-include-path=$(MUTTER_GIR_DIR)
279
264
INTROSPECTION_GIRS += Shell-0.1.gir