← Back to branch summary

~tkluck/ubuntu/precise/gnome-shell/lp883443

« back to all changes in this revision

Viewing changes to .pc/02_rpath-bluetooth-applet.patch/src/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Raphaël Hertzog, Frederic Peters, Raphaël Hertzog, Laurent Bigonville
  • Date: 2011-04-11 21:03:31 UTC
  • mfrom: (1.1.22 upstream)
  • mto: (18.1.1 sid)
  • mto: This revision was merged to the branch mainline in revision 25.
  • Revision ID: james.westby@ubuntu.com-20110411210331-345p7j40vf0wp6t1
Tags: 3.0.0.2-1
* Team upload.

[ Frederic Peters ]
* New upstream release (2.91.93).
* debian/control.in:
  + added dependency on gnome-icon-theme-symbolic.
  + bumped gnome-shell dependency.
  + bumped gir1.2-freedesktop build-dep to 0.10.6, for a fix to
    cairo-1.0.typelib

[ Raphaël Hertzog ]
* New upstream release (3.0.0.2).
* New patch 02_rpath-bluetooth-applet.patch by Rico Tzschichholz to
  add an RPATH so that the compilation doesn't fail when g-ir-scanner
  tries to analyze libgnome-shell.so linked against
  libgnome-bluetooth-applet.so.0 which is in a private directory.
* Add a lintian override for the RPATH that we can't avoid.
* Teach dpkg-shlibdeps how to find that private lib and add the
  corresponding dependency in debian/slibs.local.
* Update and add a bunch of build-depends to match the latest configure
  requirements.
* Add gir1.2-gnomebluetooth-1.0 and gir1.2-networkmanager-1.0 to Depends
  because they are needed to benefit from the improved UI associated to the
  respective status bar applet.

[ Laurent Bigonville ]
* debian/control.in: {Build-}Depends against gir1.2-mutter-3.0 instead of
  gir1.2-mutter-2.91

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/02_rpath-bluetooth-applet.patch/src/Makefile.am
 
1
NULL = 
 
2
BUILT_SOURCES =
 
3
CLEANFILES =
 
4
EXTRA_DIST =
 
5
bin_SCRIPTS =
 
6
libexec_PROGRAMS =
 
7
noinst_LTLIBRARIES =
 
8
noinst_PROGRAMS =
 
9
 
 
10
-include $(INTROSPECTION_MAKEFILE)
 
11
INTROSPECTION_GIRS =
 
12
INTROSPECTION_SCANNER_ARGS = --warn-all --warn-error --add-include-path=$(srcdir)
 
13
INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=$(MUTTER_TYPELIB_DIR)
 
14
 
 
15
typelibdir = $(pkglibdir)
 
16
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
17
 
 
18
CLEANFILES += $(gir_DATA) $(typelib_DATA)
 
19
 
 
20
bin_SCRIPTS += gnome-shell-extension-tool
 
21
bin_PROGRAMS = gnome-shell-real
 
22
 
 
23
if USE_JHBUILD_WRAPPER_SCRIPT
 
24
gnome_shell = gnome-shell-jhbuild
 
25
bin_SCRIPTS += gnome-shell-jhbuild
 
26
else
 
27
gnome_shell = gnome-shell-real
 
28
endif
 
29
 
 
30
noinst_DATA = gnome-shell
 
31
gnome-shell: $(gnome_shell) Makefile
 
32
        cp $< $@.tmp && mv $@.tmp $@
 
33
install-exec-hook:
 
34
        mv $(DESTDIR)$(bindir)/$(gnome_shell) $(DESTDIR)$(bindir)/gnome-shell
 
35
 
 
36
generated_script_substitutions = \
 
37
            -e "s|@bindir[@]|$(bindir)|" \
 
38
            -e "s|@datadir[@]|$(datadir)|" \
 
39
            -e "s|@libexecdir[@]|$(libexecdir)|" \
 
40
            -e "s|@libdir[@]|$(libdir)|" \
 
41
            -e "s|@JHBUILD_TYPELIBDIR[@]|$(JHBUILD_TYPELIBDIR)|" \
 
42
            -e "s|@pkgdatadir[@]|$(pkgdatadir)|" \
 
43
            -e "s|@PYTHON[@]|$(PYTHON)|" \
 
44
            -e "s|@VERSION[@]|$(VERSION)|" \
 
45
            -e "s|@sysconfdir[@]|$(sysconfdir)|"
 
