]> Pileus Git - ~andy/gtk/blobdiff - gtk/Makefile.am
testgtk: Use symbolic names for button numbers
[~andy/gtk] / gtk / Makefile.am
index e197c73ebcde41929407c232bbbf99b41f56a29d..6d5f926452f2490d74511ec94ba63e18d3b7eaad 100644 (file)
@@ -48,10 +48,9 @@ AM_CPPFLAGS =                                                \
        -I$(top_builddir)/gtk                           \
        -I$(top_srcdir) -I../gdk                        \
        -I$(top_srcdir)/gdk                             \
-       -DGDK_DISABLE_DEPRECATED                        \
-       -DGTK_DISABLE_DEPRECATED                        \
        -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED            \
        -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED          \
+       $(GMODULE_CFLAGS)                               \
        $(GTK_DEBUG_FLAGS)                              \
        $(GTK_DEP_CFLAGS)                               \
        $(INCLUDED_IMMODULE_DEFINE)
@@ -109,6 +108,7 @@ libgtkincludedir = $(includedir)/gtk-3.0/gtk
 libadd = \
        $(top_builddir)/gdk/libgdk-3.la \
        $(top_builddir)/gtk/a11y/libgail.la \
+       $(GMODULE_LIBS) \
        $(GTK_DEP_LIBS)
 deps = \
        $(top_builddir)/gdk/libgdk-3.la \
@@ -143,6 +143,27 @@ endif
 
 # GTK+ header files for public installation (non-generated, or generated
 # by configure)
+
+deprecated_h_sources =                         \
+       deprecated/gtkfontsel.h         \
+       deprecated/gtkhandlebox.h       \
+       deprecated/gtkhbbox.h           \
+       deprecated/gtkhbox.h            \
+       deprecated/gtkhpaned.h          \
+       deprecated/gtkhscale.h          \
+       deprecated/gtkhscrollbar.h      \
+       deprecated/gtkhseparator.h      \
+       deprecated/gtkstyle.h           \
+       deprecated/gtkrc.h              \
+       deprecated/gtktable.h           \
+       deprecated/gtktearoffmenuitem.h \
+       deprecated/gtkvbbox.h           \
+       deprecated/gtkvbox.h            \
+       deprecated/gtkvscale.h          \
+       deprecated/gtkvscrollbar.h      \
+       deprecated/gtkvseparator.h      \
+       deprecated/gtkvpaned.h
+
 gtk_public_h_sources =                 \
        gtk.h                   \
        gtkx.h                  \
@@ -151,6 +172,7 @@ gtk_public_h_sources =              \
        gtkaccellabel.h         \
        gtkaccelmap.h           \
        gtkaccessible.h         \
+       gtkactionable.h         \
        gtkaction.h             \
        gtkactiongroup.h        \
        gtkactivatable.h        \
@@ -161,6 +183,7 @@ gtk_public_h_sources =              \
        gtkappchooserdialog.h   \
        gtkappchooserwidget.h   \
        gtkapplication.h        \
+       gtkapplicationwindow.h  \
        gtkarrow.h              \
        gtkaspectframe.h        \
        gtkassistant.h          \
@@ -217,20 +240,12 @@ gtk_public_h_sources =            \
        gtkfilefilter.h         \
        gtkfixed.h              \
        gtkfontbutton.h         \
-       gtkfontsel.h            \
-       gtkfontchooser.h        \
+       gtkfontchooser.h        \
        gtkfontchooserdialog.h  \
        gtkfontchooserwidget.h  \
        gtkframe.h              \
        gtkgradient.h           \
        gtkgrid.h               \
-       gtkhandlebox.h          \
-       gtkhbbox.h              \
-       gtkhbox.h               \
-       gtkhpaned.h             \
-       gtkhscale.h             \
-       gtkhscrollbar.h         \
-       gtkhseparator.h         \
        gtkhsv.h                \
        gtkiconfactory.h        \
        gtkicontheme.h          \
