← Back to branch summary

~ubuntu-branches/ubuntu/natty/gnome-panel/natty

« back to all changes in this revision

Viewing changes to .pc/90_fix_linking_DSO_link.patch/gnome-panel/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2010-11-09 19:05:02 UTC
  • Revision ID: james.westby@ubuntu.com-20101109190502-1wr3zu0o80g7en3y
Tags: 1:2.32.0.2-0ubuntu2
* debian/patches/16_compiz_workspace_switcher.patch:
  - update for seeing the pager capplet with new compiz (it will need to
    export the layout to the root window then to see the effective number of
    viewport/worskpace to be taken into account)
* debian/patches/90_fix_linking_DSO_link.patch:
  - fix FTBFS due to missing DSO linking

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/90_fix_linking_DSO_link.patch/gnome-panel/Makefile.am
 
1
SUBDIRS = libegg libpanel-applet-private libpanel-util
 
2
 
 
3
bin_PROGRAMS = \
 
4
        gnome-panel                     \
 
5
        gnome-desktop-item-edit         \
 
6
        panel-test-applets
 
7
libexec_SCRIPTS = gnome-panel-add
 
8
 
 
9
AM_CPPFLAGS =                                                   \
 
10
        $(PANEL_CFLAGS)                                         \
 
11
        -I.                                                     \
 
12
        -I$(srcdir)                                             \
 
13
        -I$(top_builddir)/gnome-panel                           \
 
14
        -I$(top_builddir)/gnome-panel/libpanel-util             \
 
15
        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
 
16
        -DBUILDERDIR=\""$(uidir)"\"                             \
 
17
        -DICONDIR=\""$(datadir)/gnome-panel/pixmaps"\"          \
 
18
        $(DISABLE_DEPRECATED_CFLAGS)
 
19
 
 
20
AM_CFLAGS = $(WARN_CFLAGS)
 
21
 
 
22
panel_sources =                 \
 
23
        panel-typebuiltins.c    \
 
24
        panel-typebuiltins.h    \
 
25
        panel-marshal.c         \
 
26
        panel-marshal.h         \
 
27
        main.c                  \
 
28
        panel-widget.c          \
 
29
        button-widget.c         \
 
30
        xstuff.c                \
 
31
        panel-session.c         \
 
32
        panel-compatibility.c   \
 
33
        panel.c                 \
 
34
        applet.c                \
 
35
        drawer.c                \
 
36
        panel-config-global.c   \
 
37
        panel-util.c            \
 
38
        panel-gconf.c           \
 
39
        panel-properties-dialog.c       \
 
40
        panel-run-dialog.c      \
 
41
        menu.c                  \
 
42
        panel-context-menu.c    \
 
43
        launcher.c              \
 
44
        panel-applet-frame.c    \
 
45
        panel-applets-manager.c \
 
46
        panel-shell.c           \
 
47
        panel-background.c      \
 
48
        panel-background-monitor.c      \
 
49
        panel-stock-icons.c     \
 
50
        panel-action-button.c   \
 
51
        panel-menu-bar.c        \
 
52
        panel-menu-button.c     \
 
53
        panel-menu-items.c      \
 
54
        panel-separator.c       \
 
55
        panel-recent.c          \
 
56
        panel-action-protocol.c \
 
57
        panel-toplevel.c        \
 
58
        panel-struts.c          \
 
59
        panel-frame.c           \
 
60
        panel-xutils.c          \
 
61
        panel-multiscreen.c     \
 
62
        panel-a11y.c            \
 
63
        panel-bindings.c        \
 
64
        panel-profile.c         \
 
65
        panel-force-quit.c      \
 
66
        panel-lockdown.c        \
 
67
        panel-addto.c           \
 
68
        panel-ditem-editor.c    \
 
69
        panel-modules.c         \
 
70
        panel-applet-info.c     \
 
71
        applet-signaler.c
 
72
 
 
73
panel_headers =                 \
 
74
        panel-types.h           \
 
75
        panel-widget.h          \
 
76
        panel-globals.h         \
 
77
        button-widget.h         \
 
78
        xstuff.h                \
 
79
        panel-session.h         \
 
80
        panel-compatibility.h   \
 
81
        panel.h                 \
 
82
        applet.h                \
 
83
        drawer.h                \
 
84
        panel-util.h            \
 
85
        panel-properties-dialog.h       \
 
86
        panel-config-global.h   \
 
87
        panel-gconf.h           \
 
88
        panel-run-dialog.h      \
 
89
        menu.h                  \
 
90
        panel-context-menu.h    \
 
91
        launcher.h              \
 
92
        panel-applet-frame.h    \
 
93
        panel-applets-manager.h \
 
94
        panel-shell.h           \
 
95
        panel-background.h      \
 
96
        panel-background-monitor.h      \
 
97
        panel-stock-icons.h     \
 
98
        panel-action-button.h   \
 
99
        panel-menu-bar.h        \
 
100
        panel-menu-button.h     \
 
101
        panel-menu-items.h      \
 
102
        panel-separator.h       \
 
103
        panel-recent.h          \
 
104
        panel-action-protocol.h \
 
105
        panel-toplevel.h        \
 
106
        panel-struts.h          \
 
107
        panel-frame.h           \
 
108
        panel-xutils.h          \
 
109
        panel-multiscreen.h     \
 
110
        panel-a11y.h            \
 
111
        panel-bindings.h        \
 
112
        panel-profile.h         \
 
113
        panel-enums.h           \
 
114
        panel-force-quit.h      \
 
115
        panel-lockdown.h        \
 
116
        panel-addto.h           \
 
117
        panel-ditem-editor.h    \
 
118
        panel-icon-names.h      \
 
119
        panel-modules.h         \
 
120
        panel-applet-info.h     \
 
121
        applet-signaler.h
 
122
 
 
123
gnome_panel_SOURCES =                   \
 
124
        $(panel_sources)                \
 
125
        $(panel_headers)
 
126
 
 
127
gnome_panel_CPPFLAGS =                          \
 
128
        $(AM_CPPFLAGS)                          \
 
129
        $(XRANDR_CFLAGS)                        \
 
130
        -DPANEL_MODULES_DIR=\"$(modulesdir)\"   \
 
131
        -DGMENU_I_KNOW_THIS_IS_UNSTABLE
 
132
 
 
133
gnome_panel_LDADD =             \
 
134
        $(top_builddir)/gnome-panel/libegg/libegg.la                                    \
 
135
        $(top_builddir)/gnome-panel/libpanel-applet-private/libpanel-applet-private.la  \
 