46
 
 
47
gnome-shell-jhbuild: gnome-shell-jhbuild.in gnome-shell-real Makefile
 
48
        $(AM_V_GEN) sed $(generated_script_substitutions) $< > $@.tmp && mv $@.tmp $@ && chmod a+x $@
 
49
        @# Regenerate libtool wrapper so Alt+F2 restart will work
 
50
        @$(LIBTOOL) --mode=execute test -f gnome-shell-real
 
51
 
 
52
gnome-shell-extension-tool: gnome-shell-extension-tool.in Makefile
 
53
        $(AM_V_GEN) sed $(generated_script_substitutions) $< > $@.tmp && mv $@.tmp $@ && chmod a+x $@
 
54
 
 
55
CLEANFILES += gnome-shell $(bin_SCRIPTS)
 
56
EXTRA_DIST += $(bin_SCRIPTS:=.in)
 
57
 
 
58
include Makefile-gdmuser.am
 
59
include Makefile-st.am
 
60
include Makefile-tray.am
 
61
include Makefile-gvc.am
 
62
include Makefile-calendar-server.am
 
63
 
 
64
gnome_shell_cflags =                            \
 
65
        $(GNOME_SHELL_CFLAGS)                   \
 
66
        -I$(srcdir)/tray                        \
 
67
        -DVERSION=\"$(VERSION)\"                \
 
68
        -DLOCALEDIR=\"$(datadir)/locale\"       \
 
69
        -DDATADIR=\"$(datadir)\"                \
 
70
        -DGNOME_SHELL_LIBEXECDIR=\"$(libexecdir)\"      \
 
71
        -DGNOME_SHELL_DATADIR=\"$(pkgdatadir)\" \
 
72
        -DGNOME_SHELL_PKGLIBDIR=\"$(pkglibdir)\" \
 
73
        -DJSDIR=\"$(pkgdatadir)/js\"
 
74
 
 
75
privlibdir = $(pkglibdir)
 
76
privlib_LTLIBRARIES = libgnome-shell.la
 
77
 
 
78
shell_built_sources = \
 
79
        shell-marshal.h \
 
80
        shell-marshal.c \
 
81
        shell-enum-types.h \
 
82
        shell-enum-types.c
 
83
 
 
84
BUILT_SOURCES += $(shell_built_sources)
 
85
EXTRA_DIST += shell-marshal.list
 
86
 
 
87
shell_public_headers_h =                \
 
88
        shell-app.h                     \
 
89
        shell-app-system.h              \
 
90
        shell-app-usage.h               \
 
91
        shell-arrow.h                   \
 
92
        shell-doc-system.h              \
 
93
        shell-embedded-window.h         \
 
94
        shell-generic-container.h       \
 
95
        shell-gtk-embed.h               \
 
96
        shell-global.h                  \
 
97
        shell-mobile-providers.h        \
 
98
        shell-perf-log.h                \
 
99
        shell-slicer.h                  \
 
100
        shell-stack.h                   \
 
101
        shell-tray-icon.h               \
 
102
        shell-tray-manager.h            \
 
103
        shell-util.h                    \
 
104
        shell-window-tracker.h          \
 
105
        shell-wm.h                      \
 
106
        shell-xfixes-cursor.h
 
107
 
 
108
libgnome_shell_la_SOURCES =             \
 
109
        $(shell_built_sources)          \
 
110
        $(shell_public_headers_h)       \
 
111
        shell-app-private.h             \
 
112
        shell-embedded-window-private.h \
 
113
        shell-global-private.h          \
 
114
        shell-jsapi-compat-private.h    \
 
115
        shell-window-tracker-private.h  \
 
116
        shell-wm-private.h              \
 
117
        gnome-shell-plugin.c            \
 
118
        shell-app.c                     \
 
119
        shell-a11y.h                    \
 
120
        shell-a11y.c                    \
 
121
        shell-app-system.c              \
 
122
        shell-app-usage.c               \
 
123
        shell-arrow.c                   \
 
124
        shell-doc-system.c              \
 
125
        shell-embedded-window.c         \
 
126
        shell-generic-container.c       \
 
127
        shell-gtk-embed.c               \
 
128
        shell-global.c                  \
 
129
        shell-mobile-providers.c        \
 
130
        shell-perf-log.c                \
 
131
        shell-polkit-authentication-agent.h     \
 
132
        shell-polkit-authentication-agent.c     \
 
133
        shell-slicer.c                  \
 
134
        shell-stack.c                   \
 
135
        shell-tray-icon.c               \
 