@@ -238,6 +253,7 @@ gtk_public_h_sources =              \
        gtkimage.h              \
        gtkimagemenuitem.h      \
        gtkimcontext.h          \
+       gtkimcontextinfo.h      \
        gtkimcontextsimple.h    \
        gtkimmodule.h           \
        gtkimmulticontext.h     \
@@ -277,7 +293,6 @@ gtk_public_h_sources =              \
        gtkradiomenuitem.h      \
        gtkradiotoolbutton.h    \
        gtkrange.h              \
-       gtkrc.h                 \
        gtkrecentaction.h       \
        gtkrecentchooser.h      \
        gtkrecentchooserdialog.h \
@@ -307,11 +322,8 @@ gtk_public_h_sources =             \
        gtkstylecontext.h       \
        gtkstyleproperties.h    \
        gtkstyleprovider.h      \
-       gtkstyle.h              \
        gtkswitch.h             \
        gtksymboliccolor.h      \
-       gtktable.h              \
-       gtktearoffmenuitem.h    \
        gtktestutils.h          \
        gtktextattributes.h     \
        gtktextbuffer.h         \
@@ -344,14 +356,8 @@ gtk_public_h_sources =             \
        gtktreeview.h           \
        gtktreeviewcolumn.h     \
        gtkuimanager.h          \
-       gtkvbbox.h              \
-       gtkvbox.h               \
        gtkviewport.h           \
        gtkvolumebutton.h       \
-       gtkvpaned.h             \
-       gtkvscale.h             \
-       gtkvscrollbar.h         \
-       gtkvseparator.h         \
        gtkwidget.h             \
        gtkwidgetpath.h         \
        gtkwindow.h
@@ -380,27 +386,46 @@ gtk_appchooser_impl_c_sources = \
        gtkappchooseronlinepk.c
 endif
 
+gtk_private_type_h_sources = \
+       gtkcsstypesprivate.h
+
+
 # GTK+ header files that don't get installed
 gtk_private_h_sources =                \
+       gactionmuxer.h          \
+       gsimpleactionobserver.h \
+       gactionobserver.h       \
+       gactionobservable.h     \
+       gtkapplicationprivate.h \
        gtkaccelgroupprivate.h  \
+       gtkaccelmapprivate.h    \
        gtkanimationdescription.h \
        gtkappchooserprivate.h  \
        gtkappchoosermodule.h   \
        gtkappchooseronline.h   \
        gtkbindingsprivate.h    \
+       gtkbitmaskprivate.h     \
        gtkborderimageprivate.h \
        gtkboxprivate.h         \
        gtkbuilderprivate.h     \
        gtkbuttonprivate.h      \
        gtkcellareaboxcontextprivate.h  \
        gtkcontainerprivate.h   \
+       gtkcsscomputedvaluesprivate.h \
+       gtkcsscustompropertyprivate.h \
+       gtkcssimagegradientprivate.h    \
+       gtkcssimageprivate.h    \
+       gtkcssimageurlprivate.h \
+       gtkcssimagewin32private.h       \
+       gtkcsslookupprivate.h   \
        gtkcssparserprivate.h   \
        gtkcssproviderprivate.h \
        gtkcsssectionprivate.h  \
        gtkcssselectorprivate.h \
-       gtkcsstypesprivate.h    \
+       gtkcssshorthandpropertyprivate.h \
+       gtkcssstylefuncsprivate.h \
+       gtkcssstylepropertyprivate.h \
        gtkcustompaperunixdialog.h \
-       gtkdndcursors.h         \
        gtkentryprivate.h       \
        gtkfilechooserdefault.h \
        gtkfilechooserembed.h   \
@@ -412,16 +437,21 @@ gtk_private_h_sources =           \
        gtkfontchooserprivate.h \
        gtkfontchooserutils.h   \
        gtkiconcache.h          \
