updated for version 7.0156

3 files changed, 204 insertions, 24065 deletions

diff --git a/runtime/syntax/ocaml.vim b/runtime/syntax/ocaml.vim
index b2ff18d888..d95a3c8d43 100644
--- a/runtime/syntax/ocaml.vim
+++ b/runtime/syntax/ocaml.vim
@@ -1,19 +1,23 @@
 " Vim syntax file
 " Language:     OCaml
 " Filenames:    *.ml *.mli *.mll *.mly
-" Maintainers:  Markus Mottl      <markus@oefai.at>
+" Maintainers:  Markus Mottl      <markus.mottl@gmail.com>
 "               Karl-Heinz Sylla  <Karl-Heinz.Sylla@gmd.de>
 "               Issac Trotts      <ijtrotts@ucdavis.edu>
-" URL:          http://www.oefai.at/~markus/vim/syntax/ocaml.vim
-" Last Change:  2004 Jul 26
-"               2003 Jan 19 - Added keyword "require" for scripting (MM)
-"               2002 Oct 30 - New variable "ocaml_revised" (MM)
+" URL:          http://www.ocaml.info/vim/syntax/ocaml.vim
+" Last Change:  2005 May 18 - Added 'NOTE' to highlighted comment words (MM)
+"               2005 Apr 14 - Fixed a small bug concerning 'include' (MM)
+"               2005 Mar 15 - Added a patch from David Baelde (MM)
+
+" A minor patch was applied to the official version so that object/end
+" can be distinguished from begin/end, which is used for indentation,
+" and folding. (David Baelde)
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
 if version < 600
   syntax clear
-elseif exists("b:current_syntax")
+elseif exists("b:current_syntax") && b:current_syntax != "ocaml"
   finish
 endif
 
@@ -24,7 +28,7 @@ syn case match
 syn match    ocamlComment   "^#!.*"
 
 " Scripting directives