136
        shell-tray-manager.c            \
 
137
        shell-util.c                    \
 
138
        shell-window-tracker.c          \
 
139
        shell-wm.c                      \
 
140
        shell-xfixes-cursor.c
 
141
 
 
142
libgnome_shell_la_gir_sources = \
 
143
        $(filter-out %-private.h $(shell_recorder_non_gir_sources), $(shell_public_headers_h) $(libgnome_shell_la_SOURCES))
 
144
 
 
145
gnome_shell_real_SOURCES =              \
 
146
        main.c
 
147
gnome_shell_real_CPPFLAGS = $(gnome_shell_cflags)
 
148
gnome_shell_real_LDADD = libgnome-shell.la $(libgnome_shell_la_LIBADD)
 
149
gnome_shell_real_DEPENDENCIES = libgnome-shell.la
 
150
 
 
151
########################################
 
152
 
 
153
shell_recorder_sources =        \
 
154
        shell-recorder.c        \
 
155
        shell-recorder.h
 
156
 
 
157
# Custom element is an internal detail
 
158
shell_recorder_non_gir_sources =  \
 
159
        shell-recorder-src.c      \
 
160
        shell-recorder-src.h
 
161
 
 
162
if BUILD_RECORDER
 
163
libgnome_shell_la_SOURCES += $(shell_recorder_sources) $(shell_recorder_non_gir_sources)
 
164
 
 
165
noinst_PROGRAMS += test-recorder
 
166
 
 
167
test_recorder_CPPFLAGS = $(TEST_SHELL_RECORDER_CFLAGS)
 
168
test_recorder_LDADD = $(TEST_SHELL_RECORDER_LIBS)
 
169
 
 
170
test_recorder_SOURCES =     \
 
171
        $(shell_recorder_sources) $(shell_recorder_non_gir_sources) \
 
172
        test-recorder.c
 
173
endif BUILD_RECORDER
 
174
 
 
175
########################################
 
176
 
 
177
libexec_PROGRAMS += gnome-shell-perf-helper
 
178
 
 
179
gnome_shell_perf_helper_SOURCES = shell-perf-helper.c
 
180
gnome_shell_perf_helper_CPPFLAGS = $(SHELL_PERF_HELPER_CFLAGS)
 
181
gnome_shell_perf_helper_LDADD = $(SHELL_PERF_HELPER_LIBS)
 
182
 
 
183
########################################
 
184
 
 
185
# In order to run the interactive tests for GUI components, we need to have
 
186
# an executable that exports the St components. Libtool doesn't have a way
 
187
# to include all the symbols from a convenience library into a executable
 
188
# so what we do is build a small uninstalled library that pulls in the
 
189
# St convenience library and link the test running program to that.
 
190
 
 
191
noinst_LTLIBRARIES += libjs-test.la
 
192
 
 
193
libjs_test_la_LDFLAGS = -rpath $(libdir)
 
194
libjs_test_la_CPPFLAGS = $(JS_TEST_CFLAGS)
 
195
libjs_test_la_LIBADD = $(JS_TEST_LIBS) libst-1.0.la
 
196
 
 
197
# The tests use or reference a couple of Shell classes
 
198
libjs_test_la_SOURCES =                 \
 
199
        shell-generic-container.c       \
 
200
        shell-perf-log.c
 
201
 
 
202
noinst_PROGRAMS += run-js-test
 
203
 
 
204
run_js_test_CPPFLAGS = $(JS_TEST_CFLAGS)
 
205
run_js_test_LDADD = $(JS_TEST_LIBS) libjs-test.la
 
206
run_js_test_LDFLAGS = -export-dynamic
 
207
 
 
208
run_js_test_SOURCES =                   \
 
209
        run-js-test.c
 
210
 
 
211
########################################
 
212
 
 
213
shell-marshal.h: stamp-shell-marshal.h
 
214
        @true
 
215
stamp-shell-marshal.h: Makefile shell-marshal.list
 
216
        $(AM_V_GEN) $(GLIB_GENMARSHAL) \
 
217
                --prefix=_shell_marshal \
 
218
                --header \
 
219
        $(srcdir)/shell-marshal.list > xgen-smh && \
 
220
        (cmp -s xgen-smh shell-marshal.h || cp -f xgen-smh shell-marshal.h) && \
 
221
        rm -f xgen-smh && \
 
222
        echo timestamp > $(@F)
 
223
CLEANFILES += stamp-shell-marshal.h
 
