]> git.saurik.com Git - wxWidgets.git/blobdiff - build/bakefiles/files.bkl
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
added hints to bakefile so that it knows that it must put only one file on line
[wxWidgets.git] / build / bakefiles / files.bkl
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index aa7872bf5f7cefb4528037ff0ab5669db6f7d1b7..d9f031a353f9e615b56ac5d026b83dff9c2b4d18 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -4,7 +4,7 @@
 
 <!-- ======================================================================
                                        FILES
 
 <!-- ======================================================================
                                        FILES
-         
+
      Files are listed in variables according to this scheme:
      * each group has _SRC and _HDR variable, for sources and headers
        respectively
      Files are listed in variables according to this scheme:
      * each group has _SRC and _HDR variable, for sources and headers
        respectively
@@ -17,15 +17,16 @@
 
        BASE_$(platform)              base files used on platform
        BASE_AND_GUI_$(platform)_SRC  base & gui files used on platform
 
        BASE_$(platform)              base files used on platform
        BASE_AND_GUI_$(platform)_SRC  base & gui files used on platform
-                               
+
        $(port)LOWLEVEL               low-level GUI classes
        $(port)                       high-level files for a port
        $(port)LOWLEVEL               low-level GUI classes
        $(port)                       high-level files for a port
-       XWIN_LOWLEVEL                 low-level classes for X Window System port
+       XWIN_LOWLEVEL                 low-level classes for X Window System
+                                     ports (wxGTK, wxMotif, wxX11)
 
        HTML                          wxHTML files
 
        HTML                          wxHTML files
-  
+
      * one file may be listed in several groups
      * one file may be listed in several groups
-    
+
      ====================================================================== -->
 
 
      ====================================================================== -->
 
 
@@ -35,7 +36,7 @@
 <!--                               wxBase                                   -->
 <!-- ====================================================================== -->
 
 <!--                               wxBase                                   -->
 <!-- ====================================================================== -->
 
-<set var="BASE_UNIX_SRC">
+<set var="BASE_UNIX_SRC" hints="files">
     src/unix/baseunix.cpp
     src/unix/dir.cpp
     src/unix/gsocket.c
     src/unix/baseunix.cpp
     src/unix/dir.cpp
     src/unix/gsocket.c
@@ -43,15 +44,15 @@
     src/unix/snglinst.cpp
     src/unix/threadpsx.cpp
 </set>
     src/unix/snglinst.cpp
     src/unix/threadpsx.cpp
 </set>
-<set var="BASE_AND_GUI_UNIX_SRC">
+<set var="BASE_AND_GUI_UNIX_SRC" hints="files">
     src/unix/utilsunx.cpp
 </set>
     src/unix/utilsunx.cpp
 </set>
-<set var="BASE_UNIX_HDR">
-    wx/unix/gsockunx.h    
+<set var="BASE_UNIX_HDR" hints="files">
+    wx/unix/gsockunx.h
     wx/unix/mimetype.h
 </set>
 
     wx/unix/mimetype.h
 </set>
 
-<set var="BASE_WIN32_SRC">
+<set var="BASE_WIN32_SRC" hints="files">
     src/msw/gsocket.c
     src/msw/gsockmsw.c
     src/msw/basemsw.cpp
     src/msw/gsocket.c
     src/msw/gsockmsw.c
     src/msw/basemsw.cpp
@@ -64,20 +65,24 @@
     src/msw/thread.cpp
     src/msw/utils.cpp
     src/msw/utilsexc.cpp
     src/msw/thread.cpp
     src/msw/utils.cpp
     src/msw/utilsexc.cpp
+    src/msw/crashrpt.cpp
 </set>
 </set>
-<set var="BASE_AND_GUI_WIN32_SRC">
+<set var="BASE_AND_GUI_WIN32_SRC" hints="files">
     src/msw/main.cpp
     src/msw/mslu.cpp
     src/msw/volume.cpp
 </set>
     src/msw/main.cpp
     src/msw/mslu.cpp
     src/msw/volume.cpp
 </set>
-<set var="BASE_WIN32_HDR">
+<set var="BASE_WIN32_HDR" hints="files">
     wx/msw/dde.h
     wx/msw/gccpriv.h
     wx/msw/mimetype.h
     wx/msw/winundef.h
     wx/msw/dde.h
     wx/msw/gccpriv.h
     wx/msw/mimetype.h
     wx/msw/winundef.h
+    wx/msw/wrapwin.h
+    wx/msw/chkconf.h
+    wx/msw/crashrpt.h
 </set>
 
 </set>
 
-<set var="BASE_DARWIN_SRC">
+<set var="BASE_DARWIN_SRC" hints="files">
     src/unix/baseunix.cpp
     src/unix/dir.cpp
     src/unix/gsocket.c
     src/unix/baseunix.cpp
     src/unix/dir.cpp
     src/unix/gsocket.c
@@ -85,13 +90,13 @@
     src/unix/snglinst.cpp
     src/unix/threadpsx.cpp
 </set>
     src/unix/snglinst.cpp
     src/unix/threadpsx.cpp
 </set>
-<set var="BASE_AND_GUI_DARWIN_SRC">
+<set var="BASE_AND_GUI_DARWIN_SRC" hints="files">
     src/unix/utilsunx.cpp
 </set>
     src/unix/utilsunx.cpp
 </set>
-<set var="BASE_DARWIN_HDR">
+<set var="BASE_DARWIN_HDR" hints="files">
 </set>
 
 </set>
 
-<set var="BASE_MAC_SRC">
+<set var="BASE_MAC_SRC" hints="files">
     src/unix/baseunix.cpp
     src/mac/dirmac.cpp
     src/mac/gsocket.c
     src/unix/baseunix.cpp
     src/mac/dirmac.cpp
     src/mac/gsocket.c
@@ -99,23 +104,20 @@
     src/mac/utils.cpp
     src/mac/utilsexc.cpp
 </set>
     src/mac/utils.cpp
     src/mac/utilsexc.cpp
 </set>
-<set var="BASE_AND_GUI_MAC_SRC">
-    src/unix/utilsunx.cpp
-</set>
-<set var="BASE_MAC_HDR">
+<set var="BASE_MAC_HDR" hints="files">
 </set>
 
 </set>
 
-<set var="BASE_OS2_SRC">
+<set var="BASE_OS2_SRC" hints="files">
     src/os2/dir.cpp
     src/os2/utils.cpp
     src/os2/utilsexc.cpp
 </set>
     src/os2/dir.cpp
     src/os2/utils.cpp
     src/os2/utilsexc.cpp
 </set>
-<set var="BASE_AND_GUI_OS2_SRC">
+<set var="BASE_AND_GUI_OS2_SRC" hints="files">
 </set>
 </set>
-<set var="BASE_OS2_HDR">
+<set var="BASE_OS2_HDR" hints="files">
 </set>
 
 </set>
 
-<set var="BASE_CMN_SRC">
+<set var="BASE_CMN_SRC" hints="files">
     src/common/appbase.cpp
     src/common/clntdata.cpp
     src/common/cmdline.cpp
     src/common/appbase.cpp
     src/common/clntdata.cpp
     src/common/cmdline.cpp
