← Back to branch summary

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

« back to all changes in this revision

Viewing changes to gtk/Makefile.am

  • 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:
gtk/Makefile.am
3
3
-include $(INTROSPECTION_MAKEFILE)
4
4
INTROSPECTION_GIRS =
5
5
INTROSPECTION_SCANNER_ARGS = \
6
 
        --add-include-path=../gdk-pixbuf \
7
6
        --add-include-path=../gdk
8
7
INTROSPECTION_COMPILER_ARGS = \
9
8
        --includedir=$(srcdir) \
10
9
    --includedir=. \
11
 
    --includedir=../gdk-pixbuf \
12
10
    --includedir=../gdk
13
11
 
14
12
if USE_QUARTZ
50
48
        -I$(top_builddir)/gtk                           \
51
49
        -I$(top_srcdir) -I../gdk                        \
52
50
        -I$(top_srcdir)/gdk                             \
53
 
        -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf      \
54
51
        -DGDK_DISABLE_DEPRECATED                        \
55
52
        -DGTK_DISABLE_DEPRECATED                        \
56
53
        -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED            \
124
121
 
125
122
libgtkincludedir = $(includedir)/gtk-2.0/gtk
126
123
libadd =                                                                \
127
 
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
128
124
        $(top_builddir)/gdk/$(gdktargetlib)                             \
129
125
        $(GTK_DEP_LIBS)
130
126
deps =
976
972
          rm -f $(MAINTAINERCLEANFILES); \
977
973
        fi
978
974
 
979
 
DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib)
 
975
DEPS = $(gtktargetlib) $(top_builddir)/gdk/$(gdktargetlib)
980
976
 
981
977
TEST_DEPS = $(DEPS) gtk.immodules
982
978
 
983
979
LDADDS =                                                                \
984
980
        $(gtktargetlib)                                                 \
985
 
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
986
981
        $(top_builddir)/gdk/$(gdktargetlib)                             \
987
982
        $(GTK_DEP_LIBS)
988
983
 
1006
1001
INTROSPECTION_GIRS += Gtk-2.0.gir
1007
1002
 
1008
1003
girdir = $(datadir)/gir-1.0
1009
 
dist_gir_DATA = $(INTROSPECTION_GIRS)
 
1004
gir_DATA = $(INTROSPECTION_GIRS)
1010
1005
 
1011
1006
typelibsdir = $(libdir)/girepository-1.0
1012
1007
typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
1013
1008
 
1014
 
CLEANFILES += $(dist_gir_DATA) $(typelibs_DATA)
 
1009
CLEANFILES += $(gir_DATA) $(typelibs_DATA)
1015
1010
endif
1016
1011
 
1017
1012
#
1058
1053
 
1059
1054
gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
1060
1055
gtk_query_immodules_2_0_LDADD = $(LDADDS)
1061
 
 
1062
1056
gtk_query_immodules_2_0_SOURCES = queryimmodules.c
1063
1057
 
1064
 
gtk_update_icon_cache_LDADD = \
1065
 
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
1066
 
        $(GDK_PIXBUF_DEP_LIBS)
1067
 
 
1068
 
 
1069
 
gtk_update_icon_cache_SOURCES = \
1070
 
        updateiconcache.c 
 
1058
gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
 
1059
gtk_update_icon_cache_SOURCES = updateiconcache.c 
1071
1060
 
1072
1061
.PHONY: files test test-debug
1073
1062
 
1372
1361
gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
1373
1362
else
1374
1363
gtk_update_icon_cache_program =                                                 \
1375
 
        GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders    \
1376
1364
           ./gtk-update-icon-cache
1377
1365
endif
1378
1366