+       gtkiconhelperprivate.h  \
+       gtkiconviewprivate.h    \
        gtkimageprivate.h       \
+       gtkimmoduleprivate.h    \
        gtkimcontextsimpleseqs.h \
        gtkintl.h               \
        gtkkeyhash.h            \
-       gtkmainprivate.h        \
        gtkmenuprivate.h        \
        gtkmenuitemprivate.h    \
        gtkmenushellprivate.h   \
        gtkmnemonichash.h       \
+       gtkmodelmenu.h          \
+       gtkmodelmenuitem.h      \
        gtkmodifierstyle.h      \
+       gtkmodulesprivate.h     \
        gtkmountoperationprivate.h \
        gtknumerableiconprivate.h \
        gtkorientableprivate.h  \
@@ -435,6 +465,7 @@ gtk_private_h_sources =             \
        gtkrecentchooserdefault.h \
        gtkrecentchooserprivate.h \
        gtkrecentchooserutils.h \
+       gtkresources.h          \
        gtkroundedboxprivate.h  \
        gtkscaleprivate.h       \
        gtksearchengine.h       \
@@ -447,6 +478,8 @@ gtk_private_h_sources =             \
        gtkstylecontextprivate.h \
        gtkstylepropertiesprivate.h \
        gtkstylepropertyprivate.h \
+       gtkstyleproviderprivate.h \
+       gtksymboliccolorprivate.h \
        gtktextbtree.h          \
        gtktextbufferserialize.h \
        gtktextchildprivate.h   \
@@ -456,19 +489,48 @@ gtk_private_h_sources =           \
        gtktexttagprivate.h     \
        gtktexttypes.h          \
        gtktextutil.h           \
+       gtkthemingbackgroundprivate.h \
        gtkthemingengineprivate.h \
        gtktimeline.h           \
        gtktoolpaletteprivate.h \
        gtktreedatalist.h       \
        gtktreeprivate.h        \
        gtkwidgetprivate.h      \
+       gtkwin32themeprivate.h  \
        gtkwindowprivate.h      \
        gtktreemenu.h           \
+       $(gtk_private_type_h_sources) \
        $(gtk_clipboard_dnd_h_sources) \
        $(gtk_appchooser_impl_h_sources)
 
 # GTK+ C sources to build the library from
+deprecated_c_sources =                         \
+       deprecated/gtkfontsel.c         \
+       deprecated/gtkhandlebox.c       \
+       deprecated/gtkhbbox.c           \
+       deprecated/gtkhbox.c            \
+       deprecated/gtkhpaned.c          \
+       deprecated/gtkhscale.c          \
+       deprecated/gtkhscrollbar.c      \
+       deprecated/gtkhseparator.c      \
+       deprecated/gtkrc.c              \
+       deprecated/gtkstyle.c           \
+       deprecated/gtktable.c           \
+       deprecated/gtktearoffmenuitem.c \
+       deprecated/gtkvbbox.c           \
+       deprecated/gtkvbox.c            \
+       deprecated/gtkvscale.c          \
+       deprecated/gtkvscrollbar.c      \
+       deprecated/gtkvseparator.c      \
+       deprecated/gtkvpaned.c
+
 gtk_base_c_sources =           \
+       $(deprecated_c_sources) \
+       gactionmuxer.c          \
+       gsimpleactionobserver.c \
+       gactionobserver.c       \
+       gactionobservable.c     \
+       gtkactionable.c         \
        gtkquery.c              \
        gtksearchengine.c       \
        gtksearchenginesimple.c \
@@ -490,6 +552,7 @@ gtk_base_c_sources =                \
        gtkappchoosermodule.c   \
        gtkappchooseronline.c   \
        gtkapplication.c        \
+       gtkapplicationwindow.c  \
        gtkanimationdescription.c \
        gtkarrow.c              \
        gtkaspectframe.c        \
