← 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.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:
gtk/Makefile.in
40
40
POST_UNINSTALL = :
41
41
build_triplet = @build@
42
42
host_triplet = @host@
43
 
DIST_COMMON = $(am__dist_gir_DATA_DIST) \
44
 
        $(am__gtkunixprintinclude_HEADERS_DIST) $(gtkinclude_HEADERS) \
45
 
        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
46
 
        $(srcdir)/gtk-win32.rc.in $(srcdir)/gtkversion.h.in \
47
 
        $(srcdir)/makefile.msc.in $(top_srcdir)/Makefile.decl
 
43
DIST_COMMON = $(am__gtkunixprintinclude_HEADERS_DIST) \
 
44
        $(gtkinclude_HEADERS) $(srcdir)/Makefile.am \
 
45
        $(srcdir)/Makefile.in $(srcdir)/gtk-win32.rc.in \
 
46
        $(srcdir)/gtkversion.h.in $(srcdir)/makefile.msc.in \
 
47
        $(top_srcdir)/Makefile.decl
48
48
@OS_LINUX_TRUE@am__append_1 = abicheck.sh pltcheck.sh
49
49
@HAVE_INCLUDED_IMMMODULES_TRUE@am__append_2 = $(INCLUDED_IMMODULE_OBJ)
50
50
@HAVE_INCLUDED_IMMMODULES_TRUE@am__append_3 = $(INCLUDED_IMMODULE_OBJ)
69
69
@USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_13 = $(gtk_use_quartz_c_sources)
70
70
@USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_14 = $(gtk_use_stub_c_sources)
71
71
@HAVE_INTROSPECTION_TRUE@am__append_15 = Gtk-2.0.gir
72
 
@HAVE_INTROSPECTION_TRUE@am__append_16 = $(dist_gir_DATA) $(typelibs_DATA)
 
72
@HAVE_INTROSPECTION_TRUE@am__append_16 = $(gir_DATA) $(typelibs_DATA)
73
73
bin_PROGRAMS = gtk-query-immodules-2.0$(EXEEXT) \
74
74
        gtk-update-icon-cache$(EXEEXT)
75
75
@OS_WIN32_TRUE@am__append_17 = \
114
114
am__DEPENDENCIES_1 =
115
115
@HAVE_INCLUDED_IMMMODULES_TRUE@am__DEPENDENCIES_2 =  \
116
116
@HAVE_INCLUDED_IMMMODULES_TRUE@ $(am__DEPENDENCIES_1)
117
 
am__DEPENDENCIES_3 = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
118
 
        $(top_builddir)/gdk/$(gdktargetlib) $(am__DEPENDENCIES_1) \
119
 
        $(am__DEPENDENCIES_2)
 
117
am__DEPENDENCIES_3 = $(top_builddir)/gdk/$(gdktargetlib) \
 
118
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
120
119
am__libgtk_directfb_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \
121
120
        gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \
122
121
        gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \
574
573
gtk_query_immodules_2_0_OBJECTS =  \
575
574
        $(am_gtk_query_immodules_2_0_OBJECTS)
576
575
am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) \
577
 
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
578
576
        $(top_builddir)/gdk/$(gdktargetlib) $(am__DEPENDENCIES_1)
579
577
am_gtk_update_icon_cache_OBJECTS = updateiconcache.$(OBJEXT)
580
578
gtk_update_icon_cache_OBJECTS = $(am_gtk_update_icon_cache_OBJECTS)
581
 
gtk_update_icon_cache_DEPENDENCIES = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
582
 
        $(am__DEPENDENCIES_1)
 
579
gtk_update_icon_cache_DEPENDENCIES = $(am__DEPENDENCIES_1)
583
580
SCRIPTS = $(bin_SCRIPTS)
584
581
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
585
582
depcomp = $(SHELL) $(top_srcdir)/depcomp
625
622
        install-pdf-recursive install-ps-recursive install-recursive \
626
623
        installcheck-recursive installdirs-recursive pdf-recursive \
627
624
        ps-recursive uninstall-recursive
628
 
am__dist_gir_DATA_DIST = Gtk-2.0.gir
629
 
DATA = $(dist_gir_DATA) $(noinst_DATA) $(typelibs_DATA)
 
625
DATA = $(gir_DATA) $(noinst_DATA) $(typelibs_DATA)
630
626
am__gtkunixprintinclude_HEADERS_DIST = gtkpagesetupunixdialog.h \
631
627
        gtkprintunixdialog.h gtkprinter.h gtkprintjob.h gtkunixprint.h
632
628
HEADERS = $(gtkinclude_HEADERS) $(gtkunixprintinclude_HEADERS)
725
721
GDK_EXTRA_LIBS = @GDK_EXTRA_LIBS@
726
722
GDK_PACKAGES = @GDK_PACKAGES@
727
723
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
728
 
GDK_PIXBUF_DEP_CFLAGS = @GDK_PIXBUF_DEP_CFLAGS@
729
 
GDK_PIXBUF_DEP_LIBS = @GDK_PIXBUF_DEP_LIBS@
730
 
GDK_PIXBUF_EXTRA_CFLAGS = @GDK_PIXBUF_EXTRA_CFLAGS@
731
 
