docs: Replace mentions of drawable with window in migration guide

[~andy/gtk] / gtk / Makefile.am

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 60057e575f8dcf7781607efd121b61cf3a82ef4f..6aa8e5890e533210433ff80de7498d1710064105 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -16,7 +16,7 @@ GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %
 endif
 
 SUBDIRS = theme-bits . tests
-DIST_SUBDIRS=theme-bits tests
+DIST_SUBDIRS = theme-bits tests
 
 if HAVE_PAPI_CUPS
 GTK_PRINT_BACKENDS=file,papi,cups
@@ -101,7 +101,7 @@ endif
 # This places the generated .def file in srcdir, since it is expected to be there.
 # (The one from a tarball is)
 gtk.def: gtk.symbols
-       (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gtk.symbols | $(SED) -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gtk.def
+       (echo -e EXPORTS; $(CPP) -P -DG_OS_WIN32 - <$(srcdir)/gtk.symbols | $(SED) -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gtk.def
 
 TESTS_ENVIRONMENT = srcdir="$(srcdir)" gtk_all_c_sources="$(gtk_all_c_sources)"
 if OS_LINUX
@@ -156,7 +156,11 @@ gtk_public_h_sources =          \
        gtkactivatable.h        \
        gtkadjustment.h         \
        gtkalignment.h          \
-       gtkapplication.h    \
+       gtkappchooser.h         \
+       gtkappchooserdialog.h   \
+       gtkappchooserbutton.h   \
+       gtkappchooserwidget.h   \
+       gtkapplication.h        \
        gtkarrow.h              \
        gtkaspectframe.h        \
        gtkassistant.h          \
@@ -187,7 +191,7 @@ gtk_public_h_sources =          \
        gtkcolorsel.h           \
        gtkcolorseldialog.h     \
        gtkcombobox.h           \
-       gtkcomboboxentry.h      \
+       gtkcomboboxtext.h       \
        gtkcontainer.h          \
        gtkdebug.h              \
        gtkdialog.h             \
@@ -209,11 +213,11 @@ gtk_public_h_sources =          \
        gtkfontbutton.h         \
        gtkfontsel.h            \
        gtkframe.h              \
+       gtkgrid.h               \
        gtkhandlebox.h          \
        gtkhbbox.h              \
        gtkhbox.h               \
        gtkhpaned.h             \
-       gtkhruler.h             \
        gtkhscale.h             \
        gtkhscrollbar.h         \
        gtkhseparator.h         \
@@ -244,7 +248,6 @@ gtk_public_h_sources =          \
        gtkmodules.h            \
        gtkmountoperation.h     \
        gtknotebook.h           \
-       gtkobject.h             \
        gtkoffscreenwindow.h    \
        gtkorientable.h         \
        gtkpagesetup.h          \
@@ -255,7 +258,6 @@ gtk_public_h_sources =          \
        gtkprintoperation.h     \
        gtkprintoperationpreview.h      \
        gtkprintsettings.h      \
-       gtkprivate.h            \
        gtkprogressbar.h        \
        gtkradioaction.h        \
        gtkradiobutton.h        \
@@ -270,9 +272,9 @@ gtk_public_h_sources =          \
        gtkrecentchooserwidget.h \
        gtkrecentfilter.h       \
        gtkrecentmanager.h      \
-       gtkruler.h              \
        gtkscale.h              \
        gtkscalebutton.h        \
+       gtkscrollable.h         \
        gtkscrollbar.h          \
        gtkscrolledwindow.h     \
        gtkselection.h          \
@@ -290,6 +292,7 @@ gtk_public_h_sources =          \
        gtkstatusicon.h         \
        gtkstock.h              \
        gtkstyle.h              \
+       gtkswitch.h             \
        gtktable.h              \
        gtktearoffmenuitem.h    \
        gtktestutils.h          \
@@ -328,13 +331,11 @@ gtk_public_h_sources =          \
        gtkviewport.h           \
        gtkvolumebutton.h       \
        gtkvpaned.h             \
-       gtkvruler.h             \
        gtkvscale.h             \
        gtkvscrollbar.h         \
        gtkvseparator.h         \
        gtkwidget.h             \
-       gtkwindow.h             \
-       gtkwrapbox.h
+       gtkwindow.h
 
 if OS_UNIX
 gtk_unix_print_public_h_sources =    \
@@ -350,8 +351,21 @@ endif
 gtk_semi_private_h_sources =    \
        gtktextlayout.h
 
+if ENABLE_PACKAGEKIT
+gtk_appchooser_impl_h_sources = \
+       gtkappchooseronlinepk.h \
+       $(NULL)
+endif
+
+if ENABLE_PACKAGEKIT
+gtk_appchooser_impl_c_sources = \
+       gtkappchooseronlinepk.c \
+       $(NULL)
+endif
+
 # GTK+ header files that don't get installed
 gtk_private_h_sources =                \
+       gtkbuttonprivate.h      \
        gtkquery.h              \
        gtksearchengine.h       \
        gtksearchenginesimple.h \
@@ -363,25 +377,30 @@ gtk_private_h_sources =           \
        gtkfilechooserembed.h   \
        gtkfilechooserentry.h   \
        gtkfilechooserprivate.h \
-       gtkfilechoosersettings.h \
        gtkfilechooserutils.h   \
        gtkfilesystem.h         \
        gtkfilesystemmodel.h    \
        gtkiconcache.h          \
+       gtkimcontextsimpleseqs.h   \
        gtkintl.h               \
        gtkkeyhash.h            \
        gtkmenuprivate.h        \
        gtkmnemonichash.h       \
        gtkmountoperationprivate.h \
+       gtkappchooserprivate.h  \
+       gtkappchoosermodule.h   \
+       gtkappchooseronline.h   \
        gtkpango.h              \
        gtkpathbar.h            \
        gtkplugprivate.h        \
        gtkprintoperation-private.h\
        gtkprintutils.h         \
+       gtkprivate.h            \
        gtkrbtree.h             \
        gtkrecentchooserdefault.h \
        gtkrecentchooserprivate.h \
        gtkrecentchooserutils.h \
+       gtksizegroup-private.h  \
        gtksocketprivate.h      \
        gtktextbtree.h          \
        gtktextbufferserialize.h\
@@ -397,7 +416,9 @@ gtk_private_h_sources =             \
        gtktreedatalist.h       \
        gtktreeprivate.h        \
        gtkwindow-decorate.h    \
-       $(gtk_clipboard_dnd_h_sources)
+       gtkwidgetprivate.h      \
+       $(gtk_clipboard_dnd_h_sources) \
+       $(gtk_appchooser_impl_h_sources)
 
 # GTK+ C sources to build the library from
 gtk_base_c_sources =            \
@@ -415,7 +436,13 @@ gtk_base_c_sources =            \
        gtkactivatable.c        \
        gtkadjustment.c         \
        gtkalignment.c          \
-       gtkapplication.c \
+       gtkappchooser.c         \
+       gtkappchooserwidget.c   \
+       gtkappchooserbutton.c   \
+       gtkappchooserdialog.c   \
+       gtkappchoosermodule.c   \
+       gtkappchooseronline.c   \
+       gtkapplication.c        \
        gtkarrow.c              \
        gtkaspectframe.c        \
        gtkassistant.c          \
@@ -446,7 +473,7 @@ gtk_base_c_sources =            \
        gtkcolorsel.c           \
        gtkcolorseldialog.c     \
        gtkcombobox.c           \
-       gtkcomboboxentry.c      \
+       gtkcomboboxtext.c       \
        gtkcontainer.c          \
        gtkdialog.c             \
        gtkdrawingarea.c        \
@@ -462,7 +489,6 @@ gtk_base_c_sources =            \
        gtkfilechooserdialog.c  \
        gtkfilechooserembed.c   \
        gtkfilechooserentry.c   \
-       gtkfilechoosersettings.c \
        gtkfilechooserutils.c   \
        gtkfilechooserwidget.c  \
        gtkfilefilter.c         \
@@ -472,11 +498,11 @@ gtk_base_c_sources =            \
        gtkfontbutton.c         \
        gtkfontsel.c            \
        gtkframe.c              \
+       gtkgrid.c               \
        gtkhandlebox.c          \
        gtkhbbox.c              \
        gtkhbox.c               \
        gtkhpaned.c             \
-       gtkhruler.c             \
        gtkhscale.c             \
        gtkhscrollbar.c         \
        gtkhseparator.c         \
@@ -512,7 +538,6 @@ gtk_base_c_sources =            \
        gtkmodules.c            \
        gtkmountoperation.c     \
        gtknotebook.c           \
-       gtkobject.c             \
        gtkoffscreenwindow.c    \
        gtkorientable.c         \
        gtkpagesetup.c          \
@@ -543,9 +568,9 @@ gtk_base_c_sources =            \
        gtkrecentchooser.c      \
        gtkrecentfilter.c       \
        gtkrecentmanager.c      \
-       gtkruler.c              \
        gtkscale.c              \
        gtkscalebutton.c        \
+       gtkscrollable.c         \
        gtkscrollbar.c          \
        gtkscrolledwindow.c     \
        gtkselection.c          \
@@ -563,6 +588,7 @@ gtk_base_c_sources =            \
        gtkstatusicon.c         \
        gtkstock.c              \
        gtkstyle.c              \
+       gtkswitch.c             \
        gtktable.c              \
        gtktearoffmenuitem.c    \
        gtktestutils.c          \
@@ -610,15 +636,14 @@ gtk_base_c_sources =            \
        gtkvolumebutton.c       \
        gtkviewport.c           \
        gtkvpaned.c             \
-       gtkvruler.c             \
        gtkvscale.c             \
        gtkvscrollbar.c         \
        gtkvseparator.c         \
        gtkwidget.c             \
        gtkwindow-decorate.c    \
        gtkwindow.c             \
-       gtkwrapbox.c            \
-       $(gtk_clipboard_dnd_c_sources)
+       $(gtk_clipboard_dnd_c_sources) \
+       $(gtk_appchooser_impl_c_sources)
 
 gtk_c_sources = $(gtk_base_c_sources)
 gtk_all_c_sources = $(gtk_base_c_sources)
@@ -722,8 +747,7 @@ gtk_built_public_sources =                  \
 # built headers that don't get installed
 gtk_built_private_headers =                    \
        gtkmarshalers.h                         \
-       gtkbuiltincache.h                       \
-       gtkimcontextsimpleseqs.h
+       gtkbuiltincache.h
 
 gtk_built_sources =                            \
        gtktypebuiltins.c                       \
@@ -898,7 +922,7 @@ LDADDS =                                                            \
 
 if HAVE_INTROSPECTION
 introspection_files = \
-    $(filter-out gtktextlayout.h, $(gtkinclude_HEADERS)) \
+    $(filter-out %private.h gtktextlayout.h, $(gtkinclude_HEADERS)) \
     $(gtk_base_c_sources) \
     gtktypebuiltins.h \
     gtktypebuiltins.c
@@ -915,6 +939,9 @@ Gtk_3_0_gir_CFLAGS = \
                -UGTK_DISABLE_DEPRECATED \
                -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
 Gtk_3_0_gir_LIBS = $(gtktargetlib)
+if USE_X11
+Gtk_3_0_gir_LIBS += $(top_builddir)/gdk/libgdk-x11-3.0.la
+endif
 Gtk_3_0_gir_FILES = $(introspection_files)
 INTROSPECTION_GIRS += Gtk-3.0.gir
 
@@ -1306,9 +1333,14 @@ EXTRA_DIST +=                   \
        makefile.msc            \
        makefile.msc.in         \
        abicheck.sh             \
-       gtktypebuiltins.c.template      \
-       gtktypebuiltins.h.template
+       gtktypebuiltins.c.template \
+       gtktypebuiltins.h.template \
+       org.gtk.Settings.FileChooser.gschema.xml
+
+gsettings_SCHEMAS = \
+       org.gtk.Settings.FileChooser.gschema.xml
 
+@GSETTINGS_RULES@
 
 install-data-local: