← Back to branch summary

~bratsche/ubuntu/maverick/gtk+2.0/menu-activation-fix

« back to all changes in this revision

Viewing changes to demos/gtk-demo/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2010-07-22 21:41:30 UTC
  • mfrom: (1.11.7 upstream) (72.1.16 experimental)
  • Revision ID: james.westby@ubuntu.com-20100722214130-5uzyvpb9g4m0ts2c
Tags: 2.21.5-1ubuntu1
* Merge with Debian experimental, Ubuntu changes:
* debian/control.in:
  - Add introspection build-depends
  - Add Vcs-Bzr link
  - Add gir1.0-gtk-2.0 package
  - libgtk2.0-dev replaces gir-repository-dev
  - Conflict with appmenu-gtk (<< 0.1.3) to prevent menu proxy breakage
* debian/rules:
  - Build with --enable-introspection
  - Add gir1.0-gtk-2.0 package to BINARY_ARCH_PKGS
  - Add dh_girepository call
  - Disable devhelp files
* debian/dh_gtkmodules.in:
  - Remove obsolete script content
* debian/libgtk2.0-0.symbols:
  - Add Ubuntu specific symbols
* debian/libgtk2.0-dev.install.in:
  - Add gir files
* debian/libgtk2.0-doc.install.in
  - Disable devhelp files
* debian/gir1.0-gtk-2.0.install.in
  - Introspection package
* debian/patches/043_menu_proxy.patch
  - Add GtkMenuProxy support for remoting menus.
* debian/patches/062_dnd_menubar.patch:
  - Allow click on menubars for dnd
* debian/patches/063_treeview_almost_fixed.patch:
  - Add an ubuntu-almost-fixed-height-mode property, (required for
    software-center)
* debian/patches/071_no_offscreen_widgets_grabbing.patch:
  - Don't let offscreen widgets do grabbing
* debian/patches/072_indicator_menu_update.patch:
  - change by Cody Russell to send an update event on menu changes,
    should make the bluetooth indicator refresh correctly
* debian/patches/091_bugzilla_tooltip_refresh.patch:
  - Upstream bugzilla change to have better looking tooltips the gtk theme
    need to set "new-tooltip-style" to use those
* debian/watch:
  - Watch for unstable versions

Show diffs side-by-side

added added

removed removed

Lines of Context:
demos/gtk-demo/Makefile.in
71
71
am_gtk_demo_OBJECTS = $(am__objects_1) main.$(OBJEXT)
72
72
gtk_demo_OBJECTS = $(am_gtk_demo_OBJECTS)
73
73
am__DEPENDENCIES_1 =
74
 
am__DEPENDENCIES_2 = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
75
 
        $(top_builddir)/gdk/$(gdktargetlib) \
 
74
am__DEPENDENCIES_2 = $(top_builddir)/gdk/$(gdktargetlib) \
76
75
        $(top_builddir)/gtk/$(gtktargetlib) $(am__DEPENDENCIES_1)
77
76
AM_V_lt = $(am__v_lt_$(V))
78
77
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
193
192
GDK_EXTRA_LIBS = @GDK_EXTRA_LIBS@
194
193
GDK_PACKAGES = @GDK_PACKAGES@
195
194
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
196
 
GDK_PIXBUF_DEP_CFLAGS = @GDK_PIXBUF_DEP_CFLAGS@
197
 
GDK_PIXBUF_DEP_LIBS = @GDK_PIXBUF_DEP_LIBS@
198
 
GDK_PIXBUF_EXTRA_CFLAGS = @GDK_PIXBUF_EXTRA_CFLAGS@
199
 
GDK_PIXBUF_EXTRA_LIBS = @GDK_PIXBUF_EXTRA_LIBS@
200
 
GDK_PIXBUF_MAJOR = @GDK_PIXBUF_MAJOR@
201
 
GDK_PIXBUF_MICRO = @GDK_PIXBUF_MICRO@
202
 
GDK_PIXBUF_MINOR = @GDK_PIXBUF_MINOR@
203
 
GDK_PIXBUF_PACKAGES = @GDK_PIXBUF_PACKAGES@
204
 
GDK_PIXBUF_VERSION = @GDK_PIXBUF_VERSION@
205
 
GDK_PIXBUF_XLIB_DEP_CFLAGS = @GDK_PIXBUF_XLIB_DEP_CFLAGS@
206
 
GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_XLIB_DEP_LIBS@
207
 
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
208
 
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
209
 
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
 
195
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
210
196
GDK_WLIBS = @GDK_WLIBS@
211
197
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
212
198
GLIB_CFLAGS = @GLIB_CFLAGS@
241
227
HTML_DIR = @HTML_DIR@
242
228
INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@
243
229
INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@
244
 
INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@
245
 
INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@
246
230
INDENT = @INDENT@
247
231
INSTALL = @INSTALL@
248
232
INSTALL_DATA = @INSTALL_DATA@
261
245
INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
262
246
LD = @LD@
263
247
LDFLAGS = @LDFLAGS@
264
 
LIBJASPER = @LIBJASPER@
265
 
LIBJPEG = @LIBJPEG@
266
248
LIBOBJS = @LIBOBJS@
267
 
LIBPNG = @LIBPNG@
268
249
LIBS = @LIBS@
269
 
LIBTIFF = @LIBTIFF@
270
250
LIBTOOL = @LIBTOOL@
271
251
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
272
252
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
307
287
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
308
288
RANLIB = @RANLIB@
309
289
REBUILD = @REBUILD@
310
 
REBUILD_PNGS = @REBUILD_PNGS@
311
290
SED = @SED@
312
291
SET_MAKE = @SET_MAKE@
313
292
SHELL = @SHELL@
364
343
libexecdir = @libexecdir@
365
344
localedir = @localedir@
366
345
localstatedir = @localstatedir@
367
 
lt_ECHO = @lt_ECHO@
368
346
mandir = @mandir@
369
347
mkdir_p = @mkdir_p@
370
348
ms_librarian = @ms_librarian@
462
440
        $(GTK_DEP_CFLAGS)
463
441
 
464
442
DEPS = \
465
 
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
466
443
        $(top_builddir)/gdk/$(gdktargetlib)                             \
467
444
        $(top_builddir)/gtk/$(gtktargetlib)
468
445
 
469
446
LDADDS = \
470
 
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
471
447
        $(top_builddir)/gdk/$(gdktargetlib)                             \
472
448
        $(top_builddir)/gtk/$(gtktargetlib)                             \
473
 
        $(GTK_DEP_LIBS)
 
449
        $(GTK_DEP_LIBS)                                                 \
 
450
        -lm
474
451
 
475
452
BUILT_SOURCES = demos.h
476
453
gtk_demo_SOURCES = \