-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
INTROSPECTION_SCANNER_ARGS = \
- --add-include-path=../gdk
+ --add-include-path=../gdk \
+ --warn-all
INTROSPECTION_COMPILER_ARGS = \
--includedir=$(srcdir) \
--includedir=. \
GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
endif
-SUBDIRS = theme-bits . tests
-DIST_SUBDIRS = theme-bits tests
+SUBDIRS = . a11y tests
if HAVE_PAPI_CUPS
GTK_PRINT_BACKENDS=file,papi,cups
$(gtk_clipboard_dnd_c_sources_CFLAGS) \
$(INCLUDED_IMMODULE_DEFINE)
-gtarget=$(gdktarget)
-
if PLATFORM_WIN32
no_undefined = -no-undefined
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 -DG_OS_WIN32 - <$(srcdir)/gtk.symbols | $(SED) -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gtk.def
+ $(AM_V_GEN) (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
endif
libgtkincludedir = $(includedir)/gtk-3.0/gtk
-libadd = \
- $(top_builddir)/gdk/$(gdktargetlib) \
+libadd = \
+ $(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS)
deps =
# GTK+ header files for public installation (non-generated, or generated
# by configure)
-gtk_public_h_sources = \
+gtk_public_h_sources = \
gtk.h \
+ gtkx.h \
gtkaboutdialog.h \
gtkaccelgroup.h \
gtkaccellabel.h \
gtkaccessible.h \
gtkaction.h \
gtkactiongroup.h \
- gtkaccelgroupprivate.h \
gtkactivatable.h \
gtkadjustment.h \
gtkalignment.h \
gtkappchooser.h \
+ gtkappchooserbutton.h \
gtkappchooserdialog.h \
- gtkappchooserbutton.h \
gtkappchooserwidget.h \
- gtkapplication.h \
+ gtkapplication.h \
gtkarrow.h \
gtkaspectframe.h \
gtkassistant.h \
gtkbbox.h \
gtkbin.h \
gtkbindings.h \
+ gtkborder.h \
gtkbox.h \
gtkbuilder.h \
gtkbuildable.h \
gtkbutton.h \
gtkcalendar.h \
+ gtkcellarea.h \
+ gtkcellareacontext.h \
+ gtkcellareabox.h \
gtkcelleditable.h \
gtkcelllayout.h \
gtkcellrenderer.h \
gtkcellrenderercombo.h \
gtkcellrendererpixbuf.h \
gtkcellrendererprogress.h \
- gtkcellrendererspin.h \
+ gtkcellrendererspin.h \
gtkcellrendererspinner.h\
gtkcellrenderertext.h \
gtkcellrenderertoggle.h \
gtkcomboboxtext.h \
gtkcontainer.h \
gtkcssprovider.h \
- gtkdebug.h \
+ gtkdebug.h \
gtkdialog.h \
gtkdnd.h \
gtkdrawingarea.h \
- gtkeditable.h \
+ gtkeditable.h \
gtkentry.h \
gtkentrybuffer.h \
gtkentrycompletion.h \
gtkenums.h \
gtkeventbox.h \
gtkexpander.h \
- gtkfilechooser.h \
- gtkfilechooserbutton.h \
- gtkfilechooserdialog.h \
- gtkfilechooserwidget.h \
+ gtkfilechooser.h \
+ gtkfilechooserbutton.h \
+ gtkfilechooserdialog.h \
+ gtkfilechooserwidget.h \
gtkfilefilter.h \
gtkfixed.h \
gtkfontbutton.h \
gtkfontsel.h \
gtkframe.h \
+ gtkgradient.h \
gtkgrid.h \
gtkhandlebox.h \
gtkhbbox.h \
gtkinfobar.h \
gtkinvisible.h \
gtklabel.h \
- gtklayout.h \
+ gtklayout.h \
gtklinkbutton.h \
gtkliststore.h \
+ gtklockbutton.h \
gtkmain.h \
gtkmenu.h \
gtkmenubar.h \
gtkmessagedialog.h \
gtkmisc.h \
gtkmodules.h \
- gtkmountoperation.h \
+ gtkmountoperation.h \
gtknotebook.h \
+ gtknumerableicon.h \
gtkoffscreenwindow.h \
gtkorientable.h \
+ gtkoverlay.h \
gtkpagesetup.h \
gtkpaned.h \
gtkpapersize.h \
gtkplug.h \
gtkprintcontext.h \
gtkprintoperation.h \
- gtkprintoperationpreview.h \
+ gtkprintoperationpreview.h \
gtkprintsettings.h \
gtkprogressbar.h \
gtkradioaction.h \
gtkrange.h \
gtkrc.h \
gtkrecentaction.h \
- gtkrecentchooser.h \
+ gtkrecentchooser.h \
gtkrecentchooserdialog.h \
- gtkrecentchoosermenu.h \
+ gtkrecentchoosermenu.h \
gtkrecentchooserwidget.h \
- gtkrecentfilter.h \
- gtkrecentmanager.h \
+ gtkrecentfilter.h \
+ gtkrecentmanager.h \
gtkscale.h \
gtkscalebutton.h \
- gtkscrollable.h \
+ gtkscrollable.h \
gtkscrollbar.h \
gtkscrolledwindow.h \
gtkselection.h \
gtkseparator.h \
gtkseparatormenuitem.h \
gtkseparatortoolitem.h \
- gtkshow.h \
gtksettings.h \
+ gtkshow.h \
gtksizegroup.h \
gtksizerequest.h \
gtksocket.h \
gtkstatusicon.h \
gtkstock.h \
gtkstylecontext.h \
+ gtkstyleproperties.h \
gtkstyleprovider.h \
- gtkstyleset.h \
gtkstyle.h \
gtkswitch.h \
gtksymboliccolor.h \
gtktable.h \
- gtktearoffmenuitem.h \
+ gtktearoffmenuitem.h \
gtktestutils.h \
+ gtktextattributes.h \
gtktextbuffer.h \
gtktextbufferrichtext.h \
gtktextchild.h \
gtktreestore.h \
gtktreeview.h \
gtktreeviewcolumn.h \
- gtktypeutils.h \
gtkuimanager.h \
gtkvbbox.h \
gtkvbox.h \
gtkwindow.h
if OS_UNIX
-gtk_unix_print_public_h_sources = \
+gtk_unix_print_public_h_sources = \
gtkpagesetupunixdialog.h \
gtkprintunixdialog.h \
gtkprinter.h \
# Installed header files without compatibility guarantees
# that are not included in gtk/gtk.h
-gtk_semi_private_h_sources = \
+gtk_semi_private_h_sources = \
gtktextlayout.h
if ENABLE_PACKAGEKIT
gtk_appchooser_impl_h_sources = \
- gtkappchooseronlinepk.h \
- $(NULL)
+ gtkappchooseronlinepk.h
endif
if ENABLE_PACKAGEKIT
gtk_appchooser_impl_c_sources = \
- gtkappchooseronlinepk.c \
- $(NULL)
+ gtkappchooseronlinepk.c
endif
# GTK+ header files that don't get installed
gtk_private_h_sources = \
+ gtkaccelgroupprivate.h \
+ gtkaccessibleprivate.h \
+ gtkanimationdescription.h \
+ gtkappchooserprivate.h \
+ gtkappchoosermodule.h \
+ gtkappchooseronline.h \
+ gtkbindingsprivate.h \
+ gtkborderimageprivate.h \
+ gtkbuilderprivate.h \
gtkbuttonprivate.h \
- gtkquery.h \
- gtksearchengine.h \
- gtksearchenginesimple.h \
+ gtkcellareaboxcontextprivate.h \
+ gtkcontainerprivate.h \
+ gtkcssparserprivate.h \
+ gtkcssproviderprivate.h \
+ gtkcssselectorprivate.h \
+ gtkcsstypesprivate.h \
+ gtkcustompaperunixdialog.h \
gtkdndcursors.h \
gtkentryprivate.h \
- gtkanimationdescription.h \
- gtkbuilderprivate.h \
- gtkcustompaperunixdialog.h\
gtkfilechooserdefault.h \
gtkfilechooserembed.h \
gtkfilechooserentry.h \
gtkfilesystem.h \
gtkfilesystemmodel.h \
gtkiconcache.h \
- gtkimcontextsimpleseqs.h \
+ gtkimageprivate.h \
+ gtkimcontextsimpleseqs.h \
gtkintl.h \
gtkkeyhash.h \
+ gtkmainprivate.h \
gtkmenuprivate.h \
+ gtkmenuitemprivate.h \
+ gtkmenushellprivate.h \
gtkmnemonichash.h \
+ gtkmodifierstyle.h \
gtkmountoperationprivate.h \
- gtkappchooserprivate.h \
- gtkappchoosermodule.h \
- gtkappchooseronline.h \
+ gtknumerableiconprivate.h \
+ gtkorientableprivate.h \
gtkpango.h \
gtkpathbar.h \
- gtkplugprivate.h \
- gtkprintoperation-private.h\
+ gtkprintoperation-private.h \
gtkprintutils.h \
gtkprivate.h \
+ gtkquery.h \
gtkrbtree.h \
gtkrecentchooserdefault.h \
gtkrecentchooserprivate.h \
- gtkrecentchooserutils.h \
+ gtkrecentchooserutils.h \
+ gtkroundedboxprivate.h \
+ gtkscaleprivate.h \
+ gtksearchengine.h \
+ gtksearchenginesimple.h \
+ gtkselectionprivate.h \
+ gtksettingsprivate.h \
+ gtkshadowprivate.h \
gtksizegroup-private.h \
gtksocketprivate.h \
+ gtkstylecontextprivate.h \
+ gtkstylepropertiesprivate.h \
+ gtkstylepropertyprivate.h \
gtktextbtree.h \
- gtktextbufferserialize.h\
+ gtktextbufferserialize.h \
gtktextchildprivate.h \
gtktextiterprivate.h \
gtktextmarkprivate.h \
gtktexttagprivate.h \
gtktexttypes.h \
gtktextutil.h \
+ gtkthemingengineprivate.h \
gtktimeline.h \
- gtkthemes.h \
gtktoolpaletteprivate.h \
gtktreedatalist.h \
gtktreeprivate.h \
- gtkwindow-decorate.h \
gtkwidgetprivate.h \
+ gtkwindowprivate.h \
+ gtktreemenu.h \
$(gtk_clipboard_dnd_h_sources) \
$(gtk_appchooser_impl_h_sources)
# GTK+ C sources to build the library from
-gtk_base_c_sources = \
+gtk_base_c_sources = \
gtkquery.c \
gtksearchengine.c \
gtksearchenginesimple.c \
gtkalignment.c \
gtkappchooser.c \
gtkappchooserwidget.c \
- gtkappchooserbutton.c \
+ gtkappchooserbutton.c \
gtkappchooserdialog.c \
gtkappchoosermodule.c \
gtkappchooseronline.c \
- gtkapplication.c \
+ gtkapplication.c \
gtkanimationdescription.c \
gtkarrow.c \
gtkaspectframe.c \
gtkbbox.c \
gtkbin.c \
gtkbindings.c \
+ gtkborder.c \
+ gtkborderimage.c \
gtkbox.c \
gtkbuildable.c \
gtkbuilder.c \
gtkbuilderparser.c \
gtkbutton.c \
gtkcalendar.c \
+ gtkcellarea.c \
+ gtkcellareabox.c \
+ gtkcellareaboxcontext.c \
+ gtkcellareacontext.c \
gtkcelleditable.c \
gtkcelllayout.c \
gtkcellrenderer.c \
gtkcellrenderercombo.c \
gtkcellrendererpixbuf.c \
gtkcellrendererprogress.c \
- gtkcellrendererspin.c \
- gtkcellrendererspinner.c\
+ gtkcellrendererspin.c \
+ gtkcellrendererspinner.c \
gtkcellrenderertext.c \
gtkcellrenderertoggle.c \
gtkcellview.c \
gtkcolorsel.c \
gtkcolorseldialog.c \
gtkcombobox.c \
- gtkcomboboxtext.c \
+ gtkcomboboxtext.c \
gtkcontainer.c \
+ gtkcssparser.c \
gtkcssprovider.c \
+ gtkcssselector.c \
+ gtkcsstypes.c \
gtkdialog.c \
gtkdrawingarea.c \
- gtkeditable.c \
+ gtkeditable.c \
gtkentry.c \
gtkentrybuffer.c \
gtkentrycompletion.c \
gtkfilesystem.c \
gtkfilesystemmodel.c \
gtkfixed.c \
- gtkfontbutton.c \
- gtkfontsel.c \
+ gtkfontbutton.c \
+ gtkfontsel.c \
gtkframe.c \
+ gtkgradient.c \
gtkgrid.c \
gtkhandlebox.c \
gtkhbbox.c \
gtklayout.c \
gtklinkbutton.c \
gtkliststore.c \
+ gtklockbutton.c \
gtkmain.c \
gtkmarshalers.c \
gtkmenu.c \
gtkmessagedialog.c \
gtkmisc.c \
gtkmnemonichash.c \
+ gtkmodifierstyle.c \
gtkmodules.c \
- gtkmountoperation.c \
+ gtkmountoperation.c \
gtknotebook.c \
+ gtknumerableicon.c \
gtkoffscreenwindow.c \
gtkorientable.c \
+ gtkoverlay.c \
gtkpagesetup.c \
gtkpaned.c \
gtkpango.c \
gtkpapersize.c \
gtkpathbar.c \
- gtkplug.c \
gtkprintcontext.c \
gtkprintoperation.c \
- gtkprintoperationpreview.c \
+ gtkprintoperationpreview.c \
gtkprintsettings.c \
gtkprintutils.c \
gtkprogressbar.c \
gtkradiomenuitem.c \
gtkradiotoolbutton.c \
gtkrange.c \
- gtkrbtree.c \
+ gtkrbtree.c \
gtkrc.c \
gtkrecentaction.c \
gtkrecentchooserdefault.c \
gtkrecentchooserdialog.c \
- gtkrecentchoosermenu.c \
+ gtkrecentchoosermenu.c \
gtkrecentchooserwidget.c \
- gtkrecentchooserutils.c \
- gtkrecentchooser.c \
- gtkrecentfilter.c \
- gtkrecentmanager.c \
+ gtkrecentchooserutils.c \
+ gtkrecentchooser.c \
+ gtkrecentfilter.c \
+ gtkrecentmanager.c \
+ gtkroundedbox.c \
gtkscale.c \
gtkscalebutton.c \
- gtkscrollable.c \
+ gtkscrollable.c \
gtkscrollbar.c \
gtkscrolledwindow.c \
gtkselection.c \
gtksettings.c \
gtksizegroup.c \
gtksizerequest.c \
+ gtkshadow.c \
gtkshow.c \
- gtksocket.c \
gtkspinbutton.c \
gtkspinner.c \
gtkstatusbar.c \
gtkstatusicon.c \
gtkstock.c \
gtkstylecontext.c \
+ gtkstyleproperties.c \
+ gtkstyleproperty.c \
gtkstyleprovider.c \
- gtkstyleset.c \
gtkstyle.c \
gtkswitch.c \
gtksymboliccolor.c \
gtktable.c \
- gtktearoffmenuitem.c \
+ gtktearoffmenuitem.c \
gtktestutils.c \
+ gtktextattributes.c \
gtktextbtree.c \
gtktextbuffer.c \
gtktextbufferrichtext.c \
- gtktextbufferserialize.c\
+ gtktextbufferserialize.c \
gtktextchild.c \
gtktextdisplay.c \
gtktextiter.c \
gtktexttypes.c \
gtktextutil.c \
gtktextview.c \
- gtkthemes.c \
gtkthemingengine.c \
gtktimeline.c \
gtktoggleaction.c \
gtktoolbar.c \
gtktoolbutton.c \
gtktoolitem.c \
- gtktoolitemgroup.c \
+ gtktoolitemgroup.c \
gtktoolpalette.c \
gtktoolshell.c \
gtktooltip.c \
gtktreedatalist.c \
gtktreednd.c \
+ gtktreemenu.c \
gtktreemodel.c \
gtktreemodelfilter.c \
gtktreemodelsort.c \
gtktreeview.c \
gtktreeviewcolumn.c \
gtktypebuiltins.c \
- gtktypeutils.c \
gtkuimanager.c \
gtkvbbox.c \
gtkvbox.c \
gtkvseparator.c \
gtkwidget.c \
gtkwidgetpath.c \
- gtkwindow-decorate.c \
gtkwindow.c \
$(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)
-gtk_os_unix_c_sources = \
+gtk_os_unix_c_sources = \
gtkcustompaperunixdialog.c \
gtkpagesetupunixdialog.c \
gtkprinter.c \
gtk_c_sources += $(gtk_os_win32_c_sources)
endif
-gtk_use_x11_c_sources = \
- gtkplug-x11.c \
- gtksocket-x11.c \
- gtkxembed.c \
- gtktrayicon-x11.c \
+gtk_use_x11_c_sources = \
+ gtkplug.c \
+ gtksocket.c \
+ gtkxembed.c \
+ gtktrayicon-x11.c \
gtkmountoperation-x11.c
-gtk_use_win32_c_sources = \
- gtkplug-win32.c \
- gtksocket-win32.c \
- gtkwin32embed.c \
- gtkwin32embedwidget.c \
+gtk_use_win32_c_sources = \
+ gtkwin32embed.c \
+ gtkwin32embedwidget.c \
gtkmountoperation-stub.c
-gtk_use_quartz_c_sources = \
+gtk_use_quartz_c_sources = \
gtksearchenginequartz.c \
- gtkplug-stub.c \
- gtksocket-stub.c \
gtkmountoperation-stub.c
-gtk_use_stub_c_sources = \
- gtkplug-stub.c \
- gtksocket-stub.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)
if USE_X11
-gtk_private_h_sources += gtkxembed.h gtktrayicon.h xembed.h
+gtk_private_h_sources += \
+ gtkxembed.h \
+ gtktrayicon.h \
+ xembed.h
gtk_c_sources += $(gtk_use_x11_c_sources)
else
if USE_WIN32
-gtk_private_h_sources += gtkwin32embed.h gtkwin32embedwidget.h
+gtk_private_h_sources += \
+ gtkwin32embed.h \
+ gtkwin32embedwidget.h
gtk_c_sources += $(gtk_use_win32_c_sources)
else
if USE_QUARTZ
-gtk_private_h_sources += gtksearchenginequartz.h
+gtk_private_h_sources += \
+ gtksearchenginequartz.h
gtk_c_sources += $(gtk_use_quartz_c_sources)
gtk_use_quartz_c_sources_CFLAGS = "-xobjective-c"
else
endif
if USE_QUARTZ
-gtk_clipboard_dnd_c_sources = gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c
+gtk_clipboard_dnd_c_sources = \
+ gtkclipboard-quartz.c \
+ gtkdnd-quartz.c \
+ gtkquartz.c
gtk_clipboard_dnd_h_sources = gtkquartz.h
gtk_clipboard_dnd_c_sources_CFLAGS = "-xobjective-c"
else
-gtk_clipboard_dnd_c_sources = gtkclipboard.c gtkdnd.c
+gtk_clipboard_dnd_c_sources = \
+ gtkclipboard.c \
+ gtkdnd.c
gtk_clipboard_dnd_c_sources_CFLAGS =
endif
EXTRA_DIST += gtkquartz.h
paper_names.c \
paper_names_offsets.c \
gen-paper-names.c \
- gtkstatusicon-quartz.c \
+ gtkstatusicon-quartz.c \
gtk.symbols \
gtkversion.h.in \
gtkmarshalers.list
gtkmarshalers.h: stamp-gtkmarshalers.h
@true
stamp-gtkmarshalers.h: @REBUILD@ gtkmarshalers.list
- $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --header >> xgen-gmlh \
+ $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --header >> xgen-gmlh \
&& (cmp -s xgen-gmlh gtkmarshalers.h || cp xgen-gmlh gtkmarshalers.h) \
&& rm -f xgen-gmlh \
- && echo timestamp > $(@F)
+ && echo timestamp > $(@F)
gtkmarshalers.c: @REBUILD@ gtkmarshalers.list
- (echo "#include \"gtkmarshalers.h\""; \
+ $(AM_V_GEN) (echo "#include \"gtkmarshalers.h\""; \
$(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --body) >> xgen-gmlc \
&& cp xgen-gmlc gtkmarshalers.c \
&& rm -f xgen-gmlc
gtktypebuiltins.h: stamp-gtktypebuiltins.h
@true
stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.h.template
- ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.h.template \
+ $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.h.template \
$(gtk_public_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
- ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.c.template \
+ $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.c.template \
$(gtk_public_h_sources) ) > xgen-gtbc \
&& cp xgen-gtbc gtktypebuiltins.c \
&& rm -f xgen-gtbc
-gtktypefuncs.c: @REBUILD@ $(top_srcdir)/gtk/*.h $(top_srcdir)/gdk/*.h Makefile
- echo '#include <gtk/gtk.h>' > xgen-gtfsrc.c && \
- ${CPP} $(DEFS) $(INCLUDES) -DGTK_ENABLE_BROKEN $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
+gtktypefuncs.c: @REBUILD@ stamp-gtktypebuiltins.h $(top_srcdir)/gtk/*.h $(top_srcdir)/gdk/*.h Makefile
+ $(AM_V_GEN) echo '#include <gtk/gtkx.h>' > xgen-gtfsrc.c && \
+ ${CPP} $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
$(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \
sort | uniq | \
- $(SED) '{ s/^/*tp++ = /; s/$$/();/; }' > xgen-gtf \
+ $(SED) '{ s/^/*tp++ = /; s/$$/();/; s/^.*\(gdk_x11\|gtk_plug_\|gtk_socket_\).*$$/#ifdef GDK_WINDOWING_X11\n&\n#endif/; }' > xgen-gtf \
&& cp xgen-gtf $@ && rm -f xgen-gtf
gtktestutils.c: gtktypefuncs.c
# target platform:
-lib_LTLIBRARIES = $(gtktargetlib)
+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
gtkunixprintincludedir = $(includedir)/gtk-3.0/unix-print/gtk
gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources)
-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_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_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_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_3_la_SOURCES = $(gtk_c_sources)
+libgtk_3_la_LDFLAGS = $(libtool_opts)
+libgtk_3_la_LIBADD = $(libadd)
+libgtk_3_la_DEPENDENCIES = $(deps)
if USE_WIN32
+libgtk_3_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
+libgtk_3_la_LDFLAGS += -Wl,-luuid
+libgtk_3_la_DEPENDENCIES += $(gtk_def) $(gtk_win32_res) $(deps)
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
install-exec-hook:
if DISABLE_EXPLICIT_DEPS
- $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/$(gtktargetlib)
+ $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgtk-3.la
endif
if USE_QUARTZ
install-mac-key-theme:
- $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0-key
- $(INSTALL_DATA) $(srcdir)/gtkrc.key.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0-key/gtkrc
+ $(mkdir_p) $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0
+ $(INSTALL_DATA) $(srcdir)/gtk-keys.css.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0/gtk-keys.css
uninstall-mac-key-theme:
- rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0-key/gtkrc
+ rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0/gtk-keys.css
else
install-mac-key-theme:
uninstall-mac-key-theme:
endif
-dist-hook: ../build/win32/vs9/gtk.vcproj
+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 \
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 \
+ case $$F in \
+ *.c) echo ' <ClCompile Include="..\..\..\gtk\'$$F'" />' \
+ ;; \
+ esac; \
+ 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 \
+ case $$F in \
+ *.c) echo ' <ClCompile Include="..\..\..\gtk\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
+ ;; \
+ esac; \
+ done >libgtk.vs10.sourcefiles.filters
+ $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk.vcxproj.filtersin >$@
+ rm libgtk.vs10.sourcefiles.filters
# Install a RC file for the default GTK+ theme, and key themes
install-data-local: install-ms-lib install-def-file install-mac-key-theme
- $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0
- $(INSTALL_DATA) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0/gtkrc
- $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-3.0-key
- $(INSTALL_DATA) $(srcdir)/gtkrc.key.default $(DESTDIR)$(datadir)/themes/Default/gtk-3.0-key/gtkrc
- $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0-key
- $(INSTALL_DATA) $(srcdir)/gtkrc.key.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0-key/gtkrc
+ $(mkdir_p) $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0
+ $(INSTALL_DATA) $(srcdir)/gtk.css.raleigh $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0/gtk.css
+ $(mkdir_p) $(DESTDIR)$(datadir)/themes/Default/gtk-3.0
+ $(INSTALL_DATA) $(srcdir)/gtk-keys.css.default $(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css
+ $(mkdir_p) $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0
+ $(INSTALL_DATA) $(srcdir)/gtk-keys.css.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css
uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-mac-key-theme
- rm -f $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0/gtkrc
- rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-3.0-key/gtkrc
- rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0-key/gtkrc
+ rm -f $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0/gtk.css
+ rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css
+ rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css
# if srcdir!=builddir, clean out maintainer-clean files from builddir
# this allows dist to pass.
rm -f $(MAINTAINERCLEANFILES); \
fi
-DEPS = $(gtktargetlib) $(top_builddir)/gdk/$(gdktargetlib)
+DEPS = libgtk-3.la $(top_builddir)/gdk/libgdk-3.la
TEST_DEPS = $(DEPS) immodules.cache
LDADDS = \
- $(gtktargetlib) \
- $(top_builddir)/gdk/$(gdktargetlib) \
+ libgtk-3.la \
+ $(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS)
if HAVE_INTROSPECTION
introspection_files = \
- $(filter-out %private.h gtktextlayout.h, $(gtkinclude_HEADERS)) \
+ $(filter-out %private.h gtktextdisplay.h gtktextlayout.h, $(gtkinclude_HEADERS)) \
$(gtk_base_c_sources) \
+ gtkprintoperation-unix.c \
gtktypebuiltins.h \
gtktypebuiltins.c
-Gtk-3.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) $(top_builddir)/gdk/Gdk-3.0.gir Makefile
-Gtk_3_0_gir_SCANNERFLAGS = --warn-all --add-include-path=$(top_builddir)/gdk
+Gtk-3.0.gir: $(INTROSPECTION_SCANNER) libgtk-3.la $(top_builddir)/gdk/Gdk-3.0.gir Makefile
+Gtk_3_0_gir_SCANNERFLAGS = \
+ --add-include-path=$(top_builddir)/gdk \
+ --include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
if USE_X11
Gtk_3_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
endif
-Gtk_3_0_gir_INCLUDES = Atk-1.0 Gdk-3.0
+Gtk_3_0_gir_SCANNERFLAGS += --c-include="gtk/gtkx.h"
+Gtk_3_0_gir_INCLUDES = Atk-1.0
Gtk_3_0_gir_CFLAGS = \
$(INCLUDES) \
-UGDK_DISABLE_DEPRECATED \
-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_LIBS = libgtk-3.la
Gtk_3_0_gir_FILES = $(introspection_files)
+Gtk_3_0_gir_EXPORT_PACKAGES = gtk+-3.0
INTROSPECTION_GIRS += Gtk-3.0.gir
girdir = $(datadir)/gir-1.0
# Installed tools
#
bin_PROGRAMS = \
- gtk-query-immodules-3.0 \
- gtk-update-icon-cache-3.0
+ gtk-query-immodules-3.0
-bin_SCRIPTS = gtk-builder-convert-3.0
+if BUILD_ICON_CACHE
+bin_PROGRAMS += gtk-update-icon-cache
if OS_WIN32
# 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-3.0.exe doesn't require any special privileges.
+# gtk-update-icon-cache.exe doesn't require any special privileges.
-GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache-3.0.exe.manifest
+GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
-bin_SCRIPTS += \
- $(GTK_UPDATE_ICON_CACHE_MANIFEST)
+bin_SCRIPTS = $(GTK_UPDATE_ICON_CACHE_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"' ; \
echo ' processorArchitecture="'$(EXE_MANIFEST_ARCHITECTURE)'"' ; \
- echo ' name="gtk-update-icon-cache-3.0.exe"' ; \
+ echo ' name="gtk-update-icon-cache.exe"' ; \
echo ' type="win32"/>' ; \
echo ' <!-- Identify the application security requirements. -->' ; \
echo ' <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">' ; \
echo '</assembly>' ) >$@
endif
+endif
gtk_query_immodules_3_0_DEPENDENCIES = $(DEPS)
gtk_query_immodules_3_0_LDADD = $(LDADDS)
gtk_query_immodules_3_0_SOURCES = queryimmodules.c
-gtk_update_icon_cache_3_0_LDADD = $(GDK_PIXBUF_LIBS)
-gtk_update_icon_cache_3_0_SOURCES = updateiconcache.c
+if BUILD_ICON_CACHE
+gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
+gtk_update_icon_cache_SOURCES = updateiconcache.c
+endif
.PHONY: files test test-debug
stock-icons/16/window-close.png \
stock-icons/16/gtk-connect.png \
stock-icons/16/gtk-convert.png \
+ stock-icons/16/edit-clear.png \
stock-icons/16/edit-copy.png \
stock-icons/16/edit-cut.png \
stock-icons/16/edit-delete.png \
stock-icons/16/gtk-disconnect.png \
stock-icons/16/gtk-edit.png \
stock-icons/16/system-run.png \
- stock-icons/16/document-x-generic.png \
+ stock-icons/16/text-x-generic.png \
stock-icons/16/edit-find-replace.png \
stock-icons/16/edit-find.png \
stock-icons/16/media-floppy.png \
stock-icons/16/go-last-ltr.png \
stock-icons/16/go-top.png \
stock-icons/16/go-up.png \
+ stock-icons/16/gtk-caps-lock-warning.png \
+ stock-icons/16/gtk-color-picker.png \
stock-icons/16/drive-harddisk.png \
stock-icons/16/help-contents.png \
stock-icons/16/go-home.png \
stock-icons/16/network-idle.png \
stock-icons/16/document-new.png \
stock-icons/16/document-open.png \
+ stock-icons/16/gtk-orientation-landscape.png \
+ stock-icons/16/gtk-orientation-portrait.png \
+ stock-icons/16/gtk-orientation-reverse-landscape.png \
+ stock-icons/16/gtk-orientation-reverse-portrait.png \
stock-icons/16/gtk-page-setup.png \
stock-icons/16/edit-paste.png \
stock-icons/16/gtk-preferences.png \
stock-icons/24/media-optical.png \
stock-icons/24/edit-clear.png \
stock-icons/24/window-close.png \
+ stock-icons/24/gtk-caps-lock-warning.png \
stock-icons/24/gtk-color-picker.png \
stock-icons/24/gtk-connect.png \
stock-icons/24/gtk-convert.png \
stock-icons/24/gtk-disconnect.png \
stock-icons/24/gtk-edit.png \
stock-icons/24/system-run.png \
- stock-icons/24/document-x-generic.png \
+ stock-icons/24/text-x-generic.png \
stock-icons/24/edit-find-replace.png \
stock-icons/24/edit-find.png \
stock-icons/24/gtk-font.png \
# need to copy the icons so that we can replace the generated ones with
# symlinks, even in the readonly srcdir case
stamp-icons: $(STOCK_ICONS)
- if [ ! -d stock-icons ]; then \
+ $(AM_V_GEN) if [ ! -d stock-icons ]; then \
for d in 16 20 24 32 48; do \
mkdir -p stock-icons/$$d; \
done; \
&& $(LN_S) folder.png user-home.png \
&& $(RM) user-desktop.png \
&& $(LN_S) folder.png user-desktop.png \
- && $(RM) text-x-generic.png \
- && $(LN_S) document-x-generic.png text-x-generic.png \
) done \
&& touch stamp-icons
-if CROSS_COMPILING
+if USE_EXTERNAL_ICON_CACHE
gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
else
-gtk_update_icon_cache_program = \
- ./gtk-update-icon-cache-3.0
+gtk_update_icon_cache_program = ./gtk-update-icon-cache
endif
gtkbuiltincache.h: @REBUILD@ stamp-icons
- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache-3.0$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
- $(gtk_update_icon_cache_program) --force --ignore-theme-index \
+if !USE_EXTERNAL_ICON_CACHE
+ $(AM_V_at) $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
+endif
+ $(AM_V_GEN) $(gtk_update_icon_cache_program) --quiet --force --ignore-theme-index \
--source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
mv gtkbuiltincache.h.tmp gtkbuiltincache.h
EXTRA_DIST += \
$(STOCK_ICONS) \
$(GENERATED_ICONS) \
- line-arrow.xbm \
- line-wrap.xbm \
- tree_plus.xbm \
- tree_minus.xbm \
- tree_minus.xpm \
- tree_plus.xpm \
gtk.def \
- gtk-builder-convert-3.0 \
gtk-win32.rc \
gtk-win32.rc.in \
gtkwin32embed.h \
gtkprint-win32.h \
gtkprint-win32.c \
gtksearchenginequartz.h \
- gtkrc.default \
- gtkrc.key.default \
- gtkrc.key.emacs \
- gtkrc.key.mac \
+ gtk.css.raleigh \
+ gtk-keys.css.default \
+ gtk-keys.css.emacs \
+ gtk-keys.css.mac \
makefile.msc \
makefile.msc.in \
abicheck.sh \
projects / ~andy / gtk / blobdiff