GDK_PIXBUF_EXTRA_LIBS = @GDK_PIXBUF_EXTRA_LIBS@
732
 
GDK_PIXBUF_MAJOR = @GDK_PIXBUF_MAJOR@
733
 
GDK_PIXBUF_MICRO = @GDK_PIXBUF_MICRO@
734
 
GDK_PIXBUF_MINOR = @GDK_PIXBUF_MINOR@
735
 
GDK_PIXBUF_PACKAGES = @GDK_PIXBUF_PACKAGES@
736
 
GDK_PIXBUF_VERSION = @GDK_PIXBUF_VERSION@
737
 
GDK_PIXBUF_XLIB_DEP_CFLAGS = @GDK_PIXBUF_XLIB_DEP_CFLAGS@
738
 
GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_XLIB_DEP_LIBS@
739
 
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
740
 
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
741
 
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
 
724
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
742
725
GDK_WLIBS = @GDK_WLIBS@
743
726
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
744
727
GLIB_CFLAGS = @GLIB_CFLAGS@
773
756
HTML_DIR = @HTML_DIR@
774
757
INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@
775
758
INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@
776
 
INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@
777
 
INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@
778
759
INDENT = @INDENT@
779
760
INSTALL = @INSTALL@
780
761
INSTALL_DATA = @INSTALL_DATA@
793
774
INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
794
775
LD = @LD@
795
776
LDFLAGS = @LDFLAGS@
796
 
LIBJASPER = @LIBJASPER@
797
 
LIBJPEG = @LIBJPEG@
798
777
LIBOBJS = @LIBOBJS@
799
 
LIBPNG = @LIBPNG@
800
778
LIBS = @LIBS@
801
 
LIBTIFF = @LIBTIFF@
802
779
LIBTOOL = @LIBTOOL@
803
780
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
804
781
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
839
816
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
840
817
RANLIB = @RANLIB@
841
818
REBUILD = @REBUILD@
842
 
REBUILD_PNGS = @REBUILD_PNGS@
843
819
SED = @SED@
844
820
SET_MAKE = @SET_MAKE@
845
821
SHELL = @SHELL@
896
872
libexecdir = @libexecdir@
897
873
localedir = @localedir@
898
874
localstatedir = @localstatedir@
899
 
lt_ECHO = @lt_ECHO@
900
875
mandir = @mandir@
901
876
mkdir_p = @mkdir_p@
902
877
ms_librarian = @ms_librarian@
955
930
 
956
931
INTROSPECTION_GIRS = $(am__append_15)
957
932
INTROSPECTION_SCANNER_ARGS = \
958
 
        --add-include-path=../gdk-pixbuf \
959
933
        --add-include-path=../gdk
960
934
 
961
935
INTROSPECTION_COMPILER_ARGS = \
962
936
        --includedir=$(srcdir) \
963
937
    --includedir=. \
964
 
    --includedir=../gdk-pixbuf \
965
938
    --includedir=../gdk
966
939
 
967
940
@USE_QUARTZ_FALSE@GTK_PRINT_PREVIEW_COMMAND = "evince --unlink-tempfile --preview --print-settings %s %f"
988
961
        -I$(top_builddir)/gtk                           \
989
962
        -I$(top_srcdir) -I../gdk                        \
990
963
        -I$(top_srcdir)/gdk                             \
991
 
        -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf      \
992
964
        -DGDK_DISABLE_DEPRECATED                        \
993
965
        -DGTK_DISABLE_DEPRECATED                        \
994
966
        -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED            \
1008
980
TESTS_ENVIRONMENT = srcdir="$(srcdir)" gtk_all_c_sources="$(gtk_all_c_sources)"
1009
981
TESTS = aliasfilescheck.sh $(am__append_1)
1010
982
libgtkincludedir = $(includedir)/gtk-2.0/gtk
1011
 
libadd = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
1012
 
        $(top_builddir)/gdk/$(gdktargetlib) $(GTK_DEP_LIBS) \
 
983
libadd = $(top_builddir)/gdk/$(gdktargetlib) $(GTK_DEP_LIBS) \
1013
984
        $(am__append_2)
1014
985
deps = $(am__append_3)
1015
986
 
1343
1314
libgtk_directfb_2_0_la_DEPENDENCIES = $(deps)
1344
1315
@USE_WIN32_TRUE@libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
1345
1316
EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-win32-2.0.la libgtk-quartz-2.0.la libgtk-directfb-2.0.la
1346
 
DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib)
 
1317
DEPS = $(gtktargetlib) $(top_builddir)/gdk/$(gdktargetlib)
1347
1318
TEST_DEPS = $(DEPS) gtk.immodules
1348
1319
LDADDS = \
1349
1320
        $(gtktargetlib)                                                 \
1350
 
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
1351
1321
        $(top_builddir)/gdk/$(gdktargetlib)                             \
1352
1322
        $(GTK_DEP_LIBS)
1353
1323
 
1368
1338
@HAVE_INTROSPECTION_TRUE@Gtk_2_0_gir_LIBS = $(gtktargetlib)
1369
1339
@HAVE_INTROSPECTION_TRUE@Gtk_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
1370
1340
@HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
1371
 
@HAVE_INTROSPECTION_TRUE@dist_gir_DATA = $(INTROSPECTION_GIRS)
 
1341
@HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS)
1372
1342
@HAVE_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0
1373
1343
@HAVE_INTROSPECTION_TRUE@typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
1374
1344
bin_SCRIPTS = gtk-builder-convert $(am__append_17)
1381
1351
gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
1382
1352
gtk_query_immodules_2_0_LDADD = $(LDADDS)
1383
1353
gtk_query_immodules_2_0_SOURCES = queryimmodules.c
1384
 
gtk_update_icon_cache_LDADD = \
1385
 
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
1386
 
        $(GDK_PIXBUF_DEP_LIBS)
1387
 
 
1388
 
gtk_update_icon_cache_SOURCES = \
1389
 
        updateiconcache.c 
1390
 
 
 
1354
gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
 
1355
gtk_update_icon_cache_SOURCES = updateiconcache.c 
1391
1356
STOCK_ICONS = \
1392
1357
        stock-icons/16/document-open-recent.png         \
1393
1358
        stock-icons/16/gtk-about.png                    \
1634
1599
        stock-icons/24/text-x-generic.png
1635
1600
 
1636
1601
@CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \
1637
 
@CROSS_COMPILING_FALSE@ GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders    \
1638
1602
@CROSS_COMPILING_FALSE@    ./gtk-update-icon-cache
1639
1603
 
1640
1604
@CROSS_COMPILING_TRUE@gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
2109
2073
 
2110
2074
clean-libtool:
2111
2075
        -rm -rf .libs _libs
2112
 
install-dist_girDATA: $(dist_gir_DATA)
 
2076
install-girDATA: $(gir_DATA)
2113
2077
        @$(NORMAL_INSTALL)
2114
2078
        test -z "$(girdir)" || $(MKDIR_P) "$(DESTDIR)$(girdir)"
2115
 
        @list='$(dist_gir_DATA)'; test -n "$(girdir)" || list=; \
 
2079
        @list='$(gir_DATA)'; test -n "$(girdir)" || list=; \
2116
2080
        for p in $$list; do \
2117
2081
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
2118
2082
          echo "$$d$$p"; \
2122
2086
          $(INSTALL_DATA) $$files "$(DESTDIR)$(girdir)" || exit $$?; \
2123
2087
        done
2124
2088
 
2125
 
uninstall-dist_girDATA:
 
2089
uninstall-girDATA:
2126
2090
        @$(NORMAL_UNINSTALL)
2127
 
        @list='$(dist_gir_DATA)'; test -n "$(girdir)" || list=; \
 
2091
        @list='$(gir_DATA)'; test -n "$(girdir)" || list=; \
2128
2092
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
2129
2093
        test -n "$$files" || exit 0; \
2130
2094
        echo " ( cd '$(DESTDIR)$(girdir)' && rm -f" $$files ")"; \
2543
2507
 
2544
2508
info-am:
2545
2509
 
2546
 
install-data-am: install-data-local install-dist_girDATA \
 
2510
install-data-am: install-data-local install-girDATA \
2547
2511
        install-gtkincludeHEADERS install-gtkunixprintincludeHEADERS \
2548
2512
        install-typelibsDATA
2549
2513
 
2594
2558
ps-am:
2595
2559
 
2596
2560
uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
2597
 
        uninstall-dist_girDATA uninstall-gtkincludeHEADERS \
 
2561
        uninstall-girDATA uninstall-gtkincludeHEADERS \
2598
2562
        uninstall-gtkunixprintincludeHEADERS uninstall-libLTLIBRARIES \
2599
2563
        uninstall-local uninstall-typelibsDATA
2600
2564
 
2610
2574
        distclean-local distclean-tags distdir dvi dvi-am html html-am \
2611
2575
        info info-am install install-am install-binPROGRAMS \
2612
2576
        install-binSCRIPTS install-data install-data-am \
2613
 
        install-data-local install-dist_girDATA install-dvi \
2614
 
        install-dvi-am install-exec install-exec-am install-exec-hook \
 
2577
        install-data-local install-dvi install-dvi-am install-exec \
 
2578
        install-exec-am install-exec-hook install-girDATA \
2615
2579
        install-gtkincludeHEADERS install-gtkunixprintincludeHEADERS \
2616
2580
        install-html install-html-am install-info install-info-am \
2617
2581
        install-libLTLIBRARIES install-man install-pdf install-pdf-am \
2620
2584
        maintainer-clean maintainer-clean-generic mostlyclean \
2621
2585
        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
2622
2586
        pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
2623
 
        uninstall-binPROGRAMS uninstall-binSCRIPTS \
2624
 
        uninstall-dist_girDATA uninstall-gtkincludeHEADERS \
 
2587
        uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-girDATA \
 
2588
        uninstall-gtkincludeHEADERS \
2625
2589
        uninstall-gtkunixprintincludeHEADERS uninstall-libLTLIBRARIES \
2626
2590
        uninstall-local uninstall-typelibsDATA
2627
2591