136
        $(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la                      \
 
137
        $(PANEL_LIBS)                                                                   \
 
138
        $(XRANDR_LIBS)                                                                  \
 
139
        $(X_LIBS)
 
140
 
 
141
gnome_panel_LDFLAGS = -export-dynamic
 
142
 
 
143
gnome_desktop_item_edit_SOURCES =       \
 
144
        gnome-desktop-item-edit.c       \
 
145
        panel-ditem-editor.c            \
 
146
        panel-marshal.c                 \
 
147
        panel-util.c                    \
 
148
        xstuff.c
 
149
 
 
150
gnome_desktop_item_edit_LDADD =         \
 
151
        $(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
 
152
        $(PANEL_LIBS)
 
153
 
 
154
panel_test_applets_SOURCES =            \
 
155
        panel-modules.c                 \
 
156
        panel-applet-info.c             \
 
157
        panel-applets-manager.c         \
 
158
        panel-marshal.c                 \
 
159
        panel-test-applets.c
 
160
 
 
161
panel_test_applets_CPPFLAGS =                   \
 
162
        $(AM_CPPFLAGS)                          \
 
163
        -DPANEL_MODULES_DIR=\"$(modulesdir)\"   \
 
164
        -DPANEL_APPLETS_DIR=\"$(appletsdir)\"
 
165
 
 
166
panel_test_applets_LDADD =              \
 
167
        $(top_builddir)/gnome-panel/libpanel-applet-private/libpanel-applet-private-mini.la     \
 
168
        $(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la                              \
 
169
        $(PANEL_LIBS)
 
170
 
 
171
panel_test_applets_LDFLAGS = -export-dynamic
 
172
 
 
173
gnome-panel-add: gnome-panel-add.in Makefile
 
174
        $(AM_V_GEN)sed                                          \
 
175
                -e s!\@PYTHON\@!@PYTHON@!                       \
 
176
                -e s!\@PANEL_APPLETS_DIR\@!$(appletsdir)!       \
 
177
                < $< > $@
 
178
        $(AM_V_at)chmod a+x $@
 
179
 
 
180
panel_enum_headers =                                    \
 
181
        $(top_srcdir)/gnome-panel/panel-enums.h         \
 
182
        $(top_srcdir)/gnome-panel/panel-types.h
 
183
 
 
184
panel-marshal.h: panel-marshal.list $(GLIB_GENMARSHAL)
 
185
        $(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=panel_marshal > $@
 
186
 
 
187
panel-marshal.c: panel-marshal.list $(GLIB_GENMARSHAL)
 
188
        $(AM_V_GEN)echo "#include \"panel-marshal.h\"" > $@ && \
 
189
        $(GLIB_GENMARSHAL) $< --body --prefix=panel_marshal >> $@
 
190
 
 
191
panel-typebuiltins.c: @REBUILD@ $(panel_enum_headers)
 
192
        $(AM_V_GEN)glib-mkenums \
 
193
                        --fhead "#include <glib-object.h>\n" \
 
194
                        --fhead "#include \"panel-typebuiltins.h\"\n\n" \
 
195
                        --fprod "\n/* enumerations from \"@filename@\" */" \
 
196
                        --fprod "\n#include \"@filename@\"\n" \
 
197
                        --vhead "static const GEnumValue _@enum_name@_values[] = {" \
 
198
                        --vprod "  { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
 
199
                        --vtail "  { 0, NULL, NULL }\n};\n\n" \
 
200
                        --vtail "GType\n@enum_name@_get_type (void)\n{\n" \
 
201
                        --vtail "  static GType type = 0;\n\n" \
 
202
                        --vtail "  if (!type)\n" \
 
203
                        --vtail "    type = g_enum_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \
 
204
                        --vtail "  return type;\n}\n\n" \
 
205
                $(panel_enum_headers) > $@
 
206
 
 
207
panel-typebuiltins.h: @REBUILD@ $(panel_enum_headers)
 
208
        $(AM_V_GEN)glib-mkenums \
 
209
                        --fhead "#ifndef __PANEL_TYPEBUILTINS_H__\n" \
 
210
                        --fhead "#define __PANEL_TYPEBUILTINS_H__ 1\n\n" \
 
211
                        --fhead "G_BEGIN_DECLS\n\n" \
 
212
                        --ftail "G_END_DECLS\n\n" \
 
213
                        --ftail "#endif /* __PANEL_TYPEBUILTINS_H__ */\n" \
 
214
                        --fprod "\n/* --- @filename@ --- */" \
 
215
                        --eprod "#define PANEL_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \
 
216
                        --eprod "GType @enum_name@_get_type (void);\n" \
 
217
                $(panel_enum_headers) > $@
 
218
 
 
219
BUILT_SOURCES = \
 
220
        panel-typebuiltins.c            \
 
221
        panel-typebuiltins.h            \
 
222
        panel-marshal.c                 \
 
223
        panel-marshal.h
 
224
 
 
225
rcdir = $(datadir)
 
226
rc_DATA = gnome-panelrc
 
227
 
 
228
uidir = $(datadir)/gnome-panel/ui
 
229
ui_DATA =                                       \
 
230
        panel-properties-dialog.ui              \
 
231
        panel-run-dialog.ui                     \
 
232
        panel-test-applets.ui
 
233
 
 
234
desktopdir = $(datadir)/applications
 
235
desktop_in_files = gnome-panel.desktop.in
 
236
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
237
 
 
238
@INTLTOOL_DESKTOP_RULE@
 
239
 
 
240
entriesdir       = $(GCONF_SCHEMA_FILE_DIR)
 
241
entries_DATA     = panel-default-setup.entries
 
242
 
 
243
schemasdir       = $(GCONF_SCHEMA_FILE_DIR)
 
244
schemas_in_files =                              \
 
245
        panel-global.schemas.in                 \
 
246
        panel-general.schemas.in                \
 
247
        panel-toplevel.schemas.in               \
 
248
        panel-object.schemas.in
 
249
schemas_DATA     = panel-compatibility.schemas $(schemas_in_files:.schemas.in=.schemas)
 
250
 
 
251
@INTLTOOL_SCHEMAS_RULE@
 
252
 
 
253
if GCONF_SCHEMAS_INSTALL
 
254
install-data-local:
 
255
        if test -z "$(DESTDIR)" ; then \
 
256
                for p in $(schemas_DATA) ; do \
 
257
                        GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnome-panel/$$p ; \
 
258
                done ; \
 
259
                $(GCONFTOOL) --direct --config-source=$(GCONF_SCHEMA_CONFIG_SOURCE) --load $(srcdir)/panel-default-setup.entries ; \
 
260
                $(GCONFTOOL) --direct --config-source=$(GCONF_SCHEMA_CONFIG_SOURCE) --load $(srcdir)/panel-default-setup.entries /apps/panel ; \
 
261
        fi
 
262
uninstall-local:
 
263
        for p in $(schema_DATA) ; do \
 
264
                GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(top_builddir)/applets/ngome-panel/$$p ; \
 
265
        done
 
266
endif
 
267
 
 
268
EXTRA_DIST =                                    \
 
269
        $(ui_DATA)                              \
 
270
        nothing.cP                              \
 
271
        nothing.h                               \
 
272
        $(schemas_in_files)                     \
 
273
        panel-compatibility.schemas             \
 
274
        panel-marshal.list                      \
 
275
        gnome-panelrc                           \
 
276
        $(entries_DATA)                         \
 
277
        $(desktop_in_files)                     \
 
278
        gnome-panel-add.in
 
279
 
 
280
CLEANFILES = \
 
281
        $(BUILT_SOURCES) \
 
282
        $(schemas_in_files:.schemas.in=.schemas) \
 
283
        $(sys_DATA) \
 
284
        $(desktop_DATA) \
 
285
        gnome-panel-add
 
286
 
 
287
dist-hook:
 
288
        cd $(distdir) ; rm -f $(CLEANFILES)
 
289
 
 
290
-include $(top_srcdir)/git.mk