@@ -179,13 +181,19 @@
     src/common/zipstrm.cpp
     src/common/zstream.cpp
 </set>
     src/common/zipstrm.cpp
     src/common/zstream.cpp
 </set>
-<set var="BASE_AND_GUI_CMN_SRC">
+<set var="BASE_AND_GUI_CMN_SRC" hints="files">
     src/common/event.cpp
     src/common/fs_mem.cpp
     src/common/msgout.cpp
     src/common/utilscmn.cpp
 </set>
     src/common/event.cpp
     src/common/fs_mem.cpp
     src/common/msgout.cpp
     src/common/utilscmn.cpp
 </set>
-<set var="BASE_CMN_HDR">
+<set var="BASE_CMN_HDR" hints="files">
+    wx/apptrait.h
+    wx/beforestd.h
+    wx/containr.h
+    wx/msgout.h
+    wx/types.h
+    wx/init.h
     wx/arrimpl.cpp
     wx/listimpl.cpp
     wx/app.h
     wx/arrimpl.cpp
     wx/listimpl.cpp
     wx/app.h
@@ -207,6 +215,7 @@
     wx/defs.h
     wx/dir.h
     wx/dynarray.h
     wx/defs.h
     wx/dir.h
     wx/dynarray.h
+    wx/arrstr.h
     wx/dynlib.h
     wx/dynload.h
     wx/encconv.h
     wx/dynlib.h
     wx/dynload.h
     wx/encconv.h
@@ -277,6 +286,8 @@
     wx/wxprec.h
     wx/zipstrm.h
     wx/zstream.h
     wx/wxprec.h
     wx/zipstrm.h
     wx/zstream.h
+    wx/protocol/protocol.h
+    wx/protocol/http.h
 </set>
 
 
 </set>
 
 
@@ -285,25 +296,27 @@
 <!--                            Common GUI files                            -->
 <!-- ====================================================================== -->
 
 <!--                            Common GUI files                            -->
 <!-- ====================================================================== -->
 
-<set var="GUI_CMN_SRC">
-    src/generic/selstore.cpp
+<set var="GUI_CMN_SRC" hints="files">
     src/generic/busyinfo.cpp
     src/generic/calctrl.cpp
     src/generic/choicdgg.cpp
     src/generic/dcbuffer.cpp
     src/generic/dcpsg.cpp
     src/generic/dirctrlg.cpp
     src/generic/busyinfo.cpp
     src/generic/calctrl.cpp
     src/generic/choicdgg.cpp
     src/generic/dcbuffer.cpp
     src/generic/dcpsg.cpp
     src/generic/dirctrlg.cpp
+    src/generic/dragimgg.cpp
     src/generic/grid.cpp
     src/generic/gridctrl.cpp
     src/generic/gridsel.cpp
     src/generic/grid.cpp
     src/generic/gridctrl.cpp
     src/generic/gridsel.cpp
-    src/generic/htmllbox.cpp
+    src/generic/helpext.cpp
     src/generic/laywin.cpp
     src/generic/logg.cpp
     src/generic/numdlgg.cpp
     src/generic/panelg.cpp
     src/generic/progdlgg.cpp
     src/generic/laywin.cpp
     src/generic/logg.cpp
     src/generic/numdlgg.cpp
     src/generic/panelg.cpp
     src/generic/progdlgg.cpp
+    src/generic/renderg.cpp
     src/generic/sashwin.cpp
     src/generic/scrlwing.cpp
     src/generic/sashwin.cpp
     src/generic/scrlwing.cpp
+    src/generic/selstore.cpp
     src/generic/spinctlg.cpp
     src/generic/splash.cpp
     src/generic/splitter.cpp
     src/generic/spinctlg.cpp
     src/generic/splash.cpp
     src/generic/splitter.cpp
@@ -387,11 +400,62 @@
     src/common/wincmn.cpp
     src/common/xpmdecod.cpp
 </set>
     src/common/wincmn.cpp
     src/common/xpmdecod.cpp
 </set>
-<set var="GUI_CMN_HDR">
+<set var="GUI_CMN_HDR" hints="files">
+    wx/gdicmn.h
+    wx/cursor.h
+    wx/window.h
+    wx/panel.h
+    wx/frame.h
+    wx/dc.h
+    wx/dcclient.h
+    wx/dcmemory.h
+    wx/dcprint.h
+    wx/dcscreen.h
+    wx/button.h
+    wx/menu.h
+    wx/pen.h
+    wx/brush.h
+    wx/palette.h
+    wx/icon.h
+    wx/dialog.h
+    wx/timer.h
+    wx/settings.h
+    wx/msgdlg.h
+    wx/cmndata.h
+    wx/control.h
+    wx/ctrlsub.h
+    wx/bmpbuttn.h
+    wx/checkbox.h
+    wx/checklst.h
+    wx/choice.h
+    wx/scrolbar.h
+    wx/stattext.h
+    wx/statbmp.h
+    wx/statbox.h
+    wx/listbox.h
+    wx/radiobox.h
+    wx/radiobut.h
+    wx/renderer.h
+    wx/textctrl.h
+    wx/slider.h
+    wx/gauge.h
+    wx/scrolwin.h
+    wx/dirdlg.h
+    wx/toolbar.h
+    wx/combobox.h
+    wx/layout.h
+    wx/sizer.h
+    wx/mdi.h
+    wx/statusbr.h
+    wx/scrolbar.h
+    wx/choicdlg.h
+    wx/textdlg.h
+    wx/filedlg.h
+    wx/validate.h
+    wx/valtext.h
     wx/selstore.h
     wx/generic/accel.h
     wx/generic/calctrl.h
     wx/selstore.h
     wx/generic/accel.h
     wx/generic/calctrl.h
-    wx/generic/caret.h
     wx/generic/choicdgg.h
     wx/generic/colrdlgg.h
     wx/generic/dcpsg.h
     wx/generic/choicdgg.h
     wx/generic/colrdlgg.h
     wx/generic/dcpsg.h
@@ -420,6 +484,112 @@
     wx/generic/timer.h
     wx/generic/wizard.h
     wx/generic/treectlg.h
     wx/generic/timer.h
     wx/generic/wizard.h
     wx/generic/treectlg.h
