Commit 95213b3f authored by Hans Breuer's avatar Hans Breuer
Browse files

win32: update msvc build

parent 1d838f58
...@@ -10,13 +10,11 @@ TOP = ..\.. ...@@ -10,13 +10,11 @@ TOP = ..\..
################################################################ ################################################################
# Not the real version but the one used in the DLL names # Not the real version but the one used in the DLL names
GTK_VER = 2.0 GTK_VER = 3.0
GDK_PIXBUF_VER = 2.0
GDK_LIBS = ../gdk/gdk-win32-$(GTK_VER).lib GDK_LIBS = ../gdk/gdk-win32-$(GTK_VER).lib
GTK_LIBS = gtk-win32-$(GTK_VER).lib GTK_LIBS = gtk-win32-$(GTK_VER).lib
GDK_PIXBUF_LIBS = ../gdk-pixbuf/gdk_pixbuf-$(GDK_PIXBUF_VER).lib
GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
# Perl and awk are needed to generate some source files. # Perl and awk are needed to generate some source files.
...@@ -25,7 +23,7 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ ...@@ -25,7 +23,7 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@
PERL = perl PERL = perl
AWK = gawk AWK = gawk
INCLUDES = -FImsvc_recommended_pragmas.h -I . -I .. -I ../gdk -I ../gdk-pixbuf INCLUDES = -FImsvc_recommended_pragmas.h -I . -I .. -I ../gdk $(GDK_PIXBUF_CFLAGS)
DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) \ DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) \
$(INTL_CFLAGS) $(ATK_CFLAGS) $(CAIRO_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS) $(CAIRO_CFLAGS)
LDFLAGS = $(ATK_LIBS) /link /machine:ix86 $(LINKDEBUG) LDFLAGS = $(ATK_LIBS) /link /machine:ix86 $(LINKDEBUG)
...@@ -38,54 +36,29 @@ DEFINES = \ ...@@ -38,54 +36,29 @@ DEFINES = \
-DGTK_VERSION=\"$(GTK_VER)\" -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ -DGTK_VERSION=\"$(GTK_VER)\" -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \
-DGTK_HOST=\"win32\" \ -DGTK_HOST=\"win32\" \
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKENDS=\"file,lpr\" \ -DGTK_PRINT_BACKENDS=\"file,lpr\" \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
-DGTK_PRINT_PREVIEW_COMMAND="\"evince --unlink-tempfile --preview %f\"" \ -DGTK_PRINT_PREVIEW_COMMAND="\"evince --unlink-tempfile --preview %f\"" \
-DGTK_LIBDIR=\"/magic/path/replaced/at/runtime\" -DGTK_LIBDIR=\"/magic/path/replaced/at/runtime\"
EXTRALIBS = \
$(GDK_LIBS) \
$(GDK_PIXBUF_LIBS) \
$(PANGO_LIBS) $(INTL_LIBS) \
$(GLIB_LIBS) $(GMODULE_LIBS) $(GIO_LIBS) \
$(CAIRO_LIBS) $(PANGOCAIRO_LIBS) $(CAIRO_GOBJECT_LIBS) \
TOUCH = copy makefile.msc+nul TOUCH = copy makefile.msc+nul
gtkbuiltincache.h: gtk-update-icon-cache.exe gtkbuiltincache.h: gtk-update-icon-cache.exe
cd stock-icons\16
copy gtk-go-forward-ltr.png gtk-go-back-rtl.png
copy gtk-go-back-ltr.png gtk-go-forward-rtl.png
copy gtk-goto-last-ltr.png gtk-goto-first-rtl.png
copy gtk-goto-first-ltr.png gtk-goto-last-rtl.png
copy gtk-media-rewind-ltr.png gtk-media-forward-rtl.png
copy gtk-media-previous-ltr.png gtk-media-next-rtl.png
copy gtk-media-next-ltr.png gtk-media-previous-rtl.png
copy gtk-media-forward-ltr.png gtk-media-rewind-rtl.png
copy gtk-floppy.png gtk-save.png
copy gtk-harddisk.png drive-harddisk.png
copy gtk-directory.png folder.png
copy gtk-directory.png folder-remote.png
copy gtk-home.png user-home.png
copy gtk-directory.png user-desktop.png
copy gtk-file.png text-x-generic.png
cd ..\24
copy gtk-go-forward-ltr.png gtk-go-back-rtl.png
copy gtk-go-back-ltr.png gtk-go-forward-rtl.png
copy gtk-goto-last-ltr.png gtk-goto-first-rtl.png
copy gtk-goto-first-ltr.png gtk-goto-last-rtl.png
copy gtk-media-rewind-ltr.png gtk-media-forward-rtl.png
copy gtk-media-previous-ltr.png gtk-media-next-rtl.png
copy gtk-media-next-ltr.png gtk-media-previous-rtl.png
copy gtk-media-forward-ltr.png gtk-media-rewind-rtl.png
copy gtk-floppy.png gtk-save.png
copy gtk-harddisk.png drive-harddisk.png
copy gtk-directory.png folder.png
copy gtk-directory.png folder-remote.png
copy gtk-home.png user-home.png
copy gtk-directory.png user-desktop.png
copy gtk-file.png text-x-generic.png
cd ..\..
del gtkicontheme.obj del gtkicontheme.obj
gtk-update-icon-cache --force --ignore-theme-index \ gtk-update-icon-cache --force --ignore-theme-index \
--source builtin_icons stock-icons > gtkbuiltincache.h --source builtin_icons stock-icons > gtkbuiltincache.h
GENERATED = \ GENERATED = \
gtktypebuiltins.h gtktypebuiltins.c \ gtktypebuiltins.h gtktypebuiltins.c \
gtkmarshal.h gtkmarshal.c gtkmarshalers.h gtkmarshalers.c \ gtkmarshalers.h gtkmarshalers.c \
gtk.def gtktypefuncs.c gtk.def gtkalias.h gtkaliasdef.c gtktypefuncs.c
all : \ all : \
..\config.h \ ..\config.h \
...@@ -97,28 +70,6 @@ all : \ ...@@ -97,28 +70,6 @@ all : \
# gtk-win32-$(GTK_VER)s.lib \ # gtk-win32-$(GTK_VER)s.lib \
# gtk-x11-$(GTK_VER).dll # gtk-x11-$(GTK_VER).dll
gtk_OBJECTS_deprecated = \
gtkcombo.obj \
gtkclist.obj \
gtkctree.obj \
gtkfilesel.obj \
gtktext.obj \
gtktoolbar.obj \
gtklist.obj \
gtkitemfactory.obj \
gtkoptionmenu.obj \
gtktree.obj \
gtktreeitem.obj \
gtkoldeditable.obj \
gtklistitem.obj \
gtkprogress.obj \
gtktipsquery.obj \
gtkshow.obj \
gtkpreview.obj \
gtkseparatortoolitem.obj \
gtktypeutils.obj \
gtktooltips.obj \
gtk_OBJECTS_cell = \ gtk_OBJECTS_cell = \
gtkcelleditable.obj \ gtkcelleditable.obj \
gtkcelllayout.obj \ gtkcelllayout.obj \
...@@ -131,6 +82,7 @@ gtk_OBJECTS_cell = \ ...@@ -131,6 +82,7 @@ gtk_OBJECTS_cell = \
gtkcellrendererprogress.obj \ gtkcellrendererprogress.obj \
gtkcellrendererspin.obj \ gtkcellrendererspin.obj \
gtkcellrendererspinner.obj \ gtkcellrendererspinner.obj \
# gtkcellsizerequest.obj \
gtkcellview.obj \ gtkcellview.obj \
gtkliststore.obj \ gtkliststore.obj \
gtktreednd.obj \ gtktreednd.obj \
...@@ -150,7 +102,7 @@ gtk_OBJECTS_file = \ ...@@ -150,7 +102,7 @@ gtk_OBJECTS_file = \
gtkfilechooserdialog.obj \ gtkfilechooserdialog.obj \
gtkfilechooserembed.obj \ gtkfilechooserembed.obj \
gtkfilechooserentry.obj \ gtkfilechooserentry.obj \
gtkfilechoosersettings.obj \ # gtkfilechoosersettings.obj \
gtkfilechooserutils.obj \ gtkfilechooserutils.obj \
gtkfilechooserwidget.obj \ gtkfilechooserwidget.obj \
gtkfilefilter.obj \ gtkfilefilter.obj \
...@@ -160,9 +112,9 @@ gtk_OBJECTS_file = \ ...@@ -160,9 +112,9 @@ gtk_OBJECTS_file = \
gtk_OBJECTS_print = \ gtk_OBJECTS_print = \
gtkprint-win32.obj \ gtkprint-win32.obj \
gtkprintcontext.obj \ gtkprintcontext.obj \
gtkprintoperation-win32.obj \
gtkprintoperation.obj \ gtkprintoperation.obj \
gtkprintoperationpreview.obj \ gtkprintoperationpreview.obj \
gtkprintoperation-win32.obj \
gtkprintsettings.obj \ gtkprintsettings.obj \
gtkprintutils.obj \ gtkprintutils.obj \
...@@ -197,6 +149,7 @@ gtk_OBJECTS_recent = \ ...@@ -197,6 +149,7 @@ gtk_OBJECTS_recent = \
gtk_OBJECTS = \ gtk_OBJECTS = \
fnmatch.obj \ fnmatch.obj \
gtk9slice.obj \
gtkaboutdialog.obj \ gtkaboutdialog.obj \
gtkaccelgroup.obj \ gtkaccelgroup.obj \
gtkaccellabel.obj \ gtkaccellabel.obj \
...@@ -207,6 +160,15 @@ gtk_OBJECTS = \ ...@@ -207,6 +160,15 @@ gtk_OBJECTS = \
gtkactivatable.obj \ gtkactivatable.obj \
gtkadjustment.obj \ gtkadjustment.obj \
gtkalignment.obj \ gtkalignment.obj \
gtkanimationdescription.obj \
gtkappchooser.obj \
gtkappchooserbutton.obj \
gtkappchooserdialog.obj \
gtkappchoosermodule.obj \
gtkappchooseronline.obj \
gtkappchooseronlinepk.obj \
gtkappchooserwidget.obj \
gtkapplication.obj \
gtkarrow.obj \ gtkarrow.obj \
gtkaspectframe.obj \ gtkaspectframe.obj \
gtkassistant.obj \ gtkassistant.obj \
...@@ -214,11 +176,16 @@ gtk_OBJECTS = \ ...@@ -214,11 +176,16 @@ gtk_OBJECTS = \
gtkbindings.obj \ gtkbindings.obj \
gtkbbox.obj \ gtkbbox.obj \
gtkbox.obj \ gtkbox.obj \
gtkborder.obj \
gtkbuildable.obj \ gtkbuildable.obj \
gtkbuilder.obj \ gtkbuilder.obj \
gtkbuilderparser.obj \ gtkbuilderparser.obj \
gtkbutton.obj \ gtkbutton.obj \
gtkcalendar.obj \ gtkcalendar.obj \
gtkcellarea.obj \
gtkcellareabox.obj \
gtkcellareaboxcontext.obj \
gtkcellareacontext.obj \
gtkcheckbutton.obj \ gtkcheckbutton.obj \
gtkcheckmenuitem.obj \ gtkcheckmenuitem.obj \
gtkclipboard.obj \ gtkclipboard.obj \
...@@ -226,9 +193,9 @@ gtk_OBJECTS = \ ...@@ -226,9 +193,9 @@ gtk_OBJECTS = \
gtkcolorsel.obj \ gtkcolorsel.obj \
gtkcolorseldialog.obj \ gtkcolorseldialog.obj \
gtkcombobox.obj \ gtkcombobox.obj \
gtkcomboboxentry.obj \ gtkcomboboxtext.obj \
gtkcontainer.obj \ gtkcontainer.obj \
gtkcurve.obj \ gtkcssprovider.obj \
gtkdialog.obj \ gtkdialog.obj \
gtkdnd.obj \ gtkdnd.obj \
gtkdrawingarea.obj \ gtkdrawingarea.obj \
...@@ -242,8 +209,8 @@ gtk_OBJECTS = \ ...@@ -242,8 +209,8 @@ gtk_OBJECTS = \
gtkfontsel.obj \ gtkfontsel.obj \
gtkfontbutton.obj \ gtkfontbutton.obj \
gtkframe.obj \ gtkframe.obj \
gtkgamma.obj \ gtkgradient.obj \
gtkgc.obj \ gtkgrid.obj \
gtkhandlebox.obj \ gtkhandlebox.obj \
gtkhbbox.obj \ gtkhbbox.obj \
gtkhbox.obj \ gtkhbox.obj \
...@@ -264,16 +231,13 @@ gtk_OBJECTS = \ ...@@ -264,16 +231,13 @@ gtk_OBJECTS = \
gtkimmodule.obj \ gtkimmodule.obj \
gtkimmulticontext.obj \ gtkimmulticontext.obj \
gtkinfobar.obj \ gtkinfobar.obj \
gtkinputdialog.obj \
gtkinvisible.obj \ gtkinvisible.obj \
gtkitem.obj \
gtkkeyhash.obj \ gtkkeyhash.obj \
gtklabel.obj \ gtklabel.obj \
gtklayout.obj \ gtklayout.obj \
gtklinkbutton.obj \ gtklinkbutton.obj \
gtkmain.obj \ gtkmain.obj \
gtkmarshalers.obj \ gtkmarshalers.obj \
gtkmarshal.obj \
gtkmenu.obj \ gtkmenu.obj \
gtkmenubar.obj \ gtkmenubar.obj \
gtkmenuitem.obj \ gtkmenuitem.obj \
...@@ -282,15 +246,16 @@ gtk_OBJECTS = \ ...@@ -282,15 +246,16 @@ gtk_OBJECTS = \
gtkmessagedialog.obj \ gtkmessagedialog.obj \
gtkmisc.obj \ gtkmisc.obj \
gtkmnemonichash.obj \ gtkmnemonichash.obj \
gtkmodifierstyle.obj \
gtkmodules.obj \ gtkmodules.obj \
gtkmountoperation.obj \ gtkmountoperation.obj \
gtkmountoperation-stub.obj \ gtkmountoperation-stub.obj \
gtknotebook.obj \ gtknotebook.obj \
gtkobject.obj \
gtkoffscreenwindow.obj \ gtkoffscreenwindow.obj \
gtkorientable.obj \ gtkorientable.obj \
gtkpagesetup.obj \ gtkpagesetup.obj \
gtkpaned.obj \ gtkpaned.obj \
gtkpango.obj \
gtkpapersize.obj \ gtkpapersize.obj \
gtkpathbar.obj \ gtkpathbar.obj \
gtkplug.obj \ gtkplug.obj \
...@@ -306,6 +271,7 @@ gtk_OBJECTS = \ ...@@ -306,6 +271,7 @@ gtk_OBJECTS = \
gtkrc.obj \ gtkrc.obj \
gtkscale.obj \ gtkscale.obj \
gtkscalebutton.obj \ gtkscalebutton.obj \
gtkscrollable.obj \
gtkscrollbar.obj \ gtkscrollbar.obj \
gtkscrolledwindow.obj \ gtkscrolledwindow.obj \
gtksearchengine.obj \ gtksearchengine.obj \
...@@ -315,22 +281,32 @@ gtk_OBJECTS = \ ...@@ -315,22 +281,32 @@ gtk_OBJECTS = \
gtkselection.obj \ gtkselection.obj \
gtkseparator.obj \ gtkseparator.obj \
gtkseparatormenuitem.obj \ gtkseparatormenuitem.obj \
gtkseparatortoolitem.obj \
gtksettings.obj \ gtksettings.obj \
gtkshow.obj \
gtksizegroup.obj \ gtksizegroup.obj \
gtksizerequest.obj \
gtksocket.obj \ gtksocket.obj \
gtksocket-win32.obj \ gtksocket-win32.obj \
gtkspinbutton.obj \ gtkspinbutton.obj \
gtkspinner.obj \ gtkspinner.obj \
gtkstatusicon.obj \ gtkstatusicon.obj \
gtkstyle.obj \ gtkstyle.obj \
gtkstylecontext.obj \
gtkstyleproperties.obj \
gtkstyleprovider.obj \
gtkstatusbar.obj \ gtkstatusbar.obj \
gtkstock.obj \ gtkstock.obj \
gtkswitch.obj \
gtksymboliccolor.obj \
gtktable.obj \ gtktable.obj \
gtktearoffmenuitem.obj \ gtktearoffmenuitem.obj \
gtkthemes.obj \ gtkthemingengine.obj \
gtktimeline.obj \
gtktoggleaction.obj \ gtktoggleaction.obj \
gtktogglebutton.obj \ gtktogglebutton.obj \
gtktoggletoolbutton.obj \ gtktoggletoolbutton.obj \
gtktoolbar.obj \
gtktoolbutton.obj \ gtktoolbutton.obj \
gtktoolitem.obj \ gtktoolitem.obj \
gtktoolitemgroup.obj \ gtktoolitemgroup.obj \
...@@ -339,6 +315,7 @@ gtk_OBJECTS = \ ...@@ -339,6 +315,7 @@ gtk_OBJECTS = \
gtktooltip.obj \ gtktooltip.obj \
gtktreedatalist.obj \ gtktreedatalist.obj \
gtktypebuiltins.obj \ gtktypebuiltins.obj \
gtktypeutils.obj \
gtkuimanager.obj \ gtkuimanager.obj \
gtkvbbox.obj \ gtkvbbox.obj \
gtkvbox.obj \ gtkvbox.obj \
...@@ -349,13 +326,14 @@ gtk_OBJECTS = \ ...@@ -349,13 +326,14 @@ gtk_OBJECTS = \
gtkvscrollbar.obj \ gtkvscrollbar.obj \
gtkvseparator.obj \ gtkvseparator.obj \
gtkwidget.obj \ gtkwidget.obj \
gtkwidgetpath.obj \
gtkwin32embed.obj \ gtkwin32embed.obj \
gtkwin32embedwidget.obj \ gtkwin32embedwidget.obj \
gtkwindow.obj \ gtkwindow.obj \
gtkwindow-decorate.obj # gtkwrapbox.obj \
# Source headers which are non-autogenerated headers # Source headers which are non-autogenerated headers
gtk_public_h_sources = \ gtk_public_h_sources = \
gtk.h \ gtk.h \
gtkaboutdialog.h \ gtkaboutdialog.h \
gtkaccelgroup.h \ gtkaccelgroup.h \
...@@ -367,17 +345,27 @@ gtk_public_h_sources = \ ...@@ -367,17 +345,27 @@ gtk_public_h_sources = \
gtkactivatable.h \ gtkactivatable.h \
gtkadjustment.h \ gtkadjustment.h \
gtkalignment.h \ gtkalignment.h \
gtkappchooser.h \
gtkappchooserbutton.h \
gtkappchooserdialog.h \
gtkappchooserwidget.h \
gtkapplication.h \
gtkarrow.h \ gtkarrow.h \
gtkaspectframe.h \ gtkaspectframe.h \
gtkassistant.h \ gtkassistant.h \
gtkbbox.h \ gtkbbox.h \
gtkbin.h \ gtkbin.h \
gtkbindings.h \ gtkbindings.h \
gtkborder.h \
gtkbox.h \ gtkbox.h \
gtkbuilder.h \ gtkbuilder.h \
gtkbuildable.h \ gtkbuildable.h \
gtkbutton.h \ gtkbutton.h \
gtkcalendar.h \ gtkcalendar.h \
gtkcellarea.h \
gtkcellareacontext.h \
gtkcellareabox.h \
gtkcellareaboxcontext.h \
gtkcelleditable.h \ gtkcelleditable.h \
gtkcelllayout.h \ gtkcelllayout.h \
gtkcellrenderer.h \ gtkcellrenderer.h \
...@@ -385,47 +373,43 @@ gtk_public_h_sources = \ ...@@ -385,47 +373,43 @@ gtk_public_h_sources = \
gtkcellrenderercombo.h \ gtkcellrenderercombo.h \
gtkcellrendererpixbuf.h \ gtkcellrendererpixbuf.h \
gtkcellrendererprogress.h \ gtkcellrendererprogress.h \
gtkcellrendererspin.h \ gtkcellrendererspin.h \
gtkcellrendererspinner.h \ gtkcellrendererspinner.h\
gtkcellrenderertext.h \ gtkcellrenderertext.h \
gtkcellrenderertoggle.h \ gtkcellrenderertoggle.h \
gtkcellview.h \ gtkcellview.h \
gtkcheckbutton.h \ gtkcheckbutton.h \
gtkcheckmenuitem.h \ gtkcheckmenuitem.h \
gtkclipboard.h \ gtkclipboard.h \
gtkclist.h \
gtkcolorbutton.h \ gtkcolorbutton.h \
gtkcolorsel.h \ gtkcolorsel.h \
gtkcolorseldialog.h \ gtkcolorseldialog.h \
gtkcombo.h \
gtkcombobox.h \ gtkcombobox.h \
gtkcomboboxentry.h \ gtkcomboboxtext.h \
gtkcontainer.h \ gtkcontainer.h \
gtkctree.h \ gtkcssprovider.h \
gtkcurve.h \ gtkdebug.h \
gtkdebug.h \
gtkdialog.h \ gtkdialog.h \
gtkdnd.h \ gtkdnd.h \
gtkdrawingarea.h \ gtkdrawingarea.h \
gtkeditable.h \ gtkeditable.h \
gtkentry.h \ gtkentry.h \
gtkentrybuffer.h \ gtkentrybuffer.h \
gtkentrycompletion.h \ gtkentrycompletion.h \
gtkenums.h \ gtkenums.h \
gtkeventbox.h \ gtkeventbox.h \
gtkexpander.h \ gtkexpander.h \
gtkfilechooser.h \ gtkfilechooser.h \
gtkfilechooserbutton.h \ gtkfilechooserbutton.h \
gtkfilechooserdialog.h \ gtkfilechooserdialog.h \
gtkfilechooserwidget.h \ gtkfilechooserwidget.h \
gtkfilefilter.h \ gtkfilefilter.h \
gtkfilesel.h \
gtkfixed.h \ gtkfixed.h \
gtkfontbutton.h \ gtkfontbutton.h \
gtkfontsel.h \ gtkfontsel.h \
gtkframe.h \ gtkframe.h \
gtkgamma.h \ gtkgradient.h \
gtkgc.h \ gtkgrid.h \
gtkhandlebox.h \ gtkhandlebox.h \
gtkhbbox.h \ gtkhbbox.h \
gtkhbox.h \ gtkhbox.h \
...@@ -433,6 +417,7 @@ gtk_public_h_sources = \ ...@@ -433,6 +417,7 @@ gtk_public_h_sources = \
gtkhscale.h \ gtkhscale.h \
gtkhscrollbar.h \ gtkhscrollbar.h \
gtkhseparator.h \ gtkhseparator.h \
gtkhsv.h \
gtkiconfactory.h \ gtkiconfactory.h \
gtkicontheme.h \ gtkicontheme.h \
gtkiconview.h \ gtkiconview.h \
...@@ -442,15 +427,11 @@ gtk_public_h_sources = \ ...@@ -442,15 +427,11 @@ gtk_public_h_sources = \
gtkimcontextsimple.h \ gtkimcontextsimple.h \
gtkimmodule.h \ gtkimmodule.h \
gtkimmulticontext.h \ gtkimmulticontext.h \
gtkinputdialog.h \ gtkinfobar.h \
gtkinvisible.h \ gtkinvisible.h \
gtkitem.h \
gtkitemfactory.h \
gtklabel.h \ gtklabel.h \
gtklayout.h \ gtklayout.h \
gtklinkbutton.h \ gtklinkbutton.h \
gtklist.h \
gtklistitem.h \
gtkliststore.h \ gtkliststore.h \
gtkmain.h \ gtkmain.h \
gtkmenu.h \ gtkmenu.h \
...@@ -463,21 +444,16 @@ gtk_public_h_sources = \ ...@@ -463,21 +444,16 @@ gtk_public_h_sources = \
gtkmodules.h \ gtkmodules.h \
gtkmountoperation.h \ gtkmountoperation.h \
gtknotebook.h \ gtknotebook.h \
gtkobject.h \
gtkoffscreenwindow.h \ gtkoffscreenwindow.h \
gtkoldeditable.h \ gtkorientable.h \
gtkoptionmenu.h \
gtkpagesetup.h \ gtkpagesetup.h \
gtkpaned.h \ gtkpaned.h \
gtkpapersize.h \ gtkpapersize.h \
gtkplug.h \ gtkplug.h \
gtkpreview.h \
gtkprintcontext.h \ gtkprintcontext.h \
gtkprintoperation.h \ gtkprintoperation.h \
gtkprintoperationpreview.h \ gtkprintoperationpreview.h \
gtkprintsettings.h \ gtkprintsettings.h \
gtkprivate.h \
gtkprogress.h \
gtkprogressbar.h \ gtkprogressbar.h \
gtkradioaction.h \ gtkradioaction.h \
gtkradiobutton.h \ gtkradiobutton.h \
...@@ -486,14 +462,15 @@ gtk_public_h_sources = \ ...@@ -486,14 +462,15 @@ gtk_public_h_sources = \
gtkrange.h \ gtkrange.h \
gtkrc.h \ gtkrc.h \
gtkrecentaction.h \ gtkrecentaction.h \
gtkrecentchooser.h \ gtkrecentchooser.h \
gtkrecentchooserdialog.h \ gtkrecentchooserdialog.h \
gtkrecentchoosermenu.h \ gtkrecentchoosermenu.h \
gtkrecentchooserwidget.h \ gtkrecentchooserwidget.h \
gtkrecentfilter.h \ gtkrecentfilter.h \
gtkrecentmanager.h \ gtkrecentmanager.h \
gtkscale.h \ gtkscale.h \
gtkscalebutton.h \ gtkscalebutton.h \
gtkscrollable.h \
gtkscrollbar.h \ gtkscrollbar.h \
gtkscrolledwindow.h \ gtkscrolledwindow.h \
gtkselection.h \ gtkselection.h \
...@@ -501,17 +478,24 @@ gtk_public_h_sources = \ ...@@ -501,17 +478,24 @@ gtk_public_h_sources = \
gtkseparatormenuitem.h \ gtkseparatormenuitem.h \
gtkseparatortoolitem.h \ gtkseparatortoolitem.h \
gtksettings.h \ gtksettings.h \
gtkshow.h \
gtksizegroup.h \