@@ -497,12 +560,14 @@ gtk_base_c_sources =              \
        gtkbbox.c               \
        gtkbin.c                \
        gtkbindings.c           \
+       gtkbitmask.c            \
        gtkborder.c             \
-       gtkborderimage.c        \
+       gtkborderimage.c        \
        gtkbox.c                \
        gtkbuildable.c          \
        gtkbuilder.c            \
        gtkbuilderparser.c      \
+       gtkbuilder-menus.c      \
        gtkbutton.c             \
        gtkcalendar.c           \
        gtkcellarea.c           \
@@ -529,10 +594,22 @@ gtk_base_c_sources =              \
        gtkcombobox.c           \
        gtkcomboboxtext.c       \
        gtkcontainer.c          \
+       gtkcsscomputedvalues.c  \
+       gtkcsscustomproperty.c  \
+       gtkcssimage.c           \
+       gtkcssimagegradient.c   \
+       gtkcssimageurl.c        \
+       gtkcssimagewin32.c      \
+       gtkcsslookup.c          \
        gtkcssparser.c          \
        gtkcssprovider.c        \
        gtkcsssection.c         \
        gtkcssselector.c        \
+       gtkcssshorthandproperty.c \
+       gtkcssshorthandpropertyimpl.c \
+       gtkcssstylefuncs.c      \
+       gtkcssstyleproperty.c   \
+       gtkcssstylepropertyimpl.c \
        gtkcsstypes.c           \
        gtkdialog.c             \
        gtkdrawingarea.c        \
@@ -555,25 +632,18 @@ gtk_base_c_sources =              \
        gtkfilesystemmodel.c    \
        gtkfixed.c              \
        gtkfontbutton.c         \
-       gtkfontsel.c            \
-       gtkfontchooser.c        \
-       gtkfontchooserdialog.c  \
+       gtkfontchooser.c        \
+       gtkfontchooserdialog.c  \
        gtkfontchooserutils.c   \
        gtkfontchooserwidget.c  \
        gtkframe.c              \
        gtkgradient.c           \
        gtkgrid.c               \
-       gtkhandlebox.c          \
-       gtkhbbox.c              \
-       gtkhbox.c               \
-       gtkhpaned.c             \
-       gtkhscale.c             \
-       gtkhscrollbar.c         \
-       gtkhseparator.c         \
        gtkhsv.c                \
        gtkiconcache.c          \
        gtkiconcachevalidator.c \
        gtkiconfactory.c        \
+       gtkiconhelper.c         \
        gtkicontheme.c          \
        gtkiconview.c           \
        gtkimage.c              \
@@ -600,6 +670,8 @@ gtk_base_c_sources =                \
        gtkmessagedialog.c      \
        gtkmisc.c               \
        gtkmnemonichash.c       \
+       gtkmodelmenu.c          \
+       gtkmodelmenuitem.c      \
        gtkmodifierstyle.c      \
        gtkmodules.c            \
        gtkmountoperation.c     \
@@ -618,6 +690,8 @@ gtk_base_c_sources =                \
        gtkprintoperationpreview.c \
        gtkprintsettings.c      \
        gtkprintutils.c         \
+       gtkprivate.c            \
+       gtkprivatetypebuiltins.c \
        gtkprogressbar.c        \
        gtkradioaction.c        \
        gtkradiobutton.c        \
@@ -625,7 +699,6 @@ gtk_base_c_sources =                \
        gtkradiotoolbutton.c    \
        gtkrange.c              \
        gtkrbtree.c             \
-       gtkrc.c                 \
        gtkrecentaction.c       \
        gtkrecentchooserdefault.c \
        gtkrecentchooserdialog.c \
@@ -635,6 +708,7 @@ gtk_base_c_sources =                \
        gtkrecentchooser.c      \
        gtkrecentfilter.c       \
        gtkrecentmanager.c      \
+       gtkresources.c          \
        gtkroundedbox.c         \
        gtkscale.c              \
        gtkscalebutton.c        \
