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
# 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
gtkactivatable.h \
gtkadjustment.h \
gtkalignment.h \
- gtkapplication.h \
+ gtkappchooser.h \
+ gtkappchooserdialog.h \
+ gtkappchooserbutton.h \
+ gtkappchooserwidget.h \
+ gtkapplication.h \
gtkarrow.h \
gtkaspectframe.h \
gtkassistant.h \
gtkcolorsel.h \
gtkcolorseldialog.h \
gtkcombobox.h \
- gtkcomboboxentry.h \
+ gtkcomboboxtext.h \
gtkcontainer.h \
gtkdebug.h \
gtkdialog.h \
gtkfontbutton.h \
gtkfontsel.h \
gtkframe.h \
+ gtkgrid.h \
gtkhandlebox.h \
gtkhbbox.h \
gtkhbox.h \
gtkhpaned.h \
- gtkhruler.h \
gtkhscale.h \
gtkhscrollbar.h \
gtkhseparator.h \
gtkimmulticontext.h \
gtkinfobar.h \
gtkinvisible.h \
- gtkitem.h \
gtklabel.h \
gtklayout.h \
gtklinkbutton.h \
gtkmodules.h \
gtkmountoperation.h \
gtknotebook.h \
- gtkobject.h \
gtkoffscreenwindow.h \
gtkorientable.h \
gtkpagesetup.h \
gtkprintoperation.h \
gtkprintoperationpreview.h \
gtkprintsettings.h \
- gtkprivate.h \
gtkprogressbar.h \
gtkradioaction.h \
gtkradiobutton.h \
gtkrecentchooserwidget.h \
gtkrecentfilter.h \
gtkrecentmanager.h \
- gtkruler.h \
gtkscale.h \
gtkscalebutton.h \
+ gtkscrollable.h \
gtkscrollbar.h \
gtkscrolledwindow.h \
gtkselection.h \
gtkstatusicon.h \
gtkstock.h \
gtkstyle.h \
+ gtkswitch.h \
gtktable.h \
gtktearoffmenuitem.h \
gtktestutils.h \
gtkviewport.h \
gtkvolumebutton.h \
gtkvpaned.h \
- gtkvruler.h \
gtkvscale.h \
gtkvscrollbar.h \
gtkvseparator.h \
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 \
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\
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 = \
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 \
gtkcolorsel.c \
gtkcolorseldialog.c \
gtkcombobox.c \
- gtkcomboboxentry.c \
+ gtkcomboboxtext.c \
gtkcontainer.c \
gtkdialog.c \
gtkdrawingarea.c \
gtkfilechooserdialog.c \
gtkfilechooserembed.c \
gtkfilechooserentry.c \
- gtkfilechoosersettings.c \
gtkfilechooserutils.c \
gtkfilechooserwidget.c \
gtkfilefilter.c \
gtkfontbutton.c \
gtkfontsel.c \
gtkframe.c \
+ gtkgrid.c \
gtkhandlebox.c \
gtkhbbox.c \
gtkhbox.c \
gtkhpaned.c \
- gtkhruler.c \
gtkhscale.c \
gtkhscrollbar.c \
gtkhseparator.c \
gtkimmulticontext.c \
gtkinfobar.c \
gtkinvisible.c \
- gtkitem.c \
gtkkeyhash.c \
gtklabel.c \
gtklayout.c \
gtkmodules.c \
gtkmountoperation.c \
gtknotebook.c \
- gtkobject.c \
gtkoffscreenwindow.c \
gtkorientable.c \
gtkpagesetup.c \
gtkrecentchooser.c \
gtkrecentfilter.c \
gtkrecentmanager.c \
- gtkruler.c \
gtkscale.c \
gtkscalebutton.c \
+ gtkscrollable.c \
gtkscrollbar.c \
gtkscrolledwindow.c \
gtkselection.c \
gtkstatusicon.c \
gtkstock.c \
gtkstyle.c \
+ gtkswitch.c \
gtktable.c \
gtktearoffmenuitem.c \
gtktestutils.c \
gtkvolumebutton.c \
gtkviewport.c \
gtkvpaned.c \
- gtkvruler.c \
gtkvscale.c \
gtkvscrollbar.c \
gtkvseparator.c \
gtkwidget.c \
gtkwindow-decorate.c \
gtkwindow.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)
# built headers that don't get installed
gtk_built_private_headers = \
gtkmarshalers.h \
- gtkbuiltincache.h \
- gtkimcontextsimpleseqs.h
+ gtkbuiltincache.h
gtk_built_sources = \
gtktypebuiltins.c \
libgtk_x11_3_0_la_SOURCES = $(gtk_c_sources)
libgtk_win32_3_0_la_SOURCES = $(gtk_c_sources)
libgtk_quartz_3_0_la_SOURCES = $(gtk_c_sources)
-libgtk_directfb_3_0_la_SOURCES = $(gtk_c_sources)
libgtk_x11_3_0_la_LDFLAGS = $(libtool_opts)
libgtk_win32_3_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
libgtk_quartz_3_0_la_LDFLAGS = $(libtool_opts)
-libgtk_directfb_3_0_la_LDFLAGS = $(libtool_opts)
libgtk_x11_3_0_la_LIBADD = $(libadd)
libgtk_win32_3_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
libgtk_quartz_3_0_la_LIBADD = $(libadd)
-libgtk_directfb_3_0_la_LIBADD = $(libadd)
libgtk_x11_3_0_la_DEPENDENCIES = $(deps)
libgtk_win32_3_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps)
libgtk_quartz_3_0_la_DEPENDENCIES = $(deps)
-libgtk_directfb_3_0_la_DEPENDENCIES = $(deps)
if USE_WIN32
libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
endif
-EXTRA_LTLIBRARIES = libgtk-x11-3.0.la libgtk-win32-3.0.la libgtk-quartz-3.0.la libgtk-directfb-3.0.la
+EXTRA_LTLIBRARIES = libgtk-x11-3.0.la libgtk-win32-3.0.la libgtk-quartz-3.0.la
install-exec-hook:
if DISABLE_EXPLICIT_DEPS
if HAVE_INTROSPECTION
introspection_files = \
- $(gtkinclude_HEADERS) \
- $(gtk_all_c_sources) \
+ $(filter-out %private.h gtktextlayout.h, $(gtkinclude_HEADERS)) \
+ $(gtk_base_c_sources) \
gtktypebuiltins.h \
gtktypebuiltins.c
Gtk-3.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) $(top_builddir)/gdk/Gdk-3.0.gir Makefile
-Gtk_3_0_gir_SCANNERFLAGS = --strip-prefix=Gtk --add-include-path=$(top_builddir)/gdk
+Gtk_3_0_gir_SCANNERFLAGS = --warn-all --add-include-path=$(top_builddir)/gdk
if USE_X11
Gtk_3_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
endif
-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
# Workaround for UAC silliness: programs with "update" in their name
# are believed to be installers and require elevated privileges to be
# used... Use a manifest file to tell Windows that
-# gtk-update-icon-cache.exe doesn't require any special privileges.
+# gtk-update-icon-cache-3.0.exe doesn't require any special privileges.
GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache-3.0.exe.manifest
bin_SCRIPTS += \
$(GTK_UPDATE_ICON_CACHE_MANIFEST)
-gtk-update-icon-cache.exe.manifest:
+$(GTK_UPDATE_ICON_CACHE_MANIFEST):
(echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' ; \
echo '<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">' ; \
echo ' <assemblyIdentity version="1.0.0.0"' ; \
stock-icons/16/format-indent-more-ltr.png \
stock-icons/16/format-indent-more-rtl.png \
stock-icons/16/gtk-index.png \
- stock-icons/16/dialog-info.png \
+ stock-icons/16/dialog-information.png \
stock-icons/16/go-jump-ltr.png \
stock-icons/16/go-jump-rtl.png \
stock-icons/16/format-justify-center.png \
stock-icons/16/document-open.png \
stock-icons/16/gtk-page-setup.png \
stock-icons/16/edit-paste.png \
- stock-icons/16/edit-preferences.png \
+ stock-icons/16/gtk-preferences.png \
stock-icons/16/document-print.png \
stock-icons/16/printer-error.png \
stock-icons/16/printer-paused.png \
stock-icons/24/format-indent-more-ltr.png \
stock-icons/24/format-indent-more-rtl.png \
stock-icons/24/gtk-index.png \
- stock-icons/24/dialog-info.png \
+ stock-icons/24/dialog-information.png \
stock-icons/24/format-text-italic.png \
stock-icons/24/go-jump-ltr.png \
stock-icons/24/go-jump-rtl.png \
stock-icons/24/gtk-orientation-portrait.png \
stock-icons/24/gtk-page-setup.png \
stock-icons/24/edit-paste.png \
- stock-icons/24/edit-preferences.png \
+ stock-icons/24/gtk-preferences.png \
stock-icons/24/document-print.png \
stock-icons/24/printer-error.png \
stock-icons/24/printer-paused.png \
stock-icons/32/gtk-dnd.png \
stock-icons/48/dialog-password.png \
stock-icons/48/dialog-error.png \
- stock-icons/48/dialog-info.png \
+ stock-icons/48/dialog-information.png \
stock-icons/48/dialog-question.png \
stock-icons/48/dialog-warning.png
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:
projects / ~andy / gtk / blobdiff