+
+    wx/accel.h
+    wx/access.h
+    wx/afterstd.h
+    wx/artprov.h
+    wx/bitmap.h
+    wx/busyinfo.h
+    wx/calctrl.h
+    wx/caret.h
+    wx/clipbrd.h
+    wx/cmdproc.h
+    wx/colordlg.h
+    wx/colour.h
+    wx/cshelp.h
+    wx/dataobj.h
+    wx/dbgrid.h
+    wx/dcbuffer.h
+    wx/dcmirror.h
+    wx/dcps.h
+    wx/dialup.h
+    wx/dirctrl.h
+    wx/display.h
+    wx/dnd.h
+    wx/docmdi.h
+    wx/docview.h
+    wx/dragimag.h
+    wx/effects.h
+    wx/evtloop.h
+    wx/fdrepdlg.h
+    wx/fmappriv.h
+    wx/font.h
+    wx/fontdlg.h
+    wx/fontenum.h
+    wx/fontutil.h
+    wx/gdiobj.h
+    wx/geometry.h
+    wx/gifdecod.h
+    wx/glcanvas.h
+    wx/grid.h
+    wx/help.h
+    wx/helpbase.h
+    wx/helpwin.h
+    wx/iconbndl.h
+    wx/imagbmp.h
+    wx/image.h
+    wx/imaggif.h
+    wx/imagiff.h
+    wx/imagjpeg.h
+    wx/imaglist.h
+    wx/imagpcx.h
+    wx/imagpng.h
+    wx/imagpnm.h
+    wx/imagtiff.h
+    wx/imagxpm.h
+    wx/joystick.h
+    wx/laywin.h
+    wx/listbase.h
+    wx/listctrl.h
+    wx/matrix.h
+    wx/menuitem.h
+    wx/metafile.h
+    wx/minifram.h
+    wx/notebook.h
+    wx/ownerdrw.h
+    wx/paper.h
+    wx/popupwin.h
+    wx/print.h
+    wx/printdlg.h
+    wx/prntbase.h
+    wx/progdlg.h
+    wx/ptr_scpd.h
+    wx/quantize.h
+    wx/rawbmp.h
+    wx/region.h
+    wx/sashwin.h
+    wx/scopeguard.h
+    wx/spinbutt.h
+    wx/spinctrl.h
+    wx/splash.h
+    wx/splitter.h
+    wx/stack.h
+    wx/statline.h
+    wx/tab.h
+    wx/tabctrl.h
+    wx/taskbar.h
+    wx/tbarbase.h
+    wx/tbarsmpl.h
+    wx/tglbtn.h
+    wx/tipdlg.h
+    wx/tipwin.h
+    wx/tooltip.h
+    wx/toplevel.h
+    wx/treebase.h
+    wx/treectrl.h
+    wx/valgen.h
+    wx/vlbox.h
+    wx/vms_x_fix.h
+    wx/vscroll.h
+    wx/wave.h
+    wx/wizard.h
+    wx/xpmdecod.h
+    wx/xpmhand.h
+
+    wx/generic/dragimgg.h
+    wx/generic/gridsel.h
+
 </set>
 
 
 </set>
 
 
@@ -427,20 +597,22 @@
 <!--                            Common X11 code:                            -->
 <!-- ====================================================================== -->
 
 <!--                            Common X11 code:                            -->
 <!-- ====================================================================== -->
 
-<set var="XWIN_LOWLEVEL_SRC">
+<set var="XWIN_LOWLEVEL_SRC" hints="files">
     src/unix/fontenum.cpp
     src/unix/fontutil.cpp
     src/unix/utilsx11.cpp
     src/common/taskbarcmn.cpp
     src/unix/taskbarx11.cpp
     src/generic/printps.cpp
     src/unix/fontenum.cpp
     src/unix/fontutil.cpp
     src/unix/utilsx11.cpp
     src/common/taskbarcmn.cpp
     src/unix/taskbarx11.cpp
     src/generic/printps.cpp
+    src/generic/caret.cpp
     src/unix/dialup.cpp
 </set>
     src/unix/dialup.cpp
 </set>
-<set var="XWIN_LOWLEVEL_HDR">
+<set var="XWIN_LOWLEVEL_HDR" hints="files">
     wx/unix/fontutil.h
     wx/unix/utilsx11.h
     wx/unix/taskbarx11.h
     wx/generic/printps.h
     wx/unix/fontutil.h
     wx/unix/utilsx11.h
     wx/unix/taskbarx11.h
     wx/generic/printps.h
+    wx/generic/caret.h
 </set>
 
 
 </set>
 
 
@@ -448,7 +620,7 @@
 <!--                                wxGTK                                   -->
 <!-- ====================================================================== -->
 
 <!--                                wxGTK                                   -->
 <!-- ====================================================================== -->
 
-<set var="GTK_LOWLEVEL_SRC">
+<set var="GTK_LOWLEVEL_SRC" hints="files">
     $(XWIN_LOWLEVEL_SRC)
     src/gtk/gsockgtk.c
     src/gtk/win_gtk.c
     $(XWIN_LOWLEVEL_SRC)
     src/gtk/gsockgtk.c
     src/gtk/win_gtk.c
@@ -481,10 +653,11 @@
     src/gtk/window.cpp
     src/generic/paletteg.cpp
 </set>
     src/gtk/window.cpp
     src/generic/paletteg.cpp
 </set>
-<set var="GTK_LOWLEVEL_HDR">
+<set var="GTK_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
     $(XWIN_LOWLEVEL_HDR)
+    wx/generic/paletteg.h
 </set>
 </set>
-<set var="GTK_SRC">
+<set var="GTK_SRC" hints="files">
     <!-- Generic implementations used by wxGTK: -->
     src/generic/imaglist.cpp
     src/generic/colrdlgg.cpp
     <!-- Generic implementations used by wxGTK: -->
     src/generic/imaglist.cpp
     src/generic/colrdlgg.cpp
@@ -518,6 +691,7 @@
     src/gtk/notebook.cpp
     src/gtk/radiobox.cpp
     src/gtk/radiobut.cpp
     src/gtk/notebook.cpp
     src/gtk/radiobox.cpp
     src/gtk/radiobut.cpp
+    src/gtk/renderer.cpp
     src/gtk/scrolbar.cpp
     src/gtk/scrolwin.cpp
     src/gtk/slider.cpp
     src/gtk/scrolbar.cpp
     src/gtk/scrolwin.cpp
     src/gtk/slider.cpp
@@ -533,7 +707,7 @@
     src/gtk/utilsres.cpp
     src/gtk/wave.cpp
 </set>
     src/gtk/utilsres.cpp
     src/gtk/wave.cpp
 </set>
-<set var="GTK_HDR">
+<set var="GTK_HDR" hints="files">
     wx/gtk/accel.h
     wx/gtk/app.h
     wx/gtk/bitmap.h
     wx/gtk/accel.h
     wx/gtk/app.h
     wx/gtk/bitmap.h
@@ -564,7 +738,6 @@
     wx/gtk/toplevel.h
     wx/gtk/gauge.h
     wx/gtk/gdiobj.h
     wx/gtk/toplevel.h
     wx/gtk/gauge.h
     wx/gtk/gdiobj.h
-    wx/gtk/glcanvas.h
     wx/gtk/icon.h
     wx/gtk/joystick.h
     wx/gtk/listbox.h
     wx/gtk/icon.h
     wx/gtk/joystick.h
     wx/gtk/listbox.h
@@ -601,6 +774,7 @@
     wx/generic/tabg.h
     wx/generic/dirdlgg.h
     wx/generic/statusbr.h
     wx/generic/tabg.h
     wx/generic/dirdlgg.h
     wx/generic/statusbr.h
+    wx/generic/listctrl.h
 </set>
 
 
 </set>
 
 