@@ -659,11 +733,9 @@ gtk_base_c_sources =               \
        gtkstyleproperties.c    \
        gtkstyleproperty.c      \
        gtkstyleprovider.c      \
-       gtkstyle.c              \
+       gtkstyleproviderprivate.c       \
        gtkswitch.c             \
        gtksymboliccolor.c      \
-       gtktable.c              \
-       gtktearoffmenuitem.c    \
        gtktestutils.c          \
        gtktextattributes.c     \
        gtktextbtree.c          \
@@ -681,6 +753,7 @@ gtk_base_c_sources =                \
        gtktexttypes.c          \
        gtktextutil.c           \
        gtktextview.c           \
+       gtkthemingbackground.c  \
        gtkthemingengine.c      \
        gtktimeline.c           \
        gtktoggleaction.c       \
@@ -706,17 +779,12 @@ gtk_base_c_sources =              \
        gtktreeviewcolumn.c     \
        gtktypebuiltins.c       \
        gtkuimanager.c          \
-       gtkvbbox.c              \
-       gtkvbox.c               \
        gtkvolumebutton.c       \
        gtkviewport.c           \
-       gtkvpaned.c             \
-       gtkvscale.c             \
-       gtkvscrollbar.c         \
-       gtkvseparator.c         \
        gtkwidget.c             \
        gtkwidgetpath.c         \
        gtkwindow.c             \
+       gtkwin32theme.c         \
        $(gtk_clipboard_dnd_c_sources) \
        $(gtk_appchooser_impl_c_sources)
 
@@ -734,7 +802,6 @@ gtk_os_unix_c_sources =             \
        gtkprintoperation-unix.c        \
        gtkprintunixdialog.c            \
         gtkprintbackend.c              \
-       gtksearchenginebeagle.c         \
        gtksearchenginetracker.c
 gtk_all_c_sources += $(gtk_os_unix_c_sources)
 if OS_UNIX
@@ -745,14 +812,14 @@ gtk_private_h_sources += \
        gtkprinteroption.h              \
        gtkprinteroptionset.h           \
        gtkprinteroptionwidget.h        \
-       gtksearchenginebeagle.h         \
        gtksearchenginetracker.h
 gtk_c_sources += $(gtk_os_unix_c_sources)
 endif
 
 gtk_os_win32_c_sources = \
        gtkprint-win32.c                \
-       gtkprintoperation-win32.c
+       gtkprintoperation-win32.c       \
+       gtkwin32.c
 gtk_all_c_sources += $(gtk_os_win32_c_sources)
 if OS_WIN32
 gtk_private_h_sources += gtkprint-win32.h
@@ -771,7 +838,10 @@ gtk_use_win32_c_sources =  \
        gtkmountoperation-stub.c
 gtk_use_quartz_c_sources =     \
        gtksearchenginequartz.c \
-       gtkmountoperation-stub.c
+       gtkmountoperation-stub.c \
+  gtkquartz-menu.h \
+  gtkquartz-menu.c \
+       gtkquartz.c
 gtk_use_stub_c_sources =       \
        gtkmountoperation-stub.c
 gtk_all_c_sources += $(gtk_use_x11_c_sources) $(gtk_use_win32_c_sources) $(gtk_use_quartz_c_sources) $(gtk_use_stub_c_sources)
@@ -790,7 +860,9 @@ gtk_c_sources += $(gtk_use_win32_c_sources)
 else
 if USE_QUARTZ
 gtk_private_h_sources +=       \
-       gtksearchenginequartz.h
+       gtksearchenginequartz.h \
+       gtkmenuquartz.h \
+       gtkquartz.h
 gtk_c_sources += $(gtk_use_quartz_c_sources)
 libgtk_3_la_CFLAGS = "-xobjective-c"
 