224
 
 
225
shell-marshal.c: Makefile shell-marshal.list
 
226
        $(AM_V_GEN) (echo "#include \"shell-marshal.h\"" ; \
 
227
         $(GLIB_GENMARSHAL) \
 
228
                --prefix=_shell_marshal \
 
229
                --body \
 
230
         $(srcdir)/shell-marshal.list ) > xgen-smc && \
 
231
        cp -f xgen-smc shell-marshal.c && \
 
232
        rm -f xgen-smc
 
233
 
 
234
 
 
235
shell-enum-types.h: stamp-shell-enum-types.h Makefile
 
236
        @true
 
237
stamp-shell-enum-types.h: $(srcdir)/shell-enum-types.h.in $(shell_public_headers_h)
 
238
        $(AM_V_GEN) ( cd $(srcdir) && \
 
239
          $(GLIB_MKENUMS) \
 
240
            --template $< \
 
241
          $(shell_public_headers_h) ) > $(@F).tmp && \
 
242
        (cmp -s $(@F).tmp shell-enum-types.h || mv $(@F).tmp shell-enum-types.h) && \
 
243
        rm -f $(@F).tmp && \
 
244
        echo timestamp > $(@F)
 
245
EXTRA_DIST += shell-enum-types.h.in
 
246
CLEANFILES += stamp-shell-enum-types.h
 
247
 
 
248
shell-enum-types.c: shell-enum-types.c.in stamp-shell-enum-types.h
 
249
        $(AM_V_GEN) ( cd $(srcdir) && \
 
250
          $(GLIB_MKENUMS) \
 
251
            --template $< \
 
252
          $(shell_public_headers_h) ) > $(@F).tmp && \
 
253
        mv $(@F).tmp $(@F) && \
 
254
        rm -f $(@F).tmp
 
255
EXTRA_DIST += shell-enum-types.c.in
 
256
 
 
257
libgnome_shell_la_LDFLAGS = -avoid-version
 
258
libgnome_shell_la_LIBADD =              \
 
259
        -lm                     \
 
260
        $(GNOME_SHELL_LIBS)     \
 
261
        $(BLUETOOTH_LIBS)       \
 
262
        libst-1.0.la            \
 
263
        libgdmuser-1.0.la       \
 
264
        libtray.la              \
 
265
        libgvc.la               \
 
266
        $(NULL)
 
267
 
 
268
libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
 
269
 
 
270
Shell-0.1.gir: libgnome-shell.la St-1.0.gir
 
271
Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2
 
272
Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
 
273
Shell_0_1_gir_LIBS = libgnome-shell.la
 
274
Shell_0_1_gir_FILES = $(addprefix $(srcdir)/,$(libgnome_shell_la_gir_sources))
 
275
Shell_0_1_gir_SCANNERFLAGS = --include-uninstalled=$(builddir)/St-1.0.gir \
 
276
        --add-include-path=$(MUTTER_GIR_DIR)
 
277
INTROSPECTION_GIRS += Shell-0.1.gir
 
278
CLEANFILES += Shell-0.1.gir
 
279
 
 
280
St-1.0.gir: libst-1.0.la
 
281
St_1_0_gir_INCLUDES = Clutter-1.0 Gtk-3.0
 
282
St_1_0_gir_CFLAGS = $(st_cflags) -DST_COMPILATION
 
283
St_1_0_gir_LIBS = libst-1.0.la
 
284
St_1_0_gir_FILES = $(filter-out %-private.h $(st_non_gir_sources), $(addprefix $(srcdir)/,$(st_source_h))) \
 
285
        $(addprefix $(srcdir)/,$(st_source_c))
 
286
INTROSPECTION_GIRS += St-1.0.gir
 
287
CLEANFILES += St-1.0.gir
 
288
 
 
289
Gdm-1.0.gir: libgdmuser-1.0.la
 
290
Gdm_1_0_gir_INCLUDES = GObject-2.0 GdkPixbuf-2.0
 
291
Gdm_1_0_gir_CFLAGS = $(gdmuser_cflags)
 
292
Gdm_1_0_gir_LIBS = libgdmuser-1.0.la
 
293
Gdm_1_0_gir_FILES = $(filter-out %-private.h, $(addprefix $(srcdir)/,$(gdmuser_source_h))) \
 
294
        $(addprefix $(srcdir)/,$(gdmuser_source_c))
 
295
INTROSPECTION_GIRS += Gdm-1.0.gir
 
296
CLEANFILES += Gdm-1.0.gir