@@ -608,7 +782,7 @@
 <!--                             wxMotif                                    -->
 <!-- ====================================================================== -->
 
 <!--                             wxMotif                                    -->
 <!-- ====================================================================== -->
 
-<set var="MOTIF_LOWLEVEL_SRC">
+<set var="MOTIF_LOWLEVEL_SRC" hints="files">
     $(XWIN_LOWLEVEL_SRC)
     src/x11/region.cpp
     src/x11/pen.cpp
     $(XWIN_LOWLEVEL_SRC)
     src/x11/region.cpp
     src/x11/pen.cpp
@@ -616,10 +790,10 @@
     src/x11/bitmap.cpp
     src/x11/utilsx.cpp
 </set>
     src/x11/bitmap.cpp
     src/x11/utilsx.cpp
 </set>
-<set var="MOTIF_LOWLEVEL_HDR">
+<set var="MOTIF_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
 </set>
     $(XWIN_LOWLEVEL_HDR)
 </set>
-<set var="MOTIF_SRC">
+<set var="MOTIF_SRC" hints="files">
     src/motif/gsockmot.c
     src/motif/accel.cpp
     src/motif/app.cpp
     src/motif/gsockmot.c
     src/motif/accel.cpp
     src/motif/app.cpp
@@ -648,7 +822,6 @@
     src/motif/frame.cpp
     src/motif/gauge.cpp
     src/motif/gdiobj.cpp
     src/motif/frame.cpp
     src/motif/gauge.cpp
     src/motif/gdiobj.cpp
-    src/motif/glcanvas.cpp
     src/motif/icon.cpp
     src/motif/listbox.cpp
     src/motif/main.cpp
     src/motif/icon.cpp
     src/motif/listbox.cpp
     src/motif/main.cpp
@@ -686,7 +859,7 @@
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
 </set>
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
 </set>
-<set var="MOTIF_HDR">
+<set var="MOTIF_HDR" hints="files">
     wx/motif/accel.h
     wx/motif/app.h
     wx/motif/bmpbuttn.h
     wx/motif/accel.h
     wx/motif/app.h
     wx/motif/bmpbuttn.h
@@ -714,7 +887,6 @@
     wx/motif/frame.h
     wx/motif/gauge.h
     wx/motif/gdiobj.h
     wx/motif/frame.h
     wx/motif/gauge.h
     wx/motif/gdiobj.h
-    wx/motif/glcanvas.h
     wx/motif/icon.h
     wx/motif/listbox.h
     wx/motif/mdi.h
     wx/motif/icon.h
     wx/motif/listbox.h
     wx/motif/mdi.h
@@ -760,7 +932,7 @@
 <!-- ====================================================================== -->
 
 
 <!-- ====================================================================== -->
 
 
-<set var="X11_LOWLEVEL_SRC">
+<set var="X11_LOWLEVEL_SRC" hints="files">
     $(XWIN_LOWLEVEL_SRC)
     src/x11/gsockx11.c
     src/x11/nanox.c
     $(XWIN_LOWLEVEL_SRC)
     src/x11/gsockx11.c
     src/x11/nanox.c
@@ -779,7 +951,6 @@
     src/x11/evtloop.cpp
     src/x11/font.cpp
     src/x11/gdiobj.cpp
     src/x11/evtloop.cpp
     src/x11/font.cpp
     src/x11/gdiobj.cpp
-    src/x11/glcanvas.cpp
     src/x11/icon.cpp
     src/x11/joystick.cpp
     src/x11/main.cpp
     src/x11/icon.cpp
     src/x11/joystick.cpp
     src/x11/main.cpp
@@ -796,7 +967,7 @@
     src/x11/window.cpp
     src/generic/timer.cpp
 </set>
     src/x11/window.cpp
     src/generic/timer.cpp
 </set>
-<set var="X11_LOWLEVEL_HDR">
+<set var="X11_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
     wx/x11/app.h
     wx/x11/bitmap.h
     $(XWIN_LOWLEVEL_HDR)
     wx/x11/app.h
     wx/x11/bitmap.h
@@ -815,7 +986,6 @@
     wx/x11/dnd.h
     wx/x11/font.h
     wx/x11/gdiobj.h
     wx/x11/dnd.h
     wx/x11/font.h
     wx/x11/gdiobj.h
-    wx/x11/glcanvas.h
     wx/x11/icon.h
     wx/x11/joystick.h
     wx/x11/minifram.h
     wx/x11/icon.h
     wx/x11/joystick.h
     wx/x11/minifram.h
@@ -838,7 +1008,7 @@
 <!--                                wxMSW                                   -->
 <!-- ====================================================================== -->
 
 <!--                                wxMSW                                   -->
 <!-- ====================================================================== -->
 
-<set var="MSW_LOWLEVEL_SRC">
+<set var="MSW_LOWLEVEL_SRC" hints="files">
     src/msw/app.cpp
     src/msw/bitmap.cpp
     src/msw/brush.cpp
     src/msw/app.cpp
     src/msw/bitmap.cpp
     src/msw/brush.cpp
@@ -857,14 +1027,12 @@
     src/msw/dirdlg.cpp
     src/msw/display.cpp
     src/msw/enhmeta.cpp
     src/msw/dirdlg.cpp
     src/msw/display.cpp
     src/msw/enhmeta.cpp
-    src/msw/helpbest.cpp
     src/msw/evtloop.cpp
     src/msw/font.cpp
     src/msw/fontenum.cpp
     src/msw/fontutil.cpp
     src/msw/gdiimage.cpp
     src/msw/gdiobj.cpp
     src/msw/evtloop.cpp
     src/msw/font.cpp
     src/msw/fontenum.cpp
     src/msw/fontutil.cpp
     src/msw/gdiimage.cpp
     src/msw/gdiobj.cpp
-    src/msw/glcanvas.cpp
     src/msw/helpchm.cpp
     src/msw/helpwin.cpp
     src/msw/icon.cpp
     src/msw/helpchm.cpp
     src/msw/helpwin.cpp
     src/msw/icon.cpp
@@ -890,9 +1058,9 @@
     src/msw/ole/oleutils.cpp
     src/msw/ole/uuid.cpp
 </set>
     src/msw/ole/oleutils.cpp
     src/msw/ole/uuid.cpp
 </set>
-<set var="MSW_LOWLEVEL_HDR">
+<set var="MSW_LOWLEVEL_HDR" hints="files">
 </set>
 </set>
-<set var="MSW_SRC">
+<set var="MSW_SRC" hints="files">
     src/generic/statusbr.cpp
     src/msw/uxtheme.cpp
     src/msw/ole/access.cpp
     src/generic/statusbr.cpp
     src/msw/uxtheme.cpp
     src/msw/ole/access.cpp
@@ -929,6 +1097,7 @@
     src/msw/printwin.cpp
     src/msw/radiobox.cpp
     src/msw/radiobut.cpp
     src/msw/printwin.cpp
     src/msw/radiobox.cpp
     src/msw/radiobut.cpp