-syn match    ocamlScript "^#\<\(quit\|labels\|warnings\|directory\|cd\|load\|use\|install_printer\|remove_printer\|require\|trace\|untrace\|untrace_all\|print_depth\|print_length\)\>"
+syn match    ocamlScript "^#\<\(quit\|labels\|warnings\|directory\|cd\|load\|use\|install_printer\|remove_printer\|require\|thread\|trace\|untrace\|untrace_all\|print_depth\|print_length\)\>"
 
 " lowercase identifier - the standard way to match
 syn match    ocamlLCIdentifier /\<\(\l\|_\)\(\w\|'\)*\>/
@@ -74,11 +78,11 @@ syn region   ocamlEncl transparent matchgroup=ocamlKeyword start="\[|" matchgrou
 
 " Comments
 syn region   ocamlComment start="(\*" end="\*)" contains=ocamlComment,ocamlTodo
-syn keyword  ocamlTodo contained TODO FIXME XXX
+syn keyword  ocamlTodo contained TODO FIXME XXX NOTE
 
 
 " Objects
-syn region   ocamlEnd matchgroup=ocamlKeyword start="\<object\>" matchgroup=ocamlKeyword end="\<end\>" contains=ALLBUT,@ocamlContained,ocamlEndErr
+syn region   ocamlEnd matchgroup=ocamlObject start="\<object\>" matchgroup=ocamlObject end="\<end\>" contains=ALLBUT,@ocamlContained,ocamlEndErr
 
 
 " Blocks
@@ -113,7 +117,7 @@ syn region   ocamlModSpec matchgroup=ocamlKeyword start="\<module\>" matchgroup=
 syn region   ocamlNone matchgroup=ocamlKeyword start="\<open\>" matchgroup=ocamlModule end="\<\u\(\w\|'\)*\(\.\u\(\w\|'\)*\)*\>" contains=@ocamlAllErrs,ocamlComment
 
 " "include"
-syn match    ocamlKeyword "\<include\>" contained skipwhite skipempty nextgroup=ocamlModParam,ocamlFullMod
+syn match    ocamlKeyword "\<include\>" skipwhite skipempty nextgroup=ocamlModParam,ocamlFullMod
 
 " "module" - somewhat complicated stuff ;-)
 syn region   ocamlModule matchgroup=ocamlKeyword start="\<module\>" matchgroup=ocamlModule end="\<\u\(\w\|'\)*\>" contains=@ocamlAllErrs,ocamlComment skipwhite skipempty nextgroup=ocamlPreDef
@@ -163,8 +167,9 @@ else
   syn match    ocamlKeyChar  "!"
 endif
 
-syn keyword  ocamlType     array bool char exn float format format4 int
-syn keyword  ocamlType     list option string unit
+syn keyword  ocamlType     array bool char exn float format format4
+syn keyword  ocamlType     int int32 int64 lazy_t list nativeint option
+syn keyword  ocamlType     string unit
 
 syn keyword  ocamlOperator asr lor lsl lsr lxor mod not
 
@@ -203,20 +208,20 @@ syn match    ocamlKeyChar      "\*"
 syn match    ocamlKeyChar      "="
 
 if exists("ocaml_revised")
-  syn match    ocamlErr		"<-"
+  syn match    ocamlErr        "<-"
 else
-  syn match    ocamlOperator	"<-"
+  syn match    ocamlOperator   "<-"
 endif
 
-syn match    ocamlNumber	"\<-\=\d\+\>"
-syn match    ocamlNumber	"\<-\=0[x|X]\x\+\>"
-syn match    ocamlNumber	"\<-\=0[o|O]\o\+\>"
-syn match    ocamlNumber	"\<-\=0[b|B][01]\+\>"
-syn match    ocamlFloat		"\<-\=\d\+\.\d*\([eE][-+]\=\d\+\)\=[fl]\=\>"
+syn match    ocamlNumber        "\<-\=\d\+[l|L]\?\>"
+syn match    ocamlNumber        "\<-\=0[x|X]\x\+[l|L]\?\>"
+syn match    ocamlNumber        "\<-\=0[o|O]\o\+[l|L]\?\>"
+syn match    ocamlNumber        "\<-\=0[b|B][01]\+[l|L]\?\>"
+syn match    ocamlFloat         "\<-\=\d\+\.\d*\([eE][-+]\=\d\+\)\=[fl]\=\>"
 
 " Labels
-syn match    ocamlLabel		"\~\(\l\|_\)\(\w\|'\)*"lc=1
-syn match    ocamlLabel		"?\(\l\|_\)\(\w\|'\)*"lc=1
+syn match    ocamlLabel        "\~\(\l\|_\)\(\w\|'\)*"lc=1
+syn match    ocamlLabel        "?\(\l\|_\)\(\w\|'\)*"lc=1
 syn region   ocamlLabel transparent matchgroup=ocamlLabel start="?(\(\l\|_\)\(\w\|'\)*"lc=2 end=")"me=e-1 contains=ALLBUT,@ocamlContained,ocamlParenErr
 
 
@@ -272,6 +277,7 @@ if version >= 508 || !exists("did_ocaml_syntax_inits")
   HiLink ocamlComment	   Comment
 
   HiLink ocamlModPath	   Include
+  HiLink ocamlObject	   Include
   HiLink ocamlModule	   Include
   HiLink ocamlModParam1    Include
   HiLink ocamlModType	   Include
diff --git a/src/Makefile b/src/Makefile
index dc953fc2d5..3c0429b02c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2632,16550 +2632,206 @@ $(RESDIR)/%.icns: %.icns
 ### Dependencies:
 objects/buffer.o: buffer.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
   ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkwidget.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdk.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkcolor.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdktypes.h \
-  /usr/local/include/glib-2.0/glib.h \
-  /usr/local/include/glib-2.0/glib/galloca.h \
-  /usr/local/include/glib-2.0/glib/gtypes.h \
-  /usr/local/include/glib-2.0/glibconfig.h \
-  /usr/local/include/glib-2.0/glib/gmacros.h \
-  /usr/local/include/glib-2.0/glib/garray.h \
-  /usr/local/include/glib-2.0/glib/gasyncqueue.h \
-  /usr/local/include/glib-2.0/glib/gthread.h \
-  /usr/local/include/glib-2.0/glib/gerror.h \
-  /usr/local/include/glib-2.0/glib/gquark.h \
-  /usr/local/include/glib-2.0/glib/gatomic.h \
-  /usr/local/include/glib-2.0/glib/gbacktrace.h \
-  /usr/local/include/glib-2.0/glib/gcache.h \
-  /usr/local/include/glib-2.0/glib/glist.h \
-  /usr/local/include/glib-2.0/glib/gmem.h \
-  /usr/local/include/glib-2.0/glib/gcompletion.h \
-  /usr/local/include/glib-2.0/glib/gconvert.h \
-  /usr/local/include/glib-2.0/glib/gdataset.h \
-  /usr/local/include/glib-2.0/glib/gdate.h \
-  /usr/local/include/glib-2.0/glib/gdir.h \
-  /usr/local/include/glib-2.0/glib/gfileutils.h \
-  /usr/local/include/glib-2.0/glib/ghash.h \
-  /usr/local/include/glib-2.0/glib/ghook.h \
-  /usr/local/include/glib-2.0/glib/giochannel.h \
-  /usr/local/include/glib-2.0/glib/gmain.h \
-  /usr/local/include/glib-2.0/glib/gslist.h \
-  /usr/local/include/glib-2.0/glib/gstring.h \
-  /usr/local/include/glib-2.0/glib/gunicode.h \
-  /usr/local/include/glib-2.0/glib/gutils.h \
-  /usr/local/include/glib-2.0/glib/gkeyfile.h \
-  /usr/local/include/glib-2.0/glib/gmarkup.h \
-  /usr/local/include/glib-2.0/glib/gmessages.h \
-  /usr/local/include/glib-2.0/glib/gnode.h \
-  /usr/local/include/glib-2.0/glib/goption.h \
-  /usr/local/include/glib-2.0/glib/gpattern.h \
-  /usr/local/include/glib-2.0/glib/gprimes.h \
-  /usr/local/include/glib-2.0/glib/gqsort.h \
-  /usr/local/include/glib-2.0/glib/gqueue.h \
-  /usr/local/include/glib-2.0/glib/grand.h \
-  /usr/local/include/glib-2.0/glib/grel.h \
-  /usr/local/include/glib-2.0/glib/gscanner.h \
-  /usr/local/include/glib-2.0/glib/gshell.h \
-  /usr/local/include/glib-2.0/glib/gspawn.h \
-  /usr/local/include/glib-2.0/glib/gstrfuncs.h \
-  /usr/local/include/glib-2.0/glib/gthreadpool.h \
-  /usr/local/include/glib-2.0/glib/gtimer.h \
-  /usr/local/include/glib-2.0/glib/gtree.h \
-  /usr/X11R6/include/pango-1.0/pango/pango.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-attributes.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-font.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-coverage.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-types.h \
-  /usr/local/include/glib-2.0/glib-object.h \
-  /usr/local/include/glib-2.0/gobject/gboxed.h \
-  /usr/local/include/glib-2.0/gobject/gtype.h \
-  /usr/local/include/glib-2.0/gobject/genums.h \
-  /usr/local/include/glib-2.0/gobject/gobject.h \
-  /usr/local/include/glib-2.0/gobject/gvalue.h \
-  /usr/local/include/glib-2.0/gobject/gparam.h \
-  /usr/local/include/glib-2.0/gobject/gclosure.h \
-  /usr/local/include/glib-2.0/gobject/gsignal.h \
-  /usr/local/include/glib-2.0/gobject/gmarshal.h \
-  /usr/local/include/glib-2.0/gobject/gparamspecs.h \
-  /usr/local/include/glib-2.0/gobject/gsourceclosure.h \
-  /usr/local/include/glib-2.0/gobject/gtypemodule.h \
-  /usr/local/include/glib-2.0/gobject/gtypeplugin.h \
-  /usr/local/include/glib-2.0/gobject/gvaluearray.h \
-  /usr/local/include/glib-2.0/gobject/gvaluetypes.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-break.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-item.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-context.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-fontmap.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-fontset.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-engine.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-glyph.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-script.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-enum-types.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-layout.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-glyph-item.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-tabs.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-renderer.h \
-  /usr/X11R6/include/gtk-2.0/gdkconfig.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkcursor.h \
-  /usr/X11R6/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h \
-  /usr/X11R6/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h \
-  /usr/X11R6/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h \
-  /usr/X11R6/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h \
-  /usr/X11R6/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h \
-  /usr/X11R6/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h \
-  /usr/local/include/glib-2.0/gmodule.h \
-  /usr/X11R6/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h \
-  /usr/X11R6/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkdisplay.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkevents.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkdnd.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkinput.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkdrawable.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkgc.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkrgb.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkenumtypes.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkfont.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkimage.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkkeys.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkdisplaymanager.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkpango.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkpixbuf.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkpixmap.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkproperty.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkregion.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkscreen.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkselection.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkspawn.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkvisual.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkwindow.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkaccelgroup.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkenums.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkobject.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktypeutils.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktypebuiltins.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkdebug.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkadjustment.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkstyle.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtksettings.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkrc.h \
-  /usr/local/include/atk-1.0/atk/atkobject.h \
-  /usr/local/include/atk-1.0/atk/atkstate.h \
-  /usr/local/include/atk-1.0/atk/atkrelationtype.h proto/gui_beval.pro \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtk.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkaboutdialog.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkdialog.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkwindow.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkbin.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcontainer.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkaccellabel.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtklabel.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkmisc.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkmenu.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkmenushell.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkaccelmap.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkaccessible.h \
-  /usr/local/include/atk-1.0/atk/atk.h \
-  /usr/local/include/atk-1.0/atk/atkaction.h \
-  /usr/local/include/atk-1.0/atk/atkcomponent.h \
-  /usr/local/include/atk-1.0/atk/atkutil.h \
-  /usr/local/include/atk-1.0/atk/atkdocument.h \
-  /usr/local/include/atk-1.0/atk/atkeditabletext.h \
-  /usr/local/include/atk-1.0/atk/atktext.h \
-  /usr/local/include/atk-1.0/atk/atkgobjectaccessible.h \
-  /usr/local/include/atk-1.0/atk/atkhyperlink.h \
-  /usr/local/include/atk-1.0/atk/atkhypertext.h \
-  /usr/local/include/atk-1.0/atk/atkimage.h \
-  /usr/local/include/atk-1.0/atk/atknoopobject.h \
-  /usr/local/include/atk-1.0/atk/atknoopobjectfactory.h \
-  /usr/local/include/atk-1.0/atk/atkobjectfactory.h \
-  /usr/local/include/atk-1.0/atk/atkregistry.h \
-  /usr/local/include/atk-1.0/atk/atkobjectfactory.h \
-  /usr/local/include/atk-1.0/atk/atkrelation.h \
-  /usr/local/include/atk-1.0/atk/atkrelationset.h \
-  /usr/local/include/atk-1.0/atk/atkselection.h \
-  /usr/local/include/atk-1.0/atk/atkstateset.h \
-  /usr/local/include/atk-1.0/atk/atkstreamablecontent.h \
-  /usr/local/include/atk-1.0/atk/atktable.h \
-  /usr/local/include/atk-1.0/atk/atkvalue.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkaction.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkactiongroup.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkitemfactory.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkalignment.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkarrow.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkaspectframe.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkframe.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkbbox.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkbox.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkbindings.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkbutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkimage.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcalendar.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtksignal.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkmarshal.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcelllayout.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcellrenderer.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcelleditable.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktreeviewcolumn.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktreemodel.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktreesortable.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcellrenderercombo.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcellrenderertext.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcellrendererpixbuf.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcellrendererprogress.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcellrenderertoggle.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcellview.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcheckbutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktogglebutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcheckmenuitem.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkmenuitem.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkitem.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkclipboard.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkselection.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkclist.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkhscrollbar.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkscrollbar.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkrange.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkvscrollbar.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcolorbutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcolorsel.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkvbox.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcolorseldialog.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcombo.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkhbox.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcombobox.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktreeview.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkdnd.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcomboboxentry.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkctree.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcurve.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkdrawingarea.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkeditable.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkentry.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkimcontext.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkentrycompletion.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkliststore.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktreemodelfilter.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkeventbox.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkexpander.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkfilesel.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkfixed.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkfilechooserbutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkfilechooser.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkfilefilter.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkfilechooserdialog.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkfilechooser.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkfilechooserwidget.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkfontbutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkfontsel.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkgamma.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkgc.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkhandlebox.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkhbbox.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkhpaned.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkpaned.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkhruler.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkruler.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkhscale.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkscale.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkhseparator.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkseparator.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkiconfactory.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkicontheme.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkiconview.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkimagemenuitem.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkimcontextsimple.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkimmulticontext.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkinputdialog.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkinvisible.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtklayout.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtklist.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtklistitem.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkmain.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkmenubar.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkmenutoolbutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkmenu.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktoolbutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktoolitem.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktooltips.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkmessagedialog.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkmodules.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtknotebook.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkoldeditable.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkoptionmenu.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkpixmap.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkplug.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtksocket.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkpreview.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkprogress.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkprogressbar.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkradioaction.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktoggleaction.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkradiobutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkradiomenuitem.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkradiotoolbutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktoggletoolbutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktoolbutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkscrolledwindow.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkviewport.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkseparatormenuitem.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkseparatortoolitem.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtksizegroup.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkspinbutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkstatusbar.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkstock.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktable.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktearoffmenuitem.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktext.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktextbuffer.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktexttagtable.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktexttag.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktextiter.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktextchild.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktextmark.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktextview.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktipsquery.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktoggletoolbutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktoolbar.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktoolbutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktoolitem.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktree.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktreednd.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktreeitem.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktreemodelsort.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktreeselection.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktreestore.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkuimanager.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkvbbox.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkversion.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkvpaned.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkvruler.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkvscale.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkvseparator.h option.h ex_cmds.h \
-  proto.h globals.h farsi.h arabic.h if_sniff.h version.h
+  proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
+  arabic.h if_sniff.h version.h
 objects/charset.o: charset.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
   ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkwidget.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdk.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkcolor.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdktypes.h \
-  /usr/local/include/glib-2.0/glib.h \
-  /usr/local/include/glib-2.0/glib/galloca.h \
-  /usr/local/include/glib-2.0/glib/gtypes.h \
-  /usr/local/include/glib-2.0/glibconfig.h \
-  /usr/local/include/glib-2.0/glib/gmacros.h \
-  /usr/local/include/glib-2.0/glib/garray.h \
-  /usr/local/include/glib-2.0/glib/gasyncqueue.h \
-  /usr/local/include/glib-2.0/glib/gthread.h \
-  /usr/local/include/glib-2.0/glib/gerror.h \
-  /usr/local/include/glib-2.0/glib/gquark.h \
-  /usr/local/include/glib-2.0/glib/gatomic.h \
-  /usr/local/include/glib-2.0/glib/gbacktrace.h \
-  /usr/local/include/glib-2.0/glib/gcache.h \
-  /usr/local/include/glib-2.0/glib/glist.h \
-  /usr/local/include/glib-2.0/glib/gmem.h \
-  /usr/local/include/glib-2.0/glib/gcompletion.h \
-  /usr/local/include/glib-2.0/glib/gconvert.h \
-  /usr/local/include/glib-2.0/glib/gdataset.h \
-  /usr/local/include/glib-2.0/glib/gdate.h \
-  /usr/local/include/glib-2.0/glib/gdir.h \
-  /usr/local/include/glib-2.0/glib/gfileutils.h \
-  /usr/local/include/glib-2.0/glib/ghash.h \
-  /usr/local/include/glib-2.0/glib/ghook.h \
-  /usr/local/include/glib-2.0/glib/giochannel.h \
-  /usr/local/include/glib-2.0/glib/gmain.h \
-  /usr/local/include/glib-2.0/glib/gslist.h \
-  /usr/local/include/glib-2.0/glib/gstring.h \
-  /usr/local/include/glib-2.0/glib/gunicode.h \
-  /usr/local/include/glib-2.0/glib/gutils.h \
-  /usr/local/include/glib-2.0/glib/gkeyfile.h \
-  /usr/local/include/glib-2.0/glib/gmarkup.h \
-  /usr/local/include/glib-2.0/glib/gmessages.h \
-  /usr/local/include/glib-2.0/glib/gnode.h \
-  /usr/local/include/glib-2.0/glib/goption.h \
-  /usr/local/include/glib-2.0/glib/gpattern.h \
-  /usr/local/include/glib-2.0/glib/gprimes.h \
-  /usr/local/include/glib-2.0/glib/gqsort.h \
-  /usr/local/include/glib-2.0/glib/gqueue.h \
-  /usr/local/include/glib-2.0/glib/grand.h \
-  /usr/local/include/glib-2.0/glib/grel.h \
-  /usr/local/include/glib-2.0/glib/gscanner.h \
-  /usr/local/include/glib-2.0/glib/gshell.h \
-  /usr/local/include/glib-2.0/glib/gspawn.h \
-  /usr/local/include/glib-2.0/glib/gstrfuncs.h \
-  /usr/local/include/glib-2.0/glib/gthreadpool.h \
-  /usr/local/include/glib-2.0/glib/gtimer.h \
-  /usr/local/include/glib-2.0/glib/gtree.h \
-  /usr/X11R6/include/pango-1.0/pango/pango.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-attributes.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-font.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-coverage.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-types.h \
-  /usr/local/include/glib-2.0/glib-object.h \
-  /usr/local/include/glib-2.0/gobject/gboxed.h \
-  /usr/local/include/glib-2.0/gobject/gtype.h \
-  /usr/local/include/glib-2.0/gobject/genums.h \
-  /usr/local/include/glib-2.0/gobject/gobject.h \
-  /usr/local/include/glib-2.0/gobject/gvalue.h \
-  /usr/local/include/glib-2.0/gobject/gparam.h \
-  /usr/local/include/glib-2.0/gobject/gclosure.h \
-  /usr/local/include/glib-2.0/gobject/gsignal.h \
-  /usr/local/include/glib-2.0/gobject/gmarshal.h \
-  /usr/local/include/glib-2.0/gobject/gparamspecs.h \
-  /usr/local/include/glib-2.0/gobject/gsourceclosure.h \
-  /usr/local/include/glib-2.0/gobject/gtypemodule.h \
-  /usr/local/include/glib-2.0/gobject/gtypeplugin.h \
-  /usr/local/include/glib-2.0/gobject/gvaluearray.h \
-  /usr/local/include/glib-2.0/gobject/gvaluetypes.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-break.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-item.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-context.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-fontmap.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-fontset.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-engine.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-glyph.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-script.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-enum-types.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-layout.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-glyph-item.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-tabs.h \
-  /usr/X11R6/include/pango-1.0/pango/pango-renderer.h \
-  /usr/X11R6/include/gtk-2.0/gdkconfig.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkcursor.h \
-  /usr/X11R6/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h \
-  /usr/X11R6/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h \
-  /usr/X11R6/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h \
-  /usr/X11R6/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h \
-  /usr/X11R6/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h \
-  /usr/X11R6/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h \
-  /usr/local/include/glib-2.0/gmodule.h \
-  /usr/X11R6/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h \
-  /usr/X11R6/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkdisplay.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkevents.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkdnd.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkinput.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkdrawable.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkgc.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkrgb.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkenumtypes.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkfont.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkimage.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkkeys.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkdisplaymanager.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkpango.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkpixbuf.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkpixmap.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkproperty.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkregion.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkscreen.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkselection.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkspawn.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkvisual.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkwindow.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkaccelgroup.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkenums.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkobject.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktypeutils.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktypebuiltins.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkdebug.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkadjustment.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkstyle.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtksettings.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkrc.h \
-  /usr/local/include/atk-1.0/atk/atkobject.h \
-  /usr/local/include/atk-1.0/atk/atkstate.h \
-  /usr/local/include/atk-1.0/atk/atkrelationtype.h proto/gui_beval.pro \
-  /usr/X11R6/include/X11/Intrinsic.h /usr/X11R6/include/X11/Xlib.h \
-  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
-  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
-  /usr/X11R6/include/X11/Xresource.h /usr/X11R6/include/X11/Core.h \
-  /usr/X11R6/include/X11/Composite.h /usr/X11R6/include/X11/Constraint.h \
-  /usr/X11R6/include/X11/Object.h /usr/X11R6/include/X11/RectObj.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtk.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkaboutdialog.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkdialog.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkwindow.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkbin.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcontainer.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkaccellabel.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtklabel.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkmisc.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkmenu.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkmenushell.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkaccelmap.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkaccessible.h \
-  /usr/local/include/atk-1.0/atk/atk.h \
-  /usr/local/include/atk-1.0/atk/atkaction.h \
-  /usr/local/include/atk-1.0/atk/atkcomponent.h \
-  /usr/local/include/atk-1.0/atk/atkutil.h \
-  /usr/local/include/atk-1.0/atk/atkdocument.h \
-  /usr/local/include/atk-1.0/atk/atkeditabletext.h \
-  /usr/local/include/atk-1.0/atk/atktext.h \
-  /usr/local/include/atk-1.0/atk/atkgobjectaccessible.h \
-  /usr/local/include/atk-1.0/atk/atkhyperlink.h \
-  /usr/local/include/atk-1.0/atk/atkhypertext.h \
-  /usr/local/include/atk-1.0/atk/atkimage.h \
-  /usr/local/include/atk-1.0/atk/atknoopobject.h \
-  /usr/local/include/atk-1.0/atk/atknoopobjectfactory.h \
-  /usr/local/include/atk-1.0/atk/atkobjectfactory.h \
-  /usr/local/include/atk-1.0/atk/atkregistry.h \
-  /usr/local/include/atk-1.0/atk/atkobjectfactory.h \
-  /usr/local/include/atk-1.0/atk/atkrelation.h \
-  /usr/local/include/atk-1.0/atk/atkrelationset.h \
-  /usr/local/include/atk-1.0/atk/atkselection.h \
-  /usr/local/include/atk-1.0/atk/atkstateset.h \
-  /usr/local/include/atk-1.0/atk/atkstreamablecontent.h \
-  /usr/local/include/atk-1.0/atk/atktable.h \
-  /usr/local/include/atk-1.0/atk/atkvalue.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkaction.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkactiongroup.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkitemfactory.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkalignment.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkarrow.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkaspectframe.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkframe.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkbbox.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkbox.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkbindings.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkbutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkimage.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcalendar.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtksignal.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkmarshal.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcelllayout.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcellrenderer.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcelleditable.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktreeviewcolumn.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktreemodel.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktreesortable.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcellrenderercombo.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcellrenderertext.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcellrendererpixbuf.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcellrendererprogress.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcellrenderertoggle.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcellview.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcheckbutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktogglebutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcheckmenuitem.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkmenuitem.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkitem.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkclipboard.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkselection.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkclist.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkhscrollbar.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkscrollbar.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkrange.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkvscrollbar.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcolorbutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcolorsel.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkvbox.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcolorseldialog.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcombo.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkhbox.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcombobox.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktreeview.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkdnd.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcomboboxentry.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkctree.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkcurve.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkdrawingarea.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkeditable.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkentry.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkimcontext.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkentrycompletion.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkliststore.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktreemodelfilter.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkeventbox.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkexpander.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkfilesel.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkfixed.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkfilechooserbutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkfilechooser.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkfilefilter.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkfilechooserdialog.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkfilechooser.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkfilechooserwidget.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkfontbutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkfontsel.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkgamma.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkgc.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkhandlebox.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkhbbox.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkhpaned.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkpaned.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkhruler.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkruler.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkhscale.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkscale.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkhseparator.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkseparator.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkiconfactory.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkicontheme.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkiconview.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkimagemenuitem.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkimcontextsimple.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkimmulticontext.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkinputdialog.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkinvisible.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtklayout.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtklist.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtklistitem.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkmain.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkmenubar.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkmenutoolbutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkmenu.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktoolbutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktoolitem.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktooltips.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkmessagedialog.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkmodules.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtknotebook.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkoldeditable.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkoptionmenu.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkpixmap.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkplug.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtksocket.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkpreview.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkprogress.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkprogressbar.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkradioaction.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktoggleaction.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkradiobutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkradiomenuitem.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkradiotoolbutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktoggletoolbutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktoolbutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkscrolledwindow.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkviewport.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkseparatormenuitem.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkseparatortoolitem.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtksizegroup.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkspinbutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkstatusbar.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkstock.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktable.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktearoffmenuitem.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktext.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktextbuffer.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktexttagtable.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktexttag.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktextiter.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktextchild.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktextmark.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktextview.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktipsquery.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktoggletoolbutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktoolbar.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktoolbutton.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktoolitem.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktree.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktreednd.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktreeitem.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktreemodelsort.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktreeselection.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtktreestore.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkuimanager.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkvbbox.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkversion.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkvpaned.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkvruler.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkvscale.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkvseparator.h option.h ex_cmds.h \
-  proto.h globals.h farsi.h arabic.h if_sniff.h
+  proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
+  arabic.h if_sniff.h
 objects/diff.o: diff.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
   ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
-  /usr/X11R6/include/gtk-2.0/gtk/gtkwidget.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdk.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdkcolor.h \
-  /usr/X11R6/include/gtk-2.0/gdk/gdktypes.h \
-  /usr/local/include/glib-2.0/glib.h \
-  /usr/local/include/glib-2.0/glib/galloca.h \
-  /usr/local/include/glib-2.0/glib/gtypes.h \
-  /usr/local/include/glib-2.0/glibconfig.h \
-  /usr/local/include/glib-2.0/glib/gmacros.h \
-  /usr/local/include/glib-2.0/glib/garray.h \
-  /usr/local/include/glib-2.0/glib/gasyncqueue.h \
-  /usr/local/include/glib-2.0/glib/gthread.h \
-  /usr/local/include/glib-2.0/glib/gerror.h \
-  /usr/local/include/glib-2.0/glib/gquark.h \
-  /usr/local/include/glib-2.0/glib/gatomic.h \
-  /usr/local/include/glib-2.0/glib/gbacktrace.h \
-  /usr/local/include/glib-2.0/glib/gcache.h \
-  /usr/local/include/glib-2.0/glib/glist.h \
-  /usr/local/include/glib-2.0/glib/gmem.h \
-  /usr/local/include/glib-2.0/glib/gcompletion.h \
-  /usr/local/include/glib-2.0/glib/gconvert.h \
-  /usr/local/include/glib-2.0/glib/gdataset.h \
-  /usr/local/include/glib-2.0/glib/gdate.h \