@@ -803,13 +875,17 @@ endif
 if USE_QUARTZ
 gtk_clipboard_dnd_c_sources =  \
        gtkclipboard-quartz.c   \
-       gtkdnd-quartz.c         \
-       gtkquartz.c
-gtk_clipboard_dnd_h_sources = gtkquartz.h
+       gtkdnd-quartz.c
+else
+if USE_WAYLAND
+# No wayland gtkdnd-wayland.c yet
+gtk_clipboard_dnd_c_sources =  \
+       gtkclipboard-wayland.c \
+       gtkdnd.c
 else
 gtk_clipboard_dnd_c_sources = gtkclipboard.c gtkdnd.c
 endif
-EXTRA_DIST += gtkquartz.h
+endif
 
 # we use our own built_sources variable rules to avoid automake's
 # BUILT_SOURCES oddities
@@ -823,19 +899,24 @@ gtk_built_public_sources =                        \
 
 # built headers that don't get installed
 gtk_built_private_headers =                    \
+       gtkresources.h                          \
        gtkmarshalers.h                         \
-       gtkbuiltincache.h
+       gtkbuiltincache.h                       \
+       gtkprivatetypebuiltins.h
 
 gtk_built_sources =                            \
+       gtkresources.c                          \
        gtktypebuiltins.c                       \
        gtktypefuncs.c                          \
        gtkmarshalers.c                         \
+       gtkprivatetypebuiltins.c                \
        ${gtk_built_private_headers}            \
        ${gtk_built_public_sources}
 
 stamp_files =                                  \
        stamp-gtkmarshalers.h                   \
        stamp-gtktypebuiltins.h                 \
+       stamp-gtkprivatetypebuiltins.h          \
        stamp-icons
 
 # non-header sources (headers should be specified in the above variables)
@@ -847,6 +928,7 @@ gtk_extra_sources =                         \
        gen-paper-names.c                       \
        gtkstatusicon-quartz.c                  \
        gtk.symbols                             \
+       gtk-win32.css                           \
        gtkversion.h.in                         \
        gtkmarshalers.list                      \
        fallback-c89.c
@@ -865,6 +947,13 @@ EXTRA_DIST += $(gtk_private_h_sources) $(gtk_extra_sources)
 EXTRA_DIST += $(gtk_built_sources)
 EXTRA_DIST += $(STOCK_ICONS)
 
+DND_CURSORS = \
+       cursor_dnd_ask.png                              \
+       cursor_dnd_copy.png                             \
+       cursor_dnd_link.png                             \
+       cursor_dnd_move.png                             \
+       cursor_dnd_none.png
+
 #
 # rules to generate built sources
 #
@@ -894,19 +983,41 @@ gtkmarshalers.c: @REBUILD@ gtkmarshalers.list
 
 gtktypebuiltins.h: stamp-gtktypebuiltins.h
        @true
-stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.h.template
+stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) $(deprecated_h_sources) gtktypebuiltins.h.template
        $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.h.template \
-               $(gtk_public_h_sources) ) >> xgen-gtbh \
+               $(gtk_public_h_sources) $(deprecated_h_sources) ) > xgen-gtbh \
        && (cmp -s xgen-gtbh gtktypebuiltins.h || cp xgen-gtbh gtktypebuiltins.h ) \
        && rm -f xgen-gtbh \
        && echo timestamp > $(@F)
-gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.c.template
+gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) $(deprecated_h_sources) gtktypebuiltins.c.template
        $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.c.template \
-               $(gtk_public_h_sources) ) > xgen-gtbc \
+               $(gtk_public_h_sources) $(deprecated_h_sources) ) > xgen-gtbc \
        && cp xgen-gtbc gtktypebuiltins.c  \
        && rm -f xgen-gtbc
 
-gtktypefuncs.c: @REBUILD@ stamp-gtktypebuiltins.h $(top_srcdir)/gtk/*.h $(top_srcdir)/gdk/*.h Makefile
+gtkresources.h: gtk.gresource.xml
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/gtk.gresource.xml \
+               --target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-header --manual-register
+gtkresources.c: gtk.gresource.xml gtk-default.css gtk-win32.css $(DND_CURSORS)
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/gtk.gresource.xml \
+               --target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-source --manual-register
+
+gtkprivatetypebuiltins.h: stamp-gtkprivatetypebuiltins.h
+       @true
+stamp-gtkprivatetypebuiltins.h: @REBUILD@ $(gtk_private_type_h_sources) gtkprivatetypebuiltins.h.template
+       $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtkprivatetypebuiltins.h.template \
+               $(gtk_private_type_h_sources) ) > xgen-gptbh \
+       && (cmp -s xgen-gptbh gtkprivatetypebuiltins.h || cp xgen-gptbh gtkprivatetypebuiltins.h ) \
+       && rm -f xgen-gptbh \
+       && echo timestamp > $(@F)
+gtkprivatetypebuiltins.c: @REBUILD@ $(gtk_private_type_h_sources)  gtkprivatetypebuiltins.c.template
+       $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtkprivatetypebuiltins.c.template \
+               $(gtk_private_type_h_sources) ) > xgen-gptbc \
+       && cp xgen-gptbc gtkprivatetypebuiltins.c  \
+       && rm -f xgen-gptbc
+
+
+gtktypefuncs.c: @REBUILD@ stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_srcdir)/gtk/*.h $(top_srcdir)/gtk/deprecated/*.h $(top_srcdir)/gdk/*.h Makefile
        $(AM_V_GEN) echo '#include <gtk/gtkx.h>' > xgen-gtfsrc.c && \
          ${CPP} $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
          $(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \
@@ -921,6 +1032,9 @@ lib_LTLIBRARIES = libgtk-3.la
 gtkincludedir = $(includedir)/gtk-3.0/gtk
 gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h
 
+deprecatedincludedir = $(includedir)/gtk-3.0/gtk/deprecated
+deprecatedinclude_HEADERS= $(deprecated_h_sources)
+
 gtkunixprintincludedir = $(includedir)/gtk-3.0/unix-print/gtk
 gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources)
 
@@ -955,7 +1069,7 @@ endif
 dist-hook: ../build/win32/vs9/gtk.vcproj ../build/win32/vs10/gtk.vcxproj ../build/win32/vs10/gtk.vcxproj.filters
 
 ../build/win32/vs9/gtk.vcproj: ../build/win32/vs9/gtk.vcprojin
-       for F in $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources); do \
+       for F in `echo $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources) | tr '/' '\\'`; do \
                case $$F in \
                *.c) echo '   <File RelativePath="..\..\..\gtk\'$$F'" />' \
                     ;; \
@@ -963,9 +1077,9 @@ dist-hook: ../build/win32/vs9/gtk.vcproj ../build/win32/vs10/gtk.vcxproj ../buil
        done >libgtk.sourcefiles
        $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtk.vcprojin >$@
        rm libgtk.sourcefiles
-       
+
 ../build/win32/vs10/gtk.vcxproj: ../build/win32/vs10/gtk.vcxprojin
-       for F in $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources); do \
+       for F in `echo $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources) | tr '/' '\\'`; do \
                case $$F in \
                *.c) echo '   <ClCompile Include="..\..\..\gtk\'$$F'" />' \
                     ;; \
@@ -973,9 +1087,9 @@ dist-hook: ../build/win32/vs9/gtk.vcproj ../build/win32/vs10/gtk.vcxproj ../buil
        done >libgtk.vs10.sourcefiles
        $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk.vcxprojin >$@
        rm libgtk.vs10.sourcefiles
-       
+
 ../build/win32/vs10/gtk.vcxproj.filters: ../build/win32/vs10/gtk.vcxproj.filtersin
-       for F in $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources); do \
+       for F in `echo $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources) | tr '/' '\\'`; do \
                case $$F in \
                *.c) echo '   <ClCompile Include="..\..\..\gtk\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
                     ;; \
@@ -1017,7 +1131,7 @@ LDADDS =                                                          \
 
 if HAVE_INTROSPECTION
 introspection_files = \
-    $(filter-out %private.h gtktextdisplay.h gtktextlayout.h, $(gtkinclude_HEADERS)) \
+    $(filter-out %private.h gtktextdisplay.h gtktextlayout.h, $(gtkinclude_HEADERS) $(deprecatedinclude_HEADERS)) \
     $(gtk_base_c_sources) \
     gtkprintoperation-unix.c \
     gtktypebuiltins.h \
@@ -1041,10 +1155,8 @@ endif
 Gtk_3_0_gir_SCANNERFLAGS += --c-include="gtk/gtkx.h"
 Gtk_3_0_gir_CFLAGS = \
                $(AM_CPPFLAGS) \
-               -UGDK_DISABLE_DEPRECATED \
-               -UGTK_DISABLE_DEPRECATED \
                -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
-Gtk_3_0_gir_LIBS = libgtk-3.la
+Gtk_3_0_gir_LIBS = libgtk-3.la $(top_builddir)/gdk/libgdk-3.la
 Gtk_3_0_gir_FILES = $(introspection_files)
 Gtk_3_0_gir_EXPORT_PACKAGES = gtk+-3.0
 INTROSPECTION_GIRS += Gtk-3.0.gir
@@ -1101,7 +1213,7 @@ endif
 endif
 
 gtk_query_immodules_3_0_DEPENDENCIES = $(DEPS)
-gtk_query_immodules_3_0_LDADD = $(LDADDS)
+gtk_query_immodules_3_0_LDADD = $(LDADDS) $(GMODULE_LIBS)
 gtk_query_immodules_3_0_SOURCES = queryimmodules.c
 
 if BUILD_ICON_CACHE
@@ -1350,7 +1462,6 @@ GENERATED_ICONS = \
        stock-icons/16/folder-remote.png                \
        stock-icons/16/user-home.png                    \
        stock-icons/16/user-desktop.png                 \
-       stock-icons/16/text-x-generic.png               \
        stock-icons/24/go-previous-rtl.png              \
        stock-icons/24/go-next-rtl.png                  \
        stock-icons/24/go-first-rtl.png                 \
@@ -1362,8 +1473,7 @@ GENERATED_ICONS = \
        stock-icons/24/document-save.png                \
        stock-icons/24/folder-remote.png                \
        stock-icons/24/user-home.png                    \
-       stock-icons/24/user-desktop.png                 \
-       stock-icons/24/text-x-generic.png
+       stock-icons/24/user-desktop.png
 
 # need to copy the icons so that we can replace the generated ones with
 # symlinks, even in the readonly srcdir case
@@ -1422,6 +1532,7 @@ endif
 
 EXTRA_DIST +=                   \
        $(STOCK_ICONS)          \
+       $(DND_CURSORS)          \
        $(GENERATED_ICONS)      \
        gtk.def                 \
        gtk-win32.rc            \
@@ -1433,6 +1544,8 @@ EXTRA_DIST +=                   \
        gtkprint-win32.c        \
        gtksearchenginequartz.h \
        gtk.css.raleigh         \
+       gtk.gresource.xml       \
+       gtk-default.css         \
        gtk-keys.css.default    \
        gtk-keys.css.emacs      \
        gtk-keys.css.mac        \
@@ -1441,6 +1554,8 @@ EXTRA_DIST +=                   \
        abicheck.sh             \
        gtktypebuiltins.c.template \
        gtktypebuiltins.h.template \
+       gtkprivatetypebuiltins.c.template \
+       gtkprivatetypebuiltins.h.template \
        org.gtk.Settings.FileChooser.gschema.xml
 
 gsettings_SCHEMAS = \