+    src/msw/renderer.cpp
     src/msw/scrolbar.cpp
     src/msw/slider95.cpp
     src/msw/spinbutt.cpp
     src/msw/scrolbar.cpp
     src/msw/slider95.cpp
     src/msw/spinbutt.cpp
@@ -944,8 +1113,7 @@
     src/msw/tglbtn.cpp
     src/msw/treectrl.cpp
 </set>
     src/msw/tglbtn.cpp
     src/msw/treectrl.cpp
 </set>
-<set var="MSW_HDR">
-    wx/msw/access.h
+<set var="MSW_HDR" hints="files">
     wx/msw/accel.h
     wx/msw/app.h
     wx/msw/bitmap.h
     wx/msw/accel.h
     wx/msw/app.h
     wx/msw/bitmap.h
@@ -980,8 +1148,6 @@
     wx/msw/gauge95.h
     wx/msw/gdiimage.h
     wx/msw/gdiobj.h
     wx/msw/gauge95.h
     wx/msw/gdiimage.h
     wx/msw/gdiobj.h
-    wx/msw/glcanvas.h
-    wx/msw/helpbest.h
     wx/msw/helpchm.h
     wx/msw/helpwin.h
     wx/msw/icon.h
     wx/msw/helpchm.h
     wx/msw/helpwin.h
     wx/msw/icon.h
@@ -1033,15 +1199,55 @@
     wx/msw/treectrl.h
     wx/msw/wave.h
     wx/msw/window.h
     wx/msw/treectrl.h
     wx/msw/wave.h
     wx/msw/window.h
-    wx/msw/access.h
-    wx/msw/automtn.h
-    wx/msw/dataform.h
-    wx/msw/dataobj.h
-    wx/msw/dataobj2.h
-    wx/msw/dropsrc.h
-    wx/msw/droptgt.h
-    wx/msw/oleutils.h
-    wx/msw/uuid.h
+    wx/msw/ole/access.h
+    wx/msw/ole/automtn.h
+    wx/msw/ole/dataform.h
+    wx/msw/ole/dataobj.h
+    wx/msw/ole/dataobj2.h
+    wx/msw/ole/dropsrc.h
+    wx/msw/ole/droptgt.h
+    wx/msw/ole/oleutils.h
+    wx/msw/ole/uuid.h
+    wx/msw/helpbest.h
+
+    <!-- Resources must be installed together with headers: -->
+    wx/msw/wx.rc
+    wx/msw/wx.manifest
+    wx/msw/gnuwin32/winresrc.h
+    wx/msw/colours.bmp
+    wx/msw/csquery.bmp
+    wx/msw/disable.bmp
+    wx/msw/blank.cur
+    wx/msw/bullseye.cur
+    wx/msw/clock.cur
+    wx/msw/hand.cur
+    wx/msw/heart.cur
+    wx/msw/magnif1.cur
+    wx/msw/noentry.cur
+    wx/msw/pbrush.cur
+    wx/msw/pencil.cur
+    wx/msw/pntleft.cur
+    wx/msw/pntright.cur
+    wx/msw/query.cur
+    wx/msw/rightarr.cur
+    wx/msw/roller.cur
+    wx/msw/size.cur
+    wx/msw/watch1.cur
+    wx/msw/cdrom.ico
+    wx/msw/child.ico
+    wx/msw/computer.ico
+    wx/msw/drive.ico
+    wx/msw/error.ico
+    wx/msw/file1.ico
+    wx/msw/floppy.ico
+    wx/msw/folder1.ico
+    wx/msw/folder2.ico
+    wx/msw/info.ico
+    wx/msw/mdi.ico
+    wx/msw/question.ico
+    wx/msw/removble.ico
+    wx/msw/std.ico
+    wx/msw/warning.ico
 </set>
 
 
 </set>
 
 
@@ -1049,7 +1255,7 @@
 <!--                                wxMGL                                   -->
 <!-- ====================================================================== -->
 
 <!--                                wxMGL                                   -->
 <!-- ====================================================================== -->
 
-<set var="MGL_LOWLEVEL_SRC">
+<set var="MGL_LOWLEVEL_SRC" hints="files">
     src/mgl/colour.cpp
     src/mgl/dc.cpp
     src/mgl/gdiobj.cpp
     src/mgl/colour.cpp
     src/mgl/dc.cpp
     src/mgl/gdiobj.cpp
@@ -1076,8 +1282,9 @@
     src/mgl/window.cpp
     src/mgl/utils.cpp
     src/generic/timer.cpp
     src/mgl/window.cpp
     src/mgl/utils.cpp
     src/generic/timer.cpp
+    src/generic/caret.cpp
 </set>
 </set>
-<set var="MGL_LOWLEVEL_HDR">
+<set var="MGL_LOWLEVEL_HDR" hints="files">
     wx/mgl/app.h
     wx/mgl/bitmap.h
     wx/mgl/brush.h
     wx/mgl/app.h
     wx/mgl/bitmap.h
     wx/mgl/brush.h
@@ -1100,6 +1307,7 @@
     wx/mgl/toplevel.h
     wx/mgl/window.h
     wx/generic/timer.h
     wx/mgl/toplevel.h
     wx/mgl/window.h
     wx/generic/timer.h
+    wx/generic/caret.h
 </set>
 
 
 </set>
 
 
@@ -1107,11 +1315,11 @@
 <!--                               wxOS/2                                   -->
 <!-- ====================================================================== -->
 
 <!--                               wxOS/2                                   -->
 <!-- ====================================================================== -->
 
-<set var="OS2_LOWLEVEL_SRC">
+<set var="OS2_LOWLEVEL_SRC" hints="files">
 </set>
 </set>
-<set var="OS2_LOWLEVEL_HDR">
+<set var="OS2_LOWLEVEL_HDR" hints="files">
 </set>
 </set>
-<set var="OS2_SRC">
+<set var="OS2_SRC" hints="files">
     src/os2/accel.cpp
     src/os2/app.cpp
     src/os2/bitmap.cpp
     src/os2/accel.cpp
     src/os2/app.cpp
     src/os2/bitmap.cpp
@@ -1184,8 +1392,9 @@
     src/os2/window.cpp
     src/os2/gsocket.c
     src/os2/gsockpm.c
     src/os2/window.cpp
     src/os2/gsocket.c
     src/os2/gsockpm.c
+    src/generic/caret.cpp
 </set>
 </set>
-<set var="OS2_HDR">
+<set var="OS2_HDR" hints="files">
     wx/os2/accel.h
     wx/os2/dataobj.h
     wx/os2/helpwin.h
     wx/os2/accel.h
     wx/os2/dataobj.h
     wx/os2/helpwin.h
@@ -1256,6 +1465,7 @@
     wx/os2/pnghand.h
     wx/os2/statbox.h
     wx/os2/toplevel.h
     wx/os2/pnghand.h
     wx/os2/statbox.h
     wx/os2/toplevel.h
+    wx/generic/caret.h
 </set>
 
 
 </set>
 
 
@@ -1264,11 +1474,11 @@
 <!--                                wxMac                                   -->
 <!-- ====================================================================== -->
 
 <!--                                wxMac                                   -->
 <!-- ====================================================================== -->
 
