← Back to branch summary

~matttbe/ubuntu/precise/gnome-panel/975299

« back to all changes in this revision

Viewing changes to gnome-panel/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2012-02-08 00:17:11 UTC
  • mfrom: (1.13.15)
  • Revision ID: package-import@ubuntu.com-20120208001711-npwmthl0c6iy3s9a
Tags: 1:3.3.5-0ubuntu1
* New upstream release.
* debian/control.in:
  - Bump minimum glib to 2.31.14
* debian/patches/13_disable_missing_help.patch:
  Updated patch from bugzilla
* debian/patches/14_revert-timedate-change.patch:
  - Revert switch to systemd timedate protocol until ubuntu-system-
    services supports it

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnome-panel/Makefile.am
14
14
        -I$(top_builddir)/gnome-panel/libpanel-util             \
15
15
        -DPANELDATADIR=\""$(datadir)/gnome-panel"\"             \
16
16
        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
17
 
        -DBUILDERDIR=\""$(uidir)"\"                             \
18
 
        -DICONDIR=\""$(datadir)/gnome-panel/pixmaps"\"          \
19
17
        $(DISABLE_DEPRECATED_CFLAGS)
20
18
 
21
19
AM_CFLAGS = $(WARN_CFLAGS)
22
20
 
23
21
panel_sources =                 \
24
 
        panel-typebuiltins.c    \
25
 
        panel-typebuiltins.h    \
26
 
        panel-marshal.c         \
27
 
        panel-marshal.h         \
 
22
        $(gnome_panel_BUILT_SOURCES) \
28
23
        main.c                  \
29
24
        panel-widget.c          \
30
25
        button-widget.c         \
158
153
        $(PANEL_LIBS)                                                   \
159
154
        $(X_LIBS)
160
155
 
161
 
panel_test_applets_SOURCES =            \
162
 
        panel-modules.c                 \
163
 
        panel-applet-info.c             \
164
 
        panel-applets-manager.c         \
165
 
        panel-marshal.c                 \
 
156
panel_test_applets_SOURCES =                    \
 
157
        $(panel_test_applets_BUILT_SOURCES)     \
 
158
        panel-modules.c                         \
 
159
        panel-applet-info.c                     \
 
160
        panel-applets-manager.c                 \
166
161
        panel-test-applets.c
167
162
 
168
163
panel_test_applets_CPPFLAGS =                   \
224
219
                        --eprod "GType @enum_name@_get_type (void);\n" \
225
220
                $(panel_enum_headers) > $@
226
221
 
227
 
BUILT_SOURCES = \
 
222
gnome_panel_BUILT_SOURCES = \
228
223
        panel-typebuiltins.c            \
229
224
        panel-typebuiltins.h            \
230
 
        panel-marshal.c                 \
231
 
        panel-marshal.h
232
 
 
233
 
uidir = $(datadir)/gnome-panel/ui
234
 
ui_DATA =                                       \
 
225
        panel-resources.c               \
 
226
        panel-resources.h               \
 
227
        panel-marshal.c                 \
 
228
        panel-marshal.h
 
229
 
 
230
panel_test_applets_BUILT_SOURCES =      \
 
231
        panel-test-applets-resources.c  \
 
232
        panel-test-applets-resources.h  \
 
233
        panel-marshal.c                 \
 
234
        panel-marshal.h
 
235
 
 
236
BUILT_SOURCES =                                 \
 
237
        $(gnome_panel_BUILT_SOURCES)            \
 
238
        $(panel_test_applets_BUILT_SOURCES)
 
239
 
 
240
ui_FILES =                                      \
235
241
        panel-properties-dialog.ui              \
236
 
        panel-run-dialog.ui                     \
237
 
        panel-test-applets.ui
 
242
        panel-run-dialog.ui
 
243
 
 
244
panel-resources.c: panel.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies panel.gresource.xml)
 
245
        $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name panel $(srcdir)/$<
 
246
 
 
247
panel-resources.h: panel.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies panel.gresource.xml)
 
248
        $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name panel $(srcdir)/$<
 
249
 
 
250
uitest_FILES = panel-test-applets.ui
 
251
 
 
252
panel-test-applets-resources.c: panel-test-applets.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies panel-test-applets.gresource.xml)
 
253
        $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name panel $(srcdir)/$<
 
254
 
 
255
panel-test-applets-resources.h: panel-test-applets.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies panel-test-applets.gresource.xml)
 
256
        $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name panel $(srcdir)/$<
238
257
 
239
258
desktopdir = $(datadir)/applications
240
259
desktop_in_files = gnome-panel.desktop.in
243
262
@INTLTOOL_DESKTOP_RULE@
244
263
 
245
264
EXTRA_DIST =                                    \
246
 
        $(ui_DATA)                              \
 
265
        $(ui_FILES)                             \
 
266
        panel.gresource.xml                     \
 
267
        $(uitest_FILES)                         \
 
268
        panel-test-applets.gresource.xml        \
247
269
        nothing.cP                              \
248
270
        nothing.h                               \
249
271
        panel-marshal.list                      \