-<set var="MAC_LOWLEVEL_SRC">
+<set var="MAC_LOWLEVEL_SRC" hints="files">
 </set>
 </set>
-<set var="MAC_LOWLEVEL_HDR">
+<set var="MAC_LOWLEVEL_HDR" hints="files">
 </set>
 </set>
-<set var="MAC_SRC">
+<set var="MAC_SRC" hints="files">
     src/mac/accel.cpp
     src/mac/aga.cpp
     src/mac/app.cpp
     src/mac/accel.cpp
     src/mac/aga.cpp
     src/mac/app.cpp
@@ -1322,6 +1532,7 @@
     src/mac/radiobox.cpp
     src/mac/radiobut.cpp
     src/mac/region.cpp
     src/mac/radiobox.cpp
     src/mac/radiobut.cpp
     src/mac/region.cpp
+    src/mac/renderer.cpp
     src/mac/scrolbar.cpp
     src/mac/settings.cpp
     src/mac/slider.cpp
     src/mac/scrolbar.cpp
     src/mac/settings.cpp
     src/mac/slider.cpp
@@ -1349,10 +1560,12 @@
     src/generic/fdrepdlg.cpp
     src/generic/tabg.cpp
     src/generic/fontdlgg.cpp
     src/generic/fdrepdlg.cpp
     src/generic/tabg.cpp
     src/generic/fontdlgg.cpp
+    src/generic/caret.cpp
     <!-- Unix files used by wxMac: -->
     src/unix/snglinst.cpp
 </set>
     <!-- Unix files used by wxMac: -->
     src/unix/snglinst.cpp
 </set>
-<set var="MAC_HDR">
+<set var="MAC_HDR" hints="files">
+    wx/mac/chkconf.h
     wx/mac/accel.h
     wx/mac/aga.h
     wx/mac/app.h
     wx/mac/accel.h
     wx/mac/aga.h
     wx/mac/app.h
@@ -1386,7 +1599,6 @@
     wx/mac/frame.h
     wx/mac/gauge.h
     wx/mac/gdiobj.h
     wx/mac/frame.h
     wx/mac/gauge.h
     wx/mac/gdiobj.h
-    wx/mac/glcanvas.h
     wx/mac/gsockmac.h
     wx/mac/helpxxxx.h
     wx/mac/icon.h
     wx/mac/gsockmac.h
     wx/mac/helpxxxx.h
     wx/mac/icon.h
@@ -1440,6 +1652,7 @@
     wx/generic/listctrl.h
     wx/generic/fdrepdlg.h
     wx/generic/tabg.h
     wx/generic/listctrl.h
     wx/generic/fdrepdlg.h
     wx/generic/tabg.h
+    wx/generic/caret.h
 </set>
 
 
 </set>
 
 
@@ -1447,11 +1660,11 @@
 <!--                              wxCocoa                                   -->
 <!-- ====================================================================== -->
 
 <!--                              wxCocoa                                   -->
 <!-- ====================================================================== -->
 
-<set var="COCOA_LOWLEVEL_SRC">
+<set var="COCOA_LOWLEVEL_SRC" hints="files">
 </set>
 </set>
-<set var="COCOA_LOWLEVEL_HDR">
+<set var="COCOA_LOWLEVEL_HDR" hints="files">
 </set>
 </set>
-<set var="COCOA_SRC">
+<set var="COCOA_SRC" hints="files">
     src/cocoa/NSBox.mm
     src/cocoa/NSButton.mm
     src/cocoa/NSControl.mm
     src/cocoa/NSBox.mm
     src/cocoa/NSButton.mm
     src/cocoa/NSControl.mm
@@ -1463,23 +1676,25 @@
     src/cocoa/app.mm
     src/cocoa/bmpbuttn.mm
     src/cocoa/bitmap.mm
     src/cocoa/app.mm
     src/cocoa/bmpbuttn.mm
     src/cocoa/bitmap.mm
-    src/cocoa/brush.cpp
+    src/cocoa/brush.mm
     src/cocoa/button.mm
     src/cocoa/checkbox.mm
     src/cocoa/checklst.mm
     src/cocoa/choice.mm
     src/cocoa/colour.mm
     src/cocoa/button.mm
     src/cocoa/checkbox.mm
     src/cocoa/checklst.mm
     src/cocoa/choice.mm
     src/cocoa/colour.mm
+    src/cocoa/combobox.mm
     src/cocoa/control.mm
     src/cocoa/cursor.mm
     src/cocoa/data.cpp
     src/cocoa/dc.mm
     src/cocoa/dcclient.mm
     src/cocoa/control.mm
     src/cocoa/cursor.mm
     src/cocoa/data.cpp
     src/cocoa/dc.mm
     src/cocoa/dcclient.mm
-    src/cocoa/dcmemory.cpp
+    src/cocoa/dcmemory.mm
     src/cocoa/dcscreen.cpp
     src/cocoa/dialog.mm
     src/cocoa/font.cpp
     src/cocoa/fontutil.cpp
     src/cocoa/frame.mm
     src/cocoa/dcscreen.cpp
     src/cocoa/dialog.mm
     src/cocoa/font.cpp
     src/cocoa/fontutil.cpp
     src/cocoa/frame.mm
+    src/cocoa/gauge.mm
     src/cocoa/gdiobj.cpp
     src/cocoa/icon.cpp
     src/cocoa/listbox.mm
     src/cocoa/gdiobj.cpp
     src/cocoa/icon.cpp
     src/cocoa/listbox.mm
@@ -1492,6 +1707,7 @@
     src/cocoa/region.cpp
     src/cocoa/settings.cpp
     src/cocoa/slider.mm
     src/cocoa/region.cpp
     src/cocoa/settings.cpp
     src/cocoa/slider.mm
+    src/cocoa/spinbutt.mm
     src/cocoa/statbmp.mm
     src/cocoa/statbox.mm
     src/cocoa/statline2.mm
     src/cocoa/statbmp.mm
     src/cocoa/statbox.mm
     src/cocoa/statline2.mm
@@ -1516,8 +1732,10 @@
     src/generic/accel.cpp
     src/generic/paletteg.cpp
     src/generic/timer.cpp
     src/generic/accel.cpp
     src/generic/paletteg.cpp
     src/generic/timer.cpp
+    src/generic/caret.cpp
+    src/generic/mdig.cpp
 </set>
 </set>
-<set var="COCOA_HDR">
+<set var="COCOA_HDR" hints="files">
     wx/cocoa/NSBox.h
     wx/cocoa/NSButton.h
     wx/cocoa/NSControl.h
     wx/cocoa/NSBox.h
     wx/cocoa/NSButton.h
     wx/cocoa/NSControl.h
@@ -1537,6 +1755,7 @@
     wx/cocoa/checklst.h
     wx/cocoa/choice.h
     wx/cocoa/colour.h
     wx/cocoa/checklst.h
     wx/cocoa/choice.h
     wx/cocoa/colour.h
+    wx/cocoa/combobox.h
     wx/cocoa/control.h
     wx/cocoa/cursor.h
     wx/cocoa/dc.h
     wx/cocoa/control.h
     wx/cocoa/cursor.h
     wx/cocoa/dc.h
@@ -1546,6 +1765,7 @@
     wx/cocoa/dialog.h
     wx/cocoa/font.h
     wx/cocoa/frame.h
     wx/cocoa/dialog.h
     wx/cocoa/font.h
     wx/cocoa/frame.h
+    wx/cocoa/gauge.h
     wx/cocoa/gdiobj.h
     wx/cocoa/icon.h
     wx/cocoa/listbox.h
     wx/cocoa/gdiobj.h
     wx/cocoa/icon.h
     wx/cocoa/listbox.h
@@ -1555,6 +1775,7 @@
     wx/cocoa/radiobox.h
     wx/cocoa/radiobut.h
     wx/cocoa/region.h
     wx/cocoa/radiobox.h
     wx/cocoa/radiobut.h
     wx/cocoa/region.h
+    wx/cocoa/spinbutt.h
     wx/cocoa/statbmp.h
     wx/cocoa/statbox.h
     wx/cocoa/statline.h
     wx/cocoa/statbmp.h
     wx/cocoa/statbox.h
     wx/cocoa/statline.h
@@ -1569,6 +1790,9 @@
     wx/generic/listctrl.h
     wx/generic/fdrepdlg.h
     wx/generic/tabg.h
     wx/generic/listctrl.h
     wx/generic/fdrepdlg.h
     wx/generic/tabg.h
+    wx/generic/caret.h
+    wx/generic/mdig.h
+    wx/generic/paletteg.h
 </set>
 
 
 </set>
 
 
@@ -1577,8 +1801,8 @@
 <!--                              wxUniversal                               -->
 <!-- ====================================================================== -->
 
 <!--                              wxUniversal                               -->
 <!-- ====================================================================== -->
 
-     
-<set var="UNIV_THEMES_SRC">
+
+<set var="UNIV_THEMES_SRC" hints="files">
     src/univ/themes/gtk.cpp
     src/univ/themes/win32.cpp
     src/univ/themes/metal.cpp
     src/univ/themes/gtk.cpp
     src/univ/themes/win32.cpp
     src/univ/themes/metal.cpp
@@ -1592,7 +1816,7 @@
     <if cond="TOOLKIT=='MSW'">src/univ/textctrl.cpp</if>
 </set>
 
     <if cond="TOOLKIT=='MSW'">src/univ/textctrl.cpp</if>
 </set>
 
-<set var="UNIV_SRC">
+<set var="UNIV_SRC" hints="files">
     $(UNIV_TEXTCTRL)
     src/univ/bmpbuttn.cpp
     src/univ/button.cpp
     $(UNIV_TEXTCTRL)
     src/univ/bmpbuttn.cpp
     src/univ/button.cpp
@@ -1627,7 +1851,6 @@
     src/univ/toolbar.cpp
     src/univ/theme.cpp
     src/univ/winuniv.cpp
     src/univ/toolbar.cpp
     src/univ/theme.cpp
     src/univ/winuniv.cpp
-    src/generic/caret.cpp
     src/generic/mdig.cpp
     src/generic/imaglist.cpp
     src/generic/colrdlgg.cpp
     src/generic/mdig.cpp
     src/generic/imaglist.cpp
     src/generic/colrdlgg.cpp
@@ -1641,7 +1864,7 @@
     src/generic/fontdlgg.cpp
     src/generic/tabg.cpp
 </set>
     src/generic/fontdlgg.cpp
     src/generic/tabg.cpp
 </set>
-<set var="UNIV_HDR">
+<set var="UNIV_HDR" hints="files">
     wx/univ/app.h
     wx/univ/bmpbuttn.h
     wx/univ/button.h
     wx/univ/app.h
     wx/univ/bmpbuttn.h
     wx/univ/button.h
@@ -1680,7 +1903,6 @@
     wx/univ/theme.h
     wx/univ/toolbar.h
     wx/univ/window.h
     wx/univ/theme.h
     wx/univ/toolbar.h
     wx/univ/window.h
-    wx/generic/caret.h
     wx/generic/mdig.h
     wx/generic/fdrepdlg.h
     wx/generic/fontdlgg.h
     wx/generic/mdig.h
     wx/generic/fdrepdlg.h
     wx/generic/fontdlgg.h
@@ -1688,6 +1910,7 @@
     wx/generic/dirdlgg.h
     wx/generic/statusbr.h
     wx/generic/accel.h
     wx/generic/dirdlgg.h
     wx/generic/statusbr.h
     wx/generic/accel.h
+    wx/generic/listctrl.h
 </set>
 
 
 </set>
 
 
@@ -1696,7 +1919,13 @@
 <!--                               wxHTML                                   -->
 <!-- ====================================================================== -->
 
 <!--                               wxHTML                                   -->
 <!-- ====================================================================== -->
 
-<set var="HTML_SRC">
+<set var="HTML_SRC_PLATFORM">
+    <if cond="TOOLKIT=='MSW'">
+        src/msw/helpbest.cpp
+    </if>
+</set>
+<set var="HTML_SRC" hints="files">
+    $(HTML_SRC_PLATFORM)
     src/html/helpdata.cpp
     src/html/helpfrm.cpp
     src/html/helpctrl.cpp
     src/html/helpdata.cpp
     src/html/helpfrm.cpp
     src/html/helpctrl.cpp
@@ -1717,10 +1946,61 @@
     src/html/m_tables.cpp
     src/html/m_style.cpp
     src/html/htmprint.cpp
     src/html/m_tables.cpp
     src/html/m_style.cpp
     src/html/htmprint.cpp
+    <!-- wxHTML users: -->
+    src/generic/htmllbox.cpp
+</set>
+<set var="HTML_HDR" hints="files">
+    wx/wxhtml.h
+    wx/html/forcelnk.h
+    wx/html/helpctrl.h
+    wx/html/helpdata.h
+    wx/html/helpfrm.h
+    wx/html/htmlcell.h
+    wx/html/htmldefs.h
+    wx/html/htmlfilt.h
+    wx/html/htmlpars.h
+    wx/html/htmlproc.h
+    wx/html/htmltag.h
+    wx/html/htmlwin.h
+    wx/html/htmprint.h
+    wx/html/m_templ.h
+    wx/html/winpars.h
+    <!-- wxHTML users: -->
+    wx/htmllbox.h
+</set>
+
+
+<!-- ====================================================================== -->
+<!--                               XML classes                              -->
+<!-- ====================================================================== -->
+
+<set var="XML_SRC" hints="files">
+    src/xml/xml.cpp
 </set>
 </set>
-<set var="HTML_HDR">
+<set var="XML_HDR" hints="files">
+    wx/xml/xml.h
+</set>
+
+
+<!-- ====================================================================== -->
+<!--                             OpenGL canvas                              -->
+<!-- ====================================================================== -->
+
+<set var="OPENGL_SRC" hints="files">
+    <if cond="TOOLKIT=='MAC'">src/mac/glcanvas.cpp</if>
+    <if cond="TOOLKIT=='GTK'">src/gtk/glcanvas.cpp</if>
+    <if cond="TOOLKIT=='MSW'">src/msw/glcanvas.cpp</if>
+    <if cond="TOOLKIT=='MOTIF'">src/motif/glcanvas.cpp</if>
+    <if cond="TOOLKIT=='X11'">src/x11/glcanvas.cpp</if>
 </set>
 
 </set>
 
+<set var="OPENGL_HDR" hints="files">
+    <if cond="TOOLKIT=='MAC'">wx/mac/glcanvas.h</if>
+    <if cond="TOOLKIT=='GTK'">wx/gtk/glcanvas.h</if>
+    <if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>
+    <if cond="TOOLKIT=='MOTIF'">wx/motif/glcanvas.h</if>
+    <if cond="TOOLKIT=='X11'">wx/x11/glcanvas.h</if>
+</set>
 
 
 
 
 
 
@@ -1728,36 +2008,39 @@
 <!--                    Define sources for specific libraries:              -->
 <!-- ====================================================================== -->
 
 <!--                    Define sources for specific libraries:              -->
 <!-- ====================================================================== -->
 
-    <set var="BASE_PLATFORM_SRC">
-        <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_SRC)</if>
-        <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC)</if>
-        <!-- FIXME: this should really be 
-                    PLATFORM_MACOSX==1 && TOOLKIT{=='MAC',!='MAC'} -->
+    <!-- Nested if would be nicer, but this works -->
+    <set var="BASE_MACOSX_SRC" hints="files">
         <if cond="TOOLKIT=='MAC'">$(BASE_MAC_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(BASE_DARWIN_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(BASE_MAC_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(BASE_DARWIN_SRC)</if>
+        <if cond="TOOLKIT=='GTK'">$(BASE_DARWIN_SRC)</if>
+        <!-- FIXME: TOOLKIT!='MAC' is what we really want -->
+    </set>
+    <set var="BASE_PLATFORM_SRC" hints="files">
+        <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_SRC)</if>
+        <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC)</if>
+        <if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_SRC)</if>
     </set>
     </set>
-    <set var="BASE_AND_GUI_PLATFORM_SRC">
+    <set var="BASE_AND_GUI_PLATFORM_SRC" hints="files">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_AND_GUI_UNIX_SRC)</if>
         <if cond="PLATFORM_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if>
         <if cond="PLATFORM_UNIX=='1'">$(BASE_AND_GUI_UNIX_SRC)</if>
         <if cond="PLATFORM_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if>
-        <if cond="TOOLKIT=='MAC'">$(BASE_AND_GUI_MAC_SRC)</if>
-        <if cond="TOOLKIT=='COCOA'">$(BASE_AND_GUI_DARWIN_SRC)</if>
+        <if cond="PLATFORM_MACOSX=='1'">$(BASE_AND_GUI_DARWIN_SRC)</if>
     </set>
     </set>
-    <set var="BASE_PLATFORM_HDR">
+    <set var="BASE_PLATFORM_HDR" hints="files">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_HDR)</if>
         <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_HDR)</if>
         <if cond="TOOLKIT=='MAC'">$(BASE_MAC_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(BASE_DARWIN_HDR)</if>
     </set>
         <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_HDR)</if>
         <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_HDR)</if>
         <if cond="TOOLKIT=='MAC'">$(BASE_MAC_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(BASE_DARWIN_HDR)</if>
     </set>
-    
-    <set var="BASE_SRC">
+
+    <set var="BASE_SRC" hints="files">
         $(BASE_CMN_SRC) $(BASE_PLATFORM_SRC)
     </set>
         $(BASE_CMN_SRC) $(BASE_PLATFORM_SRC)
     </set>
-    <set var="BASE_AND_GUI_SRC">
+    <set var="BASE_AND_GUI_SRC" hints="files">
         $(BASE_AND_GUI_CMN_SRC) $(BASE_AND_GUI_PLATFORM_SRC)
     </set>
         $(BASE_AND_GUI_CMN_SRC) $(BASE_AND_GUI_PLATFORM_SRC)
     </set>
-    
-    
-    <set var="LOWLEVEL_SRC">
+
+
+    <set var="LOWLEVEL_SRC" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC)</if>
@@ -1767,7 +2050,7 @@
         <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_SRC)</if>
     </set>
         <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_SRC)</if>
     </set>
-    <set var="LOWLEVEL_HDR">
+    <set var="LOWLEVEL_HDR" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_HDR)</if>
@@ -1778,7 +2061,7 @@
         <if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_HDR)</if>
     </set>
 
         <if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_HDR)</if>
     </set>
 
-    <set var="GUI_SRC">
+    <set var="GUI_SRC" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_SRC)</if>
         <if cond="TOOLKIT=='GTK'">$(GTK_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_SRC)</if>
@@ -1786,7 +2069,7 @@
         <if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if>
         <if cond="TOOLKIT=='OS2'">$(OS2_SRC)</if>
     </set>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if>
         <if cond="TOOLKIT=='OS2'">$(OS2_SRC)</if>
     </set>
-    <set var="GUI_HDR">
+    <set var="GUI_HDR" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_HDR)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_HDR)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_HDR)</if>
         <if cond="TOOLKIT=='GTK'">$(GTK_HDR)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_HDR)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_HDR)</if>
@@ -1795,7 +2078,7 @@
         <if cond="TOOLKIT=='OS2'">$(OS2_HDR)</if>
     </set>
 
         <if cond="TOOLKIT=='OS2'">$(OS2_HDR)</if>
     </set>
 
-    <set var="CORE_SRC">
+    <set var="CORE_SRC" hints="files">
         <if cond="USE_GUI=='1' and WXUNIV=='0'">
             $(LOWLEVEL_SRC) $(GUI_SRC) $(GUI_CMN_SRC)
         </if>
         <if cond="USE_GUI=='1' and WXUNIV=='0'">
             $(LOWLEVEL_SRC) $(GUI_SRC) $(GUI_CMN_SRC)
         </if>
@@ -1804,10 +2087,21 @@
         </if>
     </set>
 
         </if>
     </set>
 
-    <set var="ALL_HEADERS">
+
+    <set var="ALL_GUI_HEADERS" hints="files">
+        <if cond="USE_GUI=='1' and WXUNIV=='0'">
+            $(GUI_CMN_HDR) $(LOWLEVEL_HDR) $(GUI_HDR)
+        </if>
+        <if cond="USE_GUI=='1' and WXUNIV=='1'">
+            $(GUI_CMN_HDR) $(LOWLEVEL_HDR) $(UNIV_HDR)
+        </if>
+    </set>
+
+    <set var="ALL_HEADERS" hints="files">
         $(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
         $(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
-        $(GUI_CMN_HDR) $(GUI_HDR) $(LOWLEVEL_HDR)
-        $(HTML_HDR)
+        $(ALL_GUI_HEADERS)
+        $(HTML_HDR) $(XML_HDR)
+        $(OPENGL_HDR)
     </set>
 
 </makefile>
     </set>
 
 </makefile>
wxWidgets (Impactor)