X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6fa54bfe64598a67ae092eb0af324248b5aa263e..5b87f8bf2ea3b9ae7ac0ae812a311d31cce13bb7:/Makefile.in diff --git a/Makefile.in b/Makefile.in index cb0205b476..ba8d177c86 100644 --- a/Makefile.in +++ b/Makefile.in @@ -20,6 +20,7 @@ DEREZ = @DEREZ@ DLLPREFIX = @DLLPREFIX@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +EXTRALIBS_ODBC = @EXTRALIBS_ODBC@ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@ EXTRALIBS_XML = @EXTRALIBS_XML@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -50,6 +51,186 @@ top_srcdir = @top_srcdir@ ### Variables: ### +ADVDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DWXUSINGDLL -DWXMAKINGDLL_ADV $(CXXFLAGS) $(PIC_FLAG) +ADVDLL_OBJECTS = \ + advdll_calctrl.o \ + advdll_dcbuffer.o \ + advdll_grid.o \ + advdll_gridctrl.o \ + advdll_gridsel.o \ + advdll_helpext.o \ + advdll_laywin.o \ + advdll_sashwin.o \ + advdll_splash.o \ + advdll_tipdlg.o \ + advdll_wizard.o \ + $(__ADVANCED_PLATFORM_SRC_OBJECTS_2) +ADVLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + $(CXXFLAGS) +ADVLIB_OBJECTS = \ + advlib_calctrl.o \ + advlib_dcbuffer.o \ + advlib_grid.o \ + advlib_gridctrl.o \ + advlib_gridsel.o \ + advlib_helpext.o \ + advlib_laywin.o \ + advlib_sashwin.o \ + advlib_splash.o \ + advlib_tipdlg.o \ + advlib_wizard.o \ + $(__ADVANCED_PLATFORM_SRC_OBJECTS_3) +ALL_HEADERS = \ + wx/app.h \ + wx/apptrait.h \ + wx/arrimpl.cpp \ + wx/arrstr.h \ + wx/beforestd.h \ + wx/buffer.h \ + wx/build.h \ + wx/chkconf.h \ + wx/clntdata.h \ + wx/cmdline.h \ + wx/confbase.h \ + wx/config.h \ + wx/containr.h \ + wx/datetime.h \ + wx/datetime.inl \ + wx/datstrm.h \ + wx/dde.h \ + wx/debug.h \ + wx/defs.h \ + wx/dir.h \ + wx/dynarray.h \ + wx/dynlib.h \ + wx/dynload.h \ + wx/encconv.h \ + wx/event.h \ + wx/features.h \ + wx/ffile.h \ + wx/file.h \ + wx/fileconf.h \ + wx/filefn.h \ + wx/filename.h \ + wx/filesys.h \ + wx/fontenc.h \ + wx/fontmap.h \ + wx/fs_mem.h \ + wx/fs_zip.h \ + wx/hash.h \ + wx/hashmap.h \ + wx/iconloc.h \ + wx/init.h \ + wx/intl.h \ + wx/iosfwrap.h \ + wx/ioswrap.h \ + wx/ipc.h \ + wx/ipcbase.h \ + wx/isql.h \ + wx/isqlext.h \ + wx/list.h \ + wx/listimpl.cpp \ + wx/log.h \ + wx/longlong.h \ + wx/math.h \ + wx/memconf.h \ + wx/memory.h \ + wx/memtext.h \ + wx/mimetype.h \ + wx/module.h \ + wx/msgout.h \ + wx/msgout.h \ + wx/mstream.h \ + wx/object.h \ + wx/platform.h \ + wx/process.h \ + wx/regex.h \ + wx/snglinst.h \ + wx/stopwatch.h \ + wx/strconv.h \ + wx/stream.h \ + wx/string.h \ + wx/sysopt.h \ + wx/textbuf.h \ + wx/textfile.h \ + wx/thread.h \ + wx/thrimpl.cpp \ + wx/tokenzr.h \ + wx/txtstrm.h \ + wx/types.h \ + wx/utils.h \ + wx/variant.h \ + wx/vector.h \ + wx/version.h \ + wx/volume.h \ + wx/wfstream.h \ + wx/wx.h \ + wx/wxchar.h \ + wx/wxprec.h \ + wx/zipstrm.h \ + wx/zstream.h \ + $(BASE_PLATFORM_HDR) \ + wx/fs_inet.h \ + wx/gsocket.h \ + wx/protocol/file.h \ + wx/protocol/ftp.h \ + wx/protocol/http.h \ + wx/protocol/protocol.h \ + wx/sckaddr.h \ + wx/sckipc.h \ + wx/sckstrm.h \ + wx/socket.h \ + wx/url.h \ + $(NET_PLATFORM_HDR) \ + $(ALL_GUI_HEADERS) \ + wx/calctrl.h \ + wx/dcbuffer.h \ + wx/generic/calctrl.h \ + wx/generic/grid.h \ + wx/generic/gridctrl.h \ + wx/generic/gridsel.h \ + wx/generic/helpext.h \ + wx/generic/laywin.h \ + wx/generic/sashwin.h \ + wx/generic/splash.h \ + wx/generic/wizard.h \ + wx/grid.h \ + wx/joystick.h \ + wx/laywin.h \ + wx/sashwin.h \ + wx/splash.h \ + wx/taskbar.h \ + wx/tipdlg.h \ + wx/wave.h \ + wx/wizard.h \ + $(ADVANCED_PLATFORM_HDR) \ + 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 \ + wx/wxhtml.h \ + wx/htmllbox.h \ + wx/xml/xml.h \ + $(OPENGL_HDR) \ + wx/db.h \ + wx/dbkeyg.h \ + wx/dbtable.h \ + wx/dbgrid.h BASEDLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ @@ -65,8 +246,6 @@ BASEDLL_OBJECTS = \ basedll_config.o \ basedll_datetime.o \ basedll_datstrm.o \ - basedll_db.o \ - basedll_dbtable.o \ basedll_dircmn.o \ basedll_dynarray.o \ basedll_dynlib.o \ @@ -132,8 +311,6 @@ BASELIB_OBJECTS = \ baselib_config.o \ baselib_datetime.o \ baselib_datstrm.o \ - baselib_db.o \ - baselib_dbtable.o \ baselib_dircmn.o \ baselib_dynarray.o \ baselib_dynlib.o \ @@ -214,6 +391,18 @@ CORELIB_OBJECTS = \ corelib_utilscmn.o \ $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5) \ $(__CORE_SRC_OBJECTS_3) +DBGRIDDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DWXUSINGDLL -DWXMAKINGDLL_DBGRID $(CXXFLAGS) $(PIC_FLAG) +DBGRIDDLL_OBJECTS = \ + dbgriddll_dbgrid.o +DBGRIDLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + $(CXXFLAGS) +DBGRIDLIB_OBJECTS = \ + dbgridlib_dbgrid.o GLDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ @@ -232,26 +421,26 @@ HTMLDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -DWXUSINGDLL -DWXMAKINGDLL_HTML $(CXXFLAGS) $(PIC_FLAG) HTMLDLL_OBJECTS = \ $(__HTML_SRC_PLATFORM_OBJECTS_2) \ + htmldll_helpctrl.o \ htmldll_helpdata.o \ htmldll_helpfrm.o \ - htmldll_helpctrl.o \ htmldll_htmlcell.o \ htmldll_htmlfilt.o \ htmldll_htmlpars.o \ htmldll_htmltag.o \ htmldll_htmlwin.o \ - htmldll_winpars.o \ + htmldll_htmprint.o \ + htmldll_m_dflist.o \ htmldll_m_fonts.o \ htmldll_m_hline.o \ htmldll_m_image.o \ htmldll_m_layout.o \ htmldll_m_links.o \ htmldll_m_list.o \ - htmldll_m_dflist.o \ htmldll_m_pre.o \ - htmldll_m_tables.o \ htmldll_m_style.o \ - htmldll_htmprint.o \ + htmldll_m_tables.o \ + htmldll_winpars.o \ htmldll_htmllbox.o HTMLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ @@ -259,26 +448,26 @@ HTMLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(CXXFLAGS) HTMLLIB_OBJECTS = \ $(__HTML_SRC_PLATFORM_OBJECTS_3) \ + htmllib_helpctrl.o \ htmllib_helpdata.o \ htmllib_helpfrm.o \ - htmllib_helpctrl.o \ htmllib_htmlcell.o \ htmllib_htmlfilt.o \ htmllib_htmlpars.o \ htmllib_htmltag.o \ htmllib_htmlwin.o \ - htmllib_winpars.o \ + htmllib_htmprint.o \ + htmllib_m_dflist.o \ htmllib_m_fonts.o \ htmllib_m_hline.o \ htmllib_m_image.o \ htmllib_m_layout.o \ htmllib_m_links.o \ htmllib_m_list.o \ - htmllib_m_dflist.o \ htmllib_m_pre.o \ - htmllib_m_tables.o \ htmllib_m_style.o \ - htmllib_htmprint.o \ + htmllib_m_tables.o \ + htmllib_winpars.o \ htmllib_htmllbox.o LIBDIRNAME = $(top_builddir)lib MONODLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @@ -296,8 +485,6 @@ MONODLL_OBJECTS = \ monodll_config.o \ monodll_datetime.o \ monodll_datstrm.o \ - monodll_db.o \ - monodll_dbtable.o \ monodll_dircmn.o \ monodll_dynarray.o \ monodll_dynlib.o \ @@ -352,12 +539,12 @@ MONODLL_OBJECTS = \ monodll_ftp.o \ monodll_http.o \ monodll_protocol.o \ - monodll_url.o \ - monodll_sckfile.o \ monodll_sckaddr.o \ + monodll_sckfile.o \ monodll_sckipc.o \ monodll_sckstrm.o \ monodll_socket.o \ + monodll_url.o \ $(__NET_PLATFORM_SRC_OBJECTS) \ $(__MONOLIB_GUI_SRC_OBJECTS) \ monodll_xml.o @@ -376,8 +563,6 @@ MONOLIB_OBJECTS = \ monolib_config.o \ monolib_datetime.o \ monolib_datstrm.o \ - monolib_db.o \ - monolib_dbtable.o \ monolib_dircmn.o \ monolib_dynarray.o \ monolib_dynlib.o \ @@ -432,12 +617,12 @@ MONOLIB_OBJECTS = \ monolib_ftp.o \ monolib_http.o \ monolib_protocol.o \ - monolib_url.o \ - monolib_sckfile.o \ monolib_sckaddr.o \ + monolib_sckfile.o \ monolib_sckipc.o \ monolib_sckstrm.o \ monolib_socket.o \ + monolib_url.o \ $(__NET_PLATFORM_SRC_OBJECTS_1) \ $(__MONOLIB_GUI_SRC_OBJECTS_1) \ monolib_xml.o @@ -454,12 +639,12 @@ NETDLL_OBJECTS = \ netdll_ftp.o \ netdll_http.o \ netdll_protocol.o \ - netdll_url.o \ - netdll_sckfile.o \ netdll_sckaddr.o \ + netdll_sckfile.o \ netdll_sckipc.o \ netdll_sckstrm.o \ netdll_socket.o \ + netdll_url.o \ $(__NET_PLATFORM_SRC_OBJECTS_2) NETLIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ @@ -474,13 +659,27 @@ NETLIB_OBJECTS = \ netlib_ftp.o \ netlib_http.o \ netlib_protocol.o \ - netlib_url.o \ - netlib_sckfile.o \ netlib_sckaddr.o \ + netlib_sckfile.o \ netlib_sckipc.o \ netlib_sckstrm.o \ netlib_socket.o \ + netlib_url.o \ $(__NET_PLATFORM_SRC_OBJECTS_3) +ODBCDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DWXUSINGDLL -DWXMAKINGDLL_ODBC $(CXXFLAGS) $(PIC_FLAG) +ODBCDLL_OBJECTS = \ + odbcdll_db.o \ + odbcdll_dbtable.o +ODBCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + $(CXXFLAGS) +ODBCLIB_OBJECTS = \ + odbclib_db.o \ + odbclib_dbtable.o WXEXPAT_CFLAGS = $(CPPFLAGS) -I./src/expat $(CFLAGS) WXEXPAT_OBJECTS = \ wxexpat_xmlparse.o \ @@ -642,97 +841,101 @@ XMLLIB_OBJECTS = \ ### Conditionally set variables: ### +@COND_TOOLKIT_GTK@ADVANCED_PLATFORM_HDR = \ +@COND_TOOLKIT_GTK@ wx/unix/joystick.h wx/unix/taskbarx11.h wx/unix/wave.h +@COND_TOOLKIT_MAC@ADVANCED_PLATFORM_HDR = \ +@COND_TOOLKIT_MAC@ wx/mac/joystick.h wx/mac/wave.h +@COND_TOOLKIT_MOTIF@ADVANCED_PLATFORM_HDR = \ +@COND_TOOLKIT_MOTIF@ wx/unix/joystick.h wx/unix/taskbarx11.h wx/unix/wave.h +@COND_TOOLKIT_MSW@ADVANCED_PLATFORM_HDR = \ +@COND_TOOLKIT_MSW@ wx/msw/joystick.h wx/msw/taskbar.h wx/msw/wave.h +@COND_TOOLKIT_OS2@ADVANCED_PLATFORM_HDR = \ +@COND_TOOLKIT_OS2@ wx/os2/joystick.h wx/os2/wave.h +@COND_TOOLKIT_X11@ADVANCED_PLATFORM_HDR = \ +@COND_TOOLKIT_X11@ wx/unix/joystick.h wx/unix/taskbarx11.h wx/unix/wave.h COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS = \ - wx/gdicmn.h \ + wx/bmpbuttn.h \ + wx/brush.h \ + wx/button.h \ + wx/checkbox.h \ + wx/checklst.h \ + wx/choicdlg.h \ + wx/choice.h \ + wx/cmndata.h \ + wx/combobox.h \ + wx/control.h \ + wx/ctrlsub.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/dragimag.h \ wx/filedlg.h \ - wx/validate.h \ - wx/valtext.h \ - wx/selstore.h \ + wx/frame.h \ + wx/gauge.h \ + wx/gdicmn.h \ wx/generic/accel.h \ - wx/generic/calctrl.h \ wx/generic/choicdgg.h \ wx/generic/colrdlgg.h \ wx/generic/dcpsg.h \ wx/generic/dirctrlg.h \ - wx/generic/fontdlgg.h \ + wx/generic/dragimgg.h \ wx/generic/filedlgg.h \ - wx/generic/grid.h \ - wx/generic/gridctrl.h \ - wx/generic/grid.h \ - wx/generic/helpext.h \ - wx/generic/logg.h \ - wx/helphtml.h \ + wx/generic/fontdlgg.h \ wx/generic/imaglist.h \ - wx/generic/laywin.h \ + wx/generic/logg.h \ wx/generic/msgdlgg.h \ wx/generic/notebook.h \ wx/generic/panelg.h \ wx/generic/prntdlgg.h \ wx/generic/progdlgg.h \ - wx/generic/sashwin.h \ wx/generic/scrolwin.h \ wx/generic/spinctlg.h \ - wx/generic/splash.h \ wx/generic/splitter.h \ wx/generic/textdlgg.h \ wx/generic/timer.h \ - wx/generic/wizard.h \ wx/generic/treectlg.h \ + wx/helphtml.h \ + wx/icon.h \ + wx/layout.h \ + wx/listbox.h \ + wx/mdi.h \ + wx/menu.h \ + wx/msgdlg.h \ + wx/palette.h \ + wx/panel.h \ + wx/pen.h \ + wx/radiobox.h \ + wx/radiobut.h \ + wx/renderer.h \ + wx/scrolbar.h \ + wx/scrolbar.h \ + wx/scrolwin.h \ + wx/selstore.h \ + wx/settings.h \ + wx/sizer.h \ + wx/slider.h \ + wx/statbmp.h \ + wx/statbox.h \ + wx/stattext.h \ + wx/statusbr.h \ + wx/textctrl.h \ + wx/textdlg.h \ + wx/timer.h \ + wx/toolbar.h \ + wx/validate.h \ + wx/valtext.h \ + wx/window.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 \ @@ -740,8 +943,6 @@ COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS = \ wx/colour.h \ wx/cshelp.h \ wx/dataobj.h \ - wx/dbgrid.h \ - wx/dcbuffer.h \ wx/dcmirror.h \ wx/dcps.h \ wx/dialup.h \ @@ -750,7 +951,6 @@ COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS = \ wx/dnd.h \ wx/docmdi.h \ wx/docview.h \ - wx/dragimag.h \ wx/effects.h \ wx/evtloop.h \ wx/fdrepdlg.h \ @@ -763,7 +963,6 @@ COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS = \ wx/geometry.h \ wx/gifdecod.h \ wx/glcanvas.h \ - wx/grid.h \ wx/help.h \ wx/helpbase.h \ wx/helpwin.h \ @@ -779,8 +978,6 @@ COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS = \ wx/imagpnm.h \ wx/imagtiff.h \ wx/imagxpm.h \ - wx/joystick.h \ - wx/laywin.h \ wx/listbase.h \ wx/listctrl.h \ wx/matrix.h \ @@ -799,21 +996,17 @@ COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS = \ 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 \ @@ -823,106 +1016,94 @@ COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS = \ 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 \ $(LOWLEVEL_HDR) \ $(GUI_HDR) @COND_USE_GUI_1_WXUNIV_0@ALL_GUI_HEADERS = $(COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS) COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS = \ - wx/gdicmn.h \ + wx/bmpbuttn.h \ + wx/brush.h \ + wx/button.h \ + wx/checkbox.h \ + wx/checklst.h \ + wx/choicdlg.h \ + wx/choice.h \ + wx/cmndata.h \ + wx/combobox.h \ + wx/control.h \ + wx/ctrlsub.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/dragimag.h \ wx/filedlg.h \ - wx/validate.h \ - wx/valtext.h \ - wx/selstore.h \ + wx/frame.h \ + wx/gauge.h \ + wx/gdicmn.h \ wx/generic/accel.h \ - wx/generic/calctrl.h \ wx/generic/choicdgg.h \ wx/generic/colrdlgg.h \ wx/generic/dcpsg.h \ wx/generic/dirctrlg.h \ - wx/generic/fontdlgg.h \ + wx/generic/dragimgg.h \ wx/generic/filedlgg.h \ - wx/generic/grid.h \ - wx/generic/gridctrl.h \ - wx/generic/grid.h \ - wx/generic/helpext.h \ - wx/generic/logg.h \ - wx/helphtml.h \ + wx/generic/fontdlgg.h \ wx/generic/imaglist.h \ - wx/generic/laywin.h \ + wx/generic/logg.h \ wx/generic/msgdlgg.h \ wx/generic/notebook.h \ wx/generic/panelg.h \ wx/generic/prntdlgg.h \ wx/generic/progdlgg.h \ - wx/generic/sashwin.h \ wx/generic/scrolwin.h \ wx/generic/spinctlg.h \ - wx/generic/splash.h \ wx/generic/splitter.h \ wx/generic/textdlgg.h \ wx/generic/timer.h \ - wx/generic/wizard.h \ wx/generic/treectlg.h \ + wx/helphtml.h \ + wx/icon.h \ + wx/layout.h \ + wx/listbox.h \ + wx/mdi.h \ + wx/menu.h \ + wx/msgdlg.h \ + wx/palette.h \ + wx/panel.h \ + wx/pen.h \ + wx/radiobox.h \ + wx/radiobut.h \ + wx/renderer.h \ + wx/scrolbar.h \ + wx/scrolbar.h \ + wx/scrolwin.h \ + wx/selstore.h \ + wx/settings.h \ + wx/sizer.h \ + wx/slider.h \ + wx/statbmp.h \ + wx/statbox.h \ + wx/stattext.h \ + wx/statusbr.h \ + wx/textctrl.h \ + wx/textdlg.h \ + wx/timer.h \ + wx/toolbar.h \ + wx/validate.h \ + wx/valtext.h \ + wx/window.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 \ @@ -930,8 +1111,6 @@ COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS = \ wx/colour.h \ wx/cshelp.h \ wx/dataobj.h \ - wx/dbgrid.h \ - wx/dcbuffer.h \ wx/dcmirror.h \ wx/dcps.h \ wx/dialup.h \ @@ -940,7 +1119,6 @@ COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS = \ wx/dnd.h \ wx/docmdi.h \ wx/docview.h \ - wx/dragimag.h \ wx/effects.h \ wx/evtloop.h \ wx/fdrepdlg.h \ @@ -953,7 +1131,6 @@ COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS = \ wx/geometry.h \ wx/gifdecod.h \ wx/glcanvas.h \ - wx/grid.h \ wx/help.h \ wx/helpbase.h \ wx/helpwin.h \ @@ -969,8 +1146,6 @@ COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS = \ wx/imagpnm.h \ wx/imagtiff.h \ wx/imagxpm.h \ - wx/joystick.h \ - wx/laywin.h \ wx/listbase.h \ wx/listctrl.h \ wx/matrix.h \ @@ -989,21 +1164,17 @@ COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS = \ 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 \ @@ -1013,13 +1184,17 @@ COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS = \ 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 \ $(LOWLEVEL_HDR) \ + wx/generic/accel.h \ + wx/generic/dirdlgg.h \ + wx/generic/fdrepdlg.h \ + wx/generic/fontdlgg.h \ + wx/generic/listctrl.h \ + wx/generic/mdig.h \ + wx/generic/statusbr.h \ + wx/generic/tabg.h \ wx/univ/app.h \ wx/univ/bmpbuttn.h \ wx/univ/button.h \ @@ -1031,7 +1206,6 @@ COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS = \ wx/univ/control.h \ wx/univ/dialog.h \ wx/univ/frame.h \ - wx/univ/toplevel.h \ wx/univ/gauge.h \ wx/univ/inpcons.h \ wx/univ/inphand.h \ @@ -1046,7 +1220,6 @@ COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS = \ wx/univ/scrolbar.h \ wx/univ/scrthumb.h \ wx/univ/scrtimer.h \ - wx/univ/setup.h \ wx/univ/slider.h \ wx/univ/spinbutt.h \ wx/univ/statbmp.h \ @@ -1057,25 +1230,19 @@ COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS = \ wx/univ/textctrl.h \ wx/univ/theme.h \ wx/univ/toolbar.h \ - wx/univ/window.h \ - wx/generic/mdig.h \ - wx/generic/fdrepdlg.h \ - wx/generic/fontdlgg.h \ - wx/generic/tabg.h \ - wx/generic/dirdlgg.h \ - wx/generic/statusbr.h \ - wx/generic/accel.h \ - wx/generic/listctrl.h + wx/univ/toplevel.h \ + wx/univ/window.h @COND_USE_GUI_1_WXUNIV_1@ALL_GUI_HEADERS = $(COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS) @COND_PLATFORM_UNIX_1@BASE_PLATFORM_HDR = wx/unix/mimetype.h COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR = \ + wx/msw/chkconf.h \ + wx/msw/crashrpt.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 + wx/msw/wrapcctl.h \ + wx/msw/wrapwin.h @COND_PLATFORM_WIN32_1@BASE_PLATFORM_HDR = $(COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR) @COND_TOOLKIT_COCOA@BASE_PLATFORM_HDR = @COND_TOOLKIT_MAC@BASE_PLATFORM_HDR = @@ -1137,17 +1304,22 @@ COND_TOOLKIT_COCOA_GUI_HDR = \ wx/cocoa/textctrl.h \ wx/cocoa/toplevel.h \ wx/cocoa/window.h \ - wx/generic/statusbr.h \ + wx/generic/caret.h \ + wx/generic/fdrepdlg.h \ wx/generic/fontdlgg.h \ wx/generic/imaglist.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 + wx/generic/paletteg.h \ + wx/generic/statusbr.h \ + wx/generic/tabg.h @COND_TOOLKIT_COCOA@GUI_HDR = $(COND_TOOLKIT_COCOA_GUI_HDR) COND_TOOLKIT_GTK_GUI_HDR = \ + wx/generic/dirdlgg.h \ + wx/generic/fdrepdlg.h \ + wx/generic/listctrl.h \ + wx/generic/statusbr.h \ + wx/generic/tabg.h \ wx/gtk/accel.h \ wx/gtk/app.h \ wx/gtk/bitmap.h \ @@ -1175,11 +1347,9 @@ COND_TOOLKIT_GTK_GUI_HDR = \ wx/gtk/font.h \ wx/gtk/fontdlg.h \ wx/gtk/frame.h \ - wx/gtk/toplevel.h \ wx/gtk/gauge.h \ wx/gtk/gdiobj.h \ wx/gtk/icon.h \ - wx/gtk/joystick.h \ wx/gtk/listbox.h \ wx/gtk/mdi.h \ wx/gtk/menu.h \ @@ -1206,18 +1376,12 @@ COND_TOOLKIT_GTK_GUI_HDR = \ wx/gtk/tglbtn.h \ wx/gtk/timer.h \ wx/gtk/tooltip.h \ + wx/gtk/toplevel.h \ wx/gtk/treectrl.h \ - wx/gtk/wave.h \ wx/gtk/win_gtk.h \ - wx/gtk/window.h \ - wx/generic/fdrepdlg.h \ - wx/generic/tabg.h \ - wx/generic/dirdlgg.h \ - wx/generic/statusbr.h \ - wx/generic/listctrl.h + wx/gtk/window.h @COND_TOOLKIT_GTK@GUI_HDR = $(COND_TOOLKIT_GTK_GUI_HDR) COND_TOOLKIT_MAC_GUI_HDR = \ - wx/mac/chkconf.h \ wx/mac/accel.h \ wx/mac/aga.h \ wx/mac/app.h \ @@ -1227,6 +1391,7 @@ COND_TOOLKIT_MAC_GUI_HDR = \ wx/mac/button.h \ wx/mac/checkbox.h \ wx/mac/checklst.h \ + wx/mac/chkconf.h \ wx/mac/choice.h \ wx/mac/clipbrd.h \ wx/mac/colordlg.h \ @@ -1255,7 +1420,6 @@ COND_TOOLKIT_MAC_GUI_HDR = \ wx/mac/helpxxxx.h \ wx/mac/icon.h \ wx/mac/imaglist.h \ - wx/mac/joystick.h \ wx/mac/listbox.h \ wx/mac/listctrl.h \ wx/mac/macnotfy.h \ @@ -1295,17 +1459,27 @@ COND_TOOLKIT_MAC_GUI_HDR = \ wx/mac/toplevel.h \ wx/mac/treectrl.h \ wx/mac/uma.h \ - wx/mac/wave.h \ wx/mac/window.h \ - wx/generic/statusbr.h \ + wx/generic/caret.h \ + wx/generic/fdrepdlg.h \ wx/generic/fontdlgg.h \ wx/generic/imaglist.h \ wx/generic/listctrl.h \ - wx/generic/fdrepdlg.h \ - wx/generic/tabg.h \ - wx/generic/caret.h + wx/generic/statusbr.h \ + wx/generic/tabg.h @COND_TOOLKIT_MAC@GUI_HDR = $(COND_TOOLKIT_MAC_GUI_HDR) COND_TOOLKIT_MOTIF_GUI_HDR = \ + wx/generic/colrdlgg.h \ + wx/generic/dirdlgg.h \ + wx/generic/fdrepdlg.h \ + wx/generic/fontdlgg.h \ + wx/generic/imaglist.h \ + wx/generic/listctrl.h \ + wx/generic/notebook.h \ + wx/generic/prntdlgg.h \ + wx/generic/statline.h \ + wx/generic/statusbr.h \ + wx/generic/tabg.h \ wx/motif/accel.h \ wx/motif/app.h \ wx/motif/bmpbuttn.h \ @@ -1358,18 +1532,7 @@ COND_TOOLKIT_MOTIF_GUI_HDR = \ wx/motif/timer.h \ wx/motif/toolbar.h \ wx/motif/toplevel.h \ - wx/motif/window.h \ - wx/generic/fdrepdlg.h \ - wx/generic/listctrl.h \ - wx/generic/imaglist.h \ - wx/generic/notebook.h \ - wx/generic/fontdlgg.h \ - wx/generic/colrdlgg.h \ - wx/generic/statline.h \ - wx/generic/tabg.h \ - wx/generic/dirdlgg.h \ - wx/generic/prntdlgg.h \ - wx/generic/statusbr.h + wx/motif/window.h @COND_TOOLKIT_MOTIF@GUI_HDR = $(COND_TOOLKIT_MOTIF_GUI_HDR) COND_TOOLKIT_MSW_GUI_HDR = \ wx/msw/accel.h \ @@ -1406,12 +1569,12 @@ COND_TOOLKIT_MSW_GUI_HDR = \ wx/msw/gauge95.h \ wx/msw/gdiimage.h \ wx/msw/gdiobj.h \ + wx/msw/helpbest.h \ wx/msw/helpchm.h \ wx/msw/helpwin.h \ wx/msw/icon.h \ wx/msw/imaglist.h \ wx/msw/iniconf.h \ - wx/msw/joystick.h \ wx/msw/listbox.h \ wx/msw/listctrl.h \ wx/msw/mdi.h \ @@ -1424,6 +1587,15 @@ COND_TOOLKIT_MSW_GUI_HDR = \ wx/msw/mslu.h \ wx/msw/msvcrt.h \ wx/msw/notebook.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/palette.h \ wx/msw/pen.h \ wx/msw/printdlg.h \ @@ -1438,15 +1610,14 @@ COND_TOOLKIT_MSW_GUI_HDR = \ wx/msw/setup0.h \ wx/msw/slider95.h \ wx/msw/slidrmsw.h \ - wx/msw/spinctrl.h \ wx/msw/spinbutt.h \ + wx/msw/spinctrl.h \ wx/msw/statbmp.h \ wx/msw/statbox.h \ wx/msw/statbr95.h \ wx/msw/statline.h \ wx/msw/stattext.h \ wx/msw/tabctrl.h \ - wx/msw/taskbar.h \ wx/msw/tbar95.h \ wx/msw/tbarmsw.h \ wx/msw/textctrl.h \ @@ -1455,21 +1626,10 @@ COND_TOOLKIT_MSW_GUI_HDR = \ wx/msw/tooltip.h \ wx/msw/toplevel.h \ wx/msw/treectrl.h \ - wx/msw/wave.h \ wx/msw/window.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 \ - wx/msw/wx.rc \ - wx/msw/wx.manifest \ wx/msw/gnuwin32/winresrc.h \ + wx/msw/wx.manifest \ + wx/msw/wx.rc \ wx/msw/colours.bmp \ wx/msw/csquery.bmp \ wx/msw/disable.bmp \ @@ -1506,89 +1666,88 @@ COND_TOOLKIT_MSW_GUI_HDR = \ wx/msw/warning.ico @COND_TOOLKIT_MSW@GUI_HDR = $(COND_TOOLKIT_MSW_GUI_HDR) COND_TOOLKIT_OS2_GUI_HDR = \ + wx/generic/caret.h \ wx/os2/accel.h \ - wx/os2/dataobj.h \ - wx/os2/helpwin.h \ - wx/os2/pngread.h \ - wx/os2/statline.h \ wx/os2/app.h \ - wx/os2/dataobj2.h \ - wx/os2/icon.h \ - wx/os2/stattext.h \ wx/os2/bitmap.h \ + wx/os2/bmpbuttn.h \ + wx/os2/brush.h \ + wx/os2/button.h \ + wx/os2/checkbox.h \ + wx/os2/checklst.h \ + wx/os2/choice.h \ + wx/os2/clipbrd.h \ + wx/os2/colour.h \ + wx/os2/combobox.h \ + wx/os2/control.h \ + wx/os2/cursor.h \ + wx/os2/dataform.h \ + wx/os2/dataobj.h \ + wx/os2/dataobj2.h \ wx/os2/dc.h \ - wx/os2/tabctrl.h \ wx/os2/dcclient.h \ - wx/os2/print.h \ - wx/os2/bmpbuttn.h \ wx/os2/dcmemory.h \ - wx/os2/iniconf.h \ - wx/os2/private.h \ - wx/os2/textctrl.h \ - wx/os2/brush.h \ wx/os2/dcprint.h \ - wx/os2/joystick.h \ - wx/os2/timer.h \ wx/os2/dcscreen.h \ - wx/os2/listbox.h \ - wx/os2/button.h \ wx/os2/dialog.h \ - wx/os2/radiobox.h \ - wx/os2/toolbar.h \ - wx/os2/checkbox.h \ - wx/os2/radiobut.h \ - wx/os2/tooltip.h \ - wx/os2/checklst.h \ wx/os2/dnd.h \ - wx/os2/menu.h \ - wx/os2/region.h \ - wx/os2/menuitem.h \ - wx/os2/choice.h \ wx/os2/filedlg.h \ - wx/os2/metafile.h \ - wx/os2/scrolbar.h \ - wx/os2/wave.h \ - wx/os2/clipbrd.h \ wx/os2/font.h \ - wx/os2/minifram.h \ - wx/os2/settings.h \ - wx/os2/window.h \ wx/os2/fontdlg.h \ - wx/os2/msgdlg.h \ - wx/os2/colour.h \ wx/os2/frame.h \ - wx/os2/setup0.h \ - wx/os2/combobox.h \ wx/os2/gauge.h \ - wx/os2/notebook.h \ - wx/os2/control.h \ wx/os2/gdiimage.h \ - wx/os2/palette.h \ - wx/os2/slider.h \ - wx/os2/cursor.h \ wx/os2/gdiobj.h \ - wx/os2/spinbutt.h \ wx/os2/gsockos2.h \ + wx/os2/helpwin.h \ + wx/os2/icon.h \ + wx/os2/iniconf.h \ + wx/os2/listbox.h \ + wx/os2/menu.h \ + wx/os2/menuitem.h \ + wx/os2/metafile.h \ + wx/os2/minifram.h \ + wx/os2/msgdlg.h \ + wx/os2/notebook.h \ + wx/os2/palette.h \ wx/os2/pen.h \ + wx/os2/pnghand.h \ + wx/os2/pngread.h \ + wx/os2/print.h \ + wx/os2/private.h \ + wx/os2/radiobox.h \ + wx/os2/radiobut.h \ + wx/os2/region.h \ + wx/os2/scrolbar.h \ + wx/os2/settings.h \ + wx/os2/setup0.h \ + wx/os2/slider.h \ + wx/os2/spinbutt.h \ wx/os2/spinctrl.h \ wx/os2/statbmp.h \ - wx/os2/dataform.h \ - wx/os2/pnghand.h \ wx/os2/statbox.h \ + wx/os2/statline.h \ + wx/os2/stattext.h \ + wx/os2/tabctrl.h \ + wx/os2/textctrl.h \ + wx/os2/timer.h \ + wx/os2/toolbar.h \ + wx/os2/tooltip.h \ wx/os2/toplevel.h \ - wx/generic/caret.h + wx/os2/window.h @COND_TOOLKIT_OS2@GUI_HDR = $(COND_TOOLKIT_OS2_GUI_HDR) @COND_TOOLKIT_COCOA@LOWLEVEL_HDR = COND_TOOLKIT_GTK_LOWLEVEL_HDR = \ + wx/generic/caret.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 \ wx/generic/paletteg.h @COND_TOOLKIT_GTK@LOWLEVEL_HDR = $(COND_TOOLKIT_GTK_LOWLEVEL_HDR) @COND_TOOLKIT_MAC@LOWLEVEL_HDR = COND_TOOLKIT_MGL_LOWLEVEL_HDR = \ + wx/generic/caret.h \ + wx/generic/timer.h \ wx/mgl/app.h \ wx/mgl/bitmap.h \ wx/mgl/brush.h \ @@ -1609,25 +1768,22 @@ COND_TOOLKIT_MGL_LOWLEVEL_HDR = \ wx/mgl/private.h \ wx/mgl/region.h \ wx/mgl/toplevel.h \ - wx/mgl/window.h \ - wx/generic/timer.h \ - wx/generic/caret.h + wx/mgl/window.h @COND_TOOLKIT_MGL@LOWLEVEL_HDR = $(COND_TOOLKIT_MGL_LOWLEVEL_HDR) COND_TOOLKIT_MOTIF_LOWLEVEL_HDR = \ - wx/unix/fontutil.h \ - wx/unix/utilsx11.h \ - wx/unix/taskbarx11.h \ + wx/generic/caret.h \ wx/generic/printps.h \ - wx/generic/caret.h + wx/unix/fontutil.h \ + wx/unix/utilsx11.h @COND_TOOLKIT_MOTIF@LOWLEVEL_HDR = $(COND_TOOLKIT_MOTIF_LOWLEVEL_HDR) @COND_TOOLKIT_MSW@LOWLEVEL_HDR = @COND_TOOLKIT_OS2@LOWLEVEL_HDR = COND_TOOLKIT_X11_LOWLEVEL_HDR = \ + wx/generic/caret.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 \ + src/generic/timer.h \ wx/x11/app.h \ wx/x11/bitmap.h \ wx/x11/brush.h \ @@ -1646,7 +1802,6 @@ COND_TOOLKIT_X11_LOWLEVEL_HDR = \ wx/x11/font.h \ wx/x11/gdiobj.h \ wx/x11/icon.h \ - wx/x11/joystick.h \ wx/x11/minifram.h \ wx/x11/palette.h \ wx/x11/pen.h \ @@ -1657,8 +1812,7 @@ COND_TOOLKIT_X11_LOWLEVEL_HDR = \ wx/x11/reparent.h \ wx/x11/textctrl.h \ wx/x11/toplevel.h \ - wx/x11/window.h \ - src/generic/timer.h + wx/x11/window.h @COND_TOOLKIT_X11@LOWLEVEL_HDR = $(COND_TOOLKIT_X11_LOWLEVEL_HDR) @COND_PLATFORM_UNIX_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h @COND_PLATFORM_WIN32_1@NET_PLATFORM_HDR = wx/msw/gsockmsw.h @@ -1675,7 +1829,8 @@ COND_TOOLKIT_X11_LOWLEVEL_HDR = \ @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc -@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d +@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIX = wx_base$(WXBASEPORT) @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIX = wxbase$(WXBASEPORT)250 @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) @@ -1684,8 +1839,90 @@ COND_TOOLKIT_X11_LOWLEVEL_HDR = \ @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ -@COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \ -@COND_PLATFORM_MACOSX_1@ = monodll_utilsunx.o +COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS = \ + monodll_taskbarcmn.o \ + monodll_joystick.o \ + monodll_taskbarx11.o \ + monodll_wave.o +@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS) +@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS = \ +@COND_TOOLKIT_MAC@ monodll_joystick.o monodll_wave.o +COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS = \ + monodll_taskbarcmn.o \ + monodll_joystick.o \ + monodll_taskbarx11.o \ + monodll_wave.o +@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS) +@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS = \ +@COND_TOOLKIT_MSW@ monodll_taskbarcmn.o monodll_joystick.o \ +@COND_TOOLKIT_MSW@ monodll_taskbar.o monodll_wave.o +@COND_TOOLKIT_OS2@__ADVANCED_PLATFORM_SRC_OBJECTS = \ +@COND_TOOLKIT_OS2@ monodll_joystick.o monodll_wave.o +COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS = \ + monodll_taskbarcmn.o \ + monodll_joystick.o \ + monodll_taskbarx11.o \ + monodll_wave.o +@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS) +COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ + monolib_taskbarcmn.o \ + monolib_joystick.o \ + monolib_taskbarx11.o \ + monolib_wave.o +@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_1) +@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ +@COND_TOOLKIT_MAC@ monolib_joystick.o monolib_wave.o +COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ + monolib_taskbarcmn.o \ + monolib_joystick.o \ + monolib_taskbarx11.o \ + monolib_wave.o +@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_1) +@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ +@COND_TOOLKIT_MSW@ monolib_taskbarcmn.o monolib_joystick.o \ +@COND_TOOLKIT_MSW@ monolib_taskbar.o monolib_wave.o +@COND_TOOLKIT_OS2@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ +@COND_TOOLKIT_OS2@ monolib_joystick.o monolib_wave.o +COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ + monolib_taskbarcmn.o \ + monolib_joystick.o \ + monolib_taskbarx11.o \ + monolib_wave.o +@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1) +@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \ +@COND_TOOLKIT_GTK@ advdll_taskbarcmn.o advdll_joystick.o \ +@COND_TOOLKIT_GTK@ advdll_taskbarx11.o advdll_wave.o +@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \ +@COND_TOOLKIT_MAC@ advdll_joystick.o advdll_wave.o +@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \ +@COND_TOOLKIT_MOTIF@ advdll_taskbarcmn.o advdll_joystick.o \ +@COND_TOOLKIT_MOTIF@ advdll_taskbarx11.o advdll_wave.o +@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \ +@COND_TOOLKIT_MSW@ advdll_taskbarcmn.o advdll_joystick.o advdll_taskbar.o \ +@COND_TOOLKIT_MSW@ advdll_wave.o +@COND_TOOLKIT_OS2@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \ +@COND_TOOLKIT_OS2@ advdll_joystick.o advdll_wave.o +@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \ +@COND_TOOLKIT_X11@ advdll_taskbarcmn.o advdll_joystick.o \ +@COND_TOOLKIT_X11@ advdll_taskbarx11.o advdll_wave.o +@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \ +@COND_TOOLKIT_GTK@ advlib_taskbarcmn.o advlib_joystick.o \ +@COND_TOOLKIT_GTK@ advlib_taskbarx11.o advlib_wave.o +@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \ +@COND_TOOLKIT_MAC@ advlib_joystick.o advlib_wave.o +@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \ +@COND_TOOLKIT_MOTIF@ advlib_taskbarcmn.o advlib_joystick.o \ +@COND_TOOLKIT_MOTIF@ advlib_taskbarx11.o advlib_wave.o +@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \ +@COND_TOOLKIT_MSW@ advlib_taskbarcmn.o advlib_joystick.o advlib_taskbar.o \ +@COND_TOOLKIT_MSW@ advlib_wave.o +@COND_TOOLKIT_OS2@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \ +@COND_TOOLKIT_OS2@ advlib_joystick.o advlib_wave.o +@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \ +@COND_TOOLKIT_X11@ advlib_taskbarcmn.o advlib_joystick.o \ +@COND_TOOLKIT_X11@ advlib_taskbarx11.o advlib_wave.o +@COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \ +@COND_PLATFORM_MACOSX_1@ = monodll_utilsunx.o @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \ @COND_PLATFORM_UNIX_1@ = monodll_utilsunx.o @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \ @@ -1735,11 +1972,11 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS = \ monodll_threadpsx.o @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS) COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS = \ - monodll_baseunix.o \ monodll_dirmac.o \ monodll_mimetmac.o \ monodll_utils.o \ - monodll_utilsexc.o + monodll_utilsexc.o \ + monodll_baseunix.o @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS) COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_1 = \ monolib_baseunix.o \ @@ -1756,11 +1993,11 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1 = \ monolib_threadpsx.o @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1) COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1 = \ - monolib_baseunix.o \ monolib_dirmac.o \ monolib_mimetmac.o \ monolib_utils.o \ - monolib_utilsexc.o + monolib_utilsexc.o \ + monolib_baseunix.o @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1) COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_2 = \ basedll_baseunix.o \ @@ -1777,11 +2014,11 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2 = \ basedll_threadpsx.o @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2) COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2 = \ - basedll_baseunix.o \ basedll_dirmac.o \ basedll_mimetmac.o \ basedll_utils.o \ - basedll_utilsexc.o + basedll_utilsexc.o \ + basedll_baseunix.o @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2) COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_3 = \ baselib_baseunix.o \ @@ -1798,11 +2035,11 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3 = \ baselib_threadpsx.o @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3) COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3 = \ - baselib_baseunix.o \ baselib_dirmac.o \ baselib_mimetmac.o \ baselib_utils.o \ - baselib_utilsexc.o + baselib_utilsexc.o \ + baselib_baseunix.o @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3) @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS \ @COND_PLATFORM_MACOSX_1@ = $(__BASE_MACOSX_SRC_OBJECTS) @@ -1815,6 +2052,7 @@ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS = \ @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS) COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \ monodll_basemsw.o \ + monodll_crashrpt.o \ monodll_dde.o \ monodll_dir.o \ monodll_mimetype.o \ @@ -1823,8 +2061,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \ monodll_snglinst.o \ monodll_thread.o \ monodll_utils.o \ - monodll_utilsexc.o \ - monodll_crashrpt.o + monodll_utilsexc.o @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS) @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_1 \ @COND_PLATFORM_MACOSX_1@ = $(__BASE_MACOSX_SRC_OBJECTS_1) @@ -1837,6 +2074,7 @@ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1) COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ monolib_basemsw.o \ + monolib_crashrpt.o \ monolib_dde.o \ monolib_dir.o \ monolib_mimetype.o \ @@ -1845,8 +2083,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ monolib_snglinst.o \ monolib_thread.o \ monolib_utils.o \ - monolib_utilsexc.o \ - monolib_crashrpt.o + monolib_utilsexc.o @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1) @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_2 \ @COND_PLATFORM_MACOSX_1@ = $(__BASE_MACOSX_SRC_OBJECTS_2) @@ -1859,6 +2096,7 @@ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2) COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ basedll_basemsw.o \ + basedll_crashrpt.o \ basedll_dde.o \ basedll_dir.o \ basedll_mimetype.o \ @@ -1867,8 +2105,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ basedll_snglinst.o \ basedll_thread.o \ basedll_utils.o \ - basedll_utilsexc.o \ - basedll_crashrpt.o + basedll_utilsexc.o @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2) @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_3 \ @COND_PLATFORM_MACOSX_1@ = $(__BASE_MACOSX_SRC_OBJECTS_3) @@ -1881,6 +2118,7 @@ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3) COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ baselib_basemsw.o \ + baselib_crashrpt.o \ baselib_dde.o \ baselib_dir.o \ baselib_mimetype.o \ @@ -1889,46 +2127,13 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ baselib_snglinst.o \ baselib_thread.o \ baselib_utils.o \ - baselib_utilsexc.o \ - baselib_crashrpt.o + baselib_utilsexc.o @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3) COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ $(__LOWLEVEL_SRC_OBJECTS) \ $(__GUI_SRC_OBJECTS) \ - monodll_busyinfo.o \ - monodll_calctrl.o \ - monodll_choicdgg.o \ - monodll_dcbuffer.o \ - monodll_dcpsg.o \ - monodll_dirctrlg.o \ - monodll_dragimgg.o \ - monodll_grid.o \ - monodll_gridctrl.o \ - monodll_gridsel.o \ - monodll_helpext.o \ - monodll_laywin.o \ - monodll_logg.o \ - monodll_numdlgg.o \ - monodll_panelg.o \ - monodll_progdlgg.o \ - monodll_renderg.o \ - monodll_sashwin.o \ - monodll_scrlwing.o \ - monodll_selstore.o \ - monodll_spinctlg.o \ - monodll_splash.o \ - monodll_splitter.o \ - monodll_tbarsmpl.o \ - monodll_textdlgg.o \ - monodll_tipdlg.o \ - monodll_tipwin.o \ - monodll_treectlg.o \ - monodll_vlbox.o \ - monodll_vscroll.o \ - monodll_wizard.o \ - monodll_appcmn.o \ - monodll_fontmap.o \ monodll_accesscmn.o \ + monodll_appcmn.o \ monodll_artprov.o \ monodll_artstd.o \ monodll_bmpbase.o \ @@ -1941,7 +2146,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_ctrlcmn.o \ monodll_ctrlsub.o \ monodll_datacmn.o \ - monodll_dbgrid.o \ monodll_dcbase.o \ monodll_dlgcmn.o \ monodll_dndcmn.o \ @@ -1954,9 +2158,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_fddlgcmn.o \ monodll_fldlgcmn.o \ monodll_fontcmn.o \ + monodll_fontmap.o \ monodll_framecmn.o \ - monodll_timercmn.o \ - monodll_toplvcmn.o \ monodll_gaugecmn.o \ monodll_gdicmn.o \ monodll_geometry.o \ @@ -1966,6 +2169,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_imagall.o \ monodll_imagbmp.o \ monodll_image.o \ + monodll_imagfill.o \ monodll_imaggif.o \ monodll_imagiff.o \ monodll_imagjpeg.o \ @@ -1974,7 +2178,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_imagpnm.o \ monodll_imagtiff.o \ monodll_imagxpm.o \ - monodll_imagfill.o \ monodll_layout.o \ monodll_lboxcmn.o \ monodll_matrix.o \ @@ -1992,16 +2195,50 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_statbar.o \ monodll_tbarbase.o \ monodll_textcmn.o \ + monodll_timercmn.o \ + monodll_toplvcmn.o \ monodll_treebase.o \ monodll_valgen.o \ monodll_validate.o \ monodll_valtext.o \ monodll_wincmn.o \ - monodll_xpmdecod.o + monodll_xpmdecod.o \ + monodll_busyinfo.o \ + monodll_choicdgg.o \ + monodll_dcpsg.o \ + monodll_dirctrlg.o \ + monodll_dragimgg.o \ + monodll_logg.o \ + monodll_numdlgg.o \ + monodll_panelg.o \ + monodll_progdlgg.o \ + monodll_renderg.o \ + monodll_scrlwing.o \ + monodll_selstore.o \ + monodll_spinctlg.o \ + monodll_splitter.o \ + monodll_tbarsmpl.o \ + monodll_textdlgg.o \ + monodll_tipwin.o \ + monodll_treectlg.o \ + monodll_vlbox.o \ + monodll_vscroll.o @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS) COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ $(__LOWLEVEL_SRC_OBJECTS) \ $(__UNIV_TEXTCTRL_OBJECTS) \ + monodll_accel.o \ + monodll_colrdlgg.o \ + monodll_dirdlgg.o \ + monodll_fdrepdlg.o \ + monodll_filedlgg.o \ + monodll_fontdlgg.o \ + monodll_imaglist.o \ + monodll_listctrl.o \ + monodll_mdig.o \ + monodll_msgdlgg.o \ + monodll_prntdlgg.o \ + monodll_tabg.o \ monodll_bmpbuttn.o \ monodll_button.o \ monodll_checkbox.o \ @@ -2010,9 +2247,9 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_colschem.o \ monodll_combobox.o \ monodll_control.o \ + monodll_ctrlrend.o \ monodll_dialog.o \ monodll_framuniv.o \ - monodll_topluniv.o \ monodll_gauge.o \ monodll_inpcons.o \ monodll_inphand.o \ @@ -2021,7 +2258,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_notebook.o \ monodll_radiobox.o \ monodll_radiobut.o \ - monodll_renderer.o \ monodll_scrarrow.o \ monodll_scrolbar.o \ monodll_scrthumb.o \ @@ -2032,58 +2268,15 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_statline.o \ monodll_stattext.o \ monodll_statusbr.o \ - monodll_toolbar.o \ monodll_theme.o \ + monodll_toolbar.o \ + monodll_topluniv.o \ monodll_winuniv.o \ - monodll_mdig.o \ - monodll_imaglist.o \ - monodll_colrdlgg.o \ - monodll_listctrl.o \ - monodll_filedlgg.o \ - monodll_dirdlgg.o \ - monodll_prntdlgg.o \ - monodll_accel.o \ - monodll_msgdlgg.o \ - monodll_fdrepdlg.o \ - monodll_fontdlgg.o \ - monodll_tabg.o \ monodll_gtk.o \ - monodll_win32.o \ monodll_metal.o \ - monodll_busyinfo.o \ - monodll_calctrl.o \ - monodll_choicdgg.o \ - monodll_dcbuffer.o \ - monodll_dcpsg.o \ - monodll_dirctrlg.o \ - monodll_dragimgg.o \ - monodll_grid.o \ - monodll_gridctrl.o \ - monodll_gridsel.o \ - monodll_helpext.o \ - monodll_laywin.o \ - monodll_logg.o \ - monodll_numdlgg.o \ - monodll_panelg.o \ - monodll_progdlgg.o \ - monodll_renderg.o \ - monodll_sashwin.o \ - monodll_scrlwing.o \ - monodll_selstore.o \ - monodll_spinctlg.o \ - monodll_splash.o \ - monodll_splitter.o \ - monodll_tbarsmpl.o \ - monodll_textdlgg.o \ - monodll_tipdlg.o \ - monodll_tipwin.o \ - monodll_treectlg.o \ - monodll_vlbox.o \ - monodll_vscroll.o \ - monodll_wizard.o \ - monodll_appcmn.o \ - monodll_fontmap.o \ + monodll_win32.o \ monodll_accesscmn.o \ + monodll_appcmn.o \ monodll_artprov.o \ monodll_artstd.o \ monodll_bmpbase.o \ @@ -2096,7 +2289,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_ctrlcmn.o \ monodll_ctrlsub.o \ monodll_datacmn.o \ - monodll_dbgrid.o \ monodll_dcbase.o \ monodll_dlgcmn.o \ monodll_dndcmn.o \ @@ -2109,9 +2301,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_fddlgcmn.o \ monodll_fldlgcmn.o \ monodll_fontcmn.o \ + monodll_fontmap.o \ monodll_framecmn.o \ - monodll_timercmn.o \ - monodll_toplvcmn.o \ monodll_gaugecmn.o \ monodll_gdicmn.o \ monodll_geometry.o \ @@ -2121,6 +2312,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_imagall.o \ monodll_imagbmp.o \ monodll_image.o \ + monodll_imagfill.o \ monodll_imaggif.o \ monodll_imagiff.o \ monodll_imagjpeg.o \ @@ -2129,7 +2321,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_imagpnm.o \ monodll_imagtiff.o \ monodll_imagxpm.o \ - monodll_imagfill.o \ monodll_layout.o \ monodll_lboxcmn.o \ monodll_matrix.o \ @@ -2147,50 +2338,40 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_statbar.o \ monodll_tbarbase.o \ monodll_textcmn.o \ + monodll_timercmn.o \ + monodll_toplvcmn.o \ monodll_treebase.o \ monodll_valgen.o \ monodll_validate.o \ monodll_valtext.o \ monodll_wincmn.o \ - monodll_xpmdecod.o + monodll_xpmdecod.o \ + monodll_busyinfo.o \ + monodll_choicdgg.o \ + monodll_dcpsg.o \ + monodll_dirctrlg.o \ + monodll_dragimgg.o \ + monodll_logg.o \ + monodll_numdlgg.o \ + monodll_panelg.o \ + monodll_progdlgg.o \ + monodll_renderg.o \ + monodll_scrlwing.o \ + monodll_selstore.o \ + monodll_spinctlg.o \ + monodll_splitter.o \ + monodll_tbarsmpl.o \ + monodll_textdlgg.o \ + monodll_tipwin.o \ + monodll_treectlg.o \ + monodll_vlbox.o \ + monodll_vscroll.o @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS) COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ - $(__LOWLEVEL_SRC_OBJECTS_9) \ + $(__LOWLEVEL_SRC_OBJECTS_8) \ $(__GUI_SRC_OBJECTS_1) \ - monolib_busyinfo.o \ - monolib_calctrl.o \ - monolib_choicdgg.o \ - monolib_dcbuffer.o \ - monolib_dcpsg.o \ - monolib_dirctrlg.o \ - monolib_dragimgg.o \ - monolib_grid.o \ - monolib_gridctrl.o \ - monolib_gridsel.o \ - monolib_helpext.o \ - monolib_laywin.o \ - monolib_logg.o \ - monolib_numdlgg.o \ - monolib_panelg.o \ - monolib_progdlgg.o \ - monolib_renderg.o \ - monolib_sashwin.o \ - monolib_scrlwing.o \ - monolib_selstore.o \ - monolib_spinctlg.o \ - monolib_splash.o \ - monolib_splitter.o \ - monolib_tbarsmpl.o \ - monolib_textdlgg.o \ - monolib_tipdlg.o \ - monolib_tipwin.o \ - monolib_treectlg.o \ - monolib_vlbox.o \ - monolib_vscroll.o \ - monolib_wizard.o \ - monolib_appcmn.o \ - monolib_fontmap.o \ monolib_accesscmn.o \ + monolib_appcmn.o \ monolib_artprov.o \ monolib_artstd.o \ monolib_bmpbase.o \ @@ -2203,7 +2384,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_ctrlcmn.o \ monolib_ctrlsub.o \ monolib_datacmn.o \ - monolib_dbgrid.o \ monolib_dcbase.o \ monolib_dlgcmn.o \ monolib_dndcmn.o \ @@ -2216,9 +2396,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_fddlgcmn.o \ monolib_fldlgcmn.o \ monolib_fontcmn.o \ + monolib_fontmap.o \ monolib_framecmn.o \ - monolib_timercmn.o \ - monolib_toplvcmn.o \ monolib_gaugecmn.o \ monolib_gdicmn.o \ monolib_geometry.o \ @@ -2228,6 +2407,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_imagall.o \ monolib_imagbmp.o \ monolib_image.o \ + monolib_imagfill.o \ monolib_imaggif.o \ monolib_imagiff.o \ monolib_imagjpeg.o \ @@ -2236,7 +2416,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_imagpnm.o \ monolib_imagtiff.o \ monolib_imagxpm.o \ - monolib_imagfill.o \ monolib_layout.o \ monolib_lboxcmn.o \ monolib_matrix.o \ @@ -2254,16 +2433,50 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_statbar.o \ monolib_tbarbase.o \ monolib_textcmn.o \ + monolib_timercmn.o \ + monolib_toplvcmn.o \ monolib_treebase.o \ monolib_valgen.o \ monolib_validate.o \ monolib_valtext.o \ monolib_wincmn.o \ - monolib_xpmdecod.o + monolib_xpmdecod.o \ + monolib_busyinfo.o \ + monolib_choicdgg.o \ + monolib_dcpsg.o \ + monolib_dirctrlg.o \ + monolib_dragimgg.o \ + monolib_logg.o \ + monolib_numdlgg.o \ + monolib_panelg.o \ + monolib_progdlgg.o \ + monolib_renderg.o \ + monolib_scrlwing.o \ + monolib_selstore.o \ + monolib_spinctlg.o \ + monolib_splitter.o \ + monolib_tbarsmpl.o \ + monolib_textdlgg.o \ + monolib_tipwin.o \ + monolib_treectlg.o \ + monolib_vlbox.o \ + monolib_vscroll.o @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1) COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ - $(__LOWLEVEL_SRC_OBJECTS_9) \ + $(__LOWLEVEL_SRC_OBJECTS_8) \ $(__UNIV_TEXTCTRL_OBJECTS_1) \ + monolib_accel.o \ + monolib_colrdlgg.o \ + monolib_dirdlgg.o \ + monolib_fdrepdlg.o \ + monolib_filedlgg.o \ + monolib_fontdlgg.o \ + monolib_imaglist.o \ + monolib_listctrl.o \ + monolib_mdig.o \ + monolib_msgdlgg.o \ + monolib_prntdlgg.o \ + monolib_tabg.o \ monolib_bmpbuttn.o \ monolib_button.o \ monolib_checkbox.o \ @@ -2272,9 +2485,9 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_colschem.o \ monolib_combobox.o \ monolib_control.o \ + monolib_ctrlrend.o \ monolib_dialog.o \ monolib_framuniv.o \ - monolib_topluniv.o \ monolib_gauge.o \ monolib_inpcons.o \ monolib_inphand.o \ @@ -2283,7 +2496,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_notebook.o \ monolib_radiobox.o \ monolib_radiobut.o \ - monolib_renderer.o \ monolib_scrarrow.o \ monolib_scrolbar.o \ monolib_scrthumb.o \ @@ -2294,58 +2506,15 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_statline.o \ monolib_stattext.o \ monolib_statusbr.o \ - monolib_toolbar.o \ monolib_theme.o \ + monolib_toolbar.o \ + monolib_topluniv.o \ monolib_winuniv.o \ - monolib_mdig.o \ - monolib_imaglist.o \ - monolib_colrdlgg.o \ - monolib_listctrl.o \ - monolib_filedlgg.o \ - monolib_dirdlgg.o \ - monolib_prntdlgg.o \ - monolib_accel.o \ - monolib_msgdlgg.o \ - monolib_fdrepdlg.o \ - monolib_fontdlgg.o \ - monolib_tabg.o \ monolib_gtk.o \ - monolib_win32.o \ monolib_metal.o \ - monolib_busyinfo.o \ - monolib_calctrl.o \ - monolib_choicdgg.o \ - monolib_dcbuffer.o \ - monolib_dcpsg.o \ - monolib_dirctrlg.o \ - monolib_dragimgg.o \ - monolib_grid.o \ - monolib_gridctrl.o \ - monolib_gridsel.o \ - monolib_helpext.o \ - monolib_laywin.o \ - monolib_logg.o \ - monolib_numdlgg.o \ - monolib_panelg.o \ - monolib_progdlgg.o \ - monolib_renderg.o \ - monolib_sashwin.o \ - monolib_scrlwing.o \ - monolib_selstore.o \ - monolib_spinctlg.o \ - monolib_splash.o \ - monolib_splitter.o \ - monolib_tbarsmpl.o \ - monolib_textdlgg.o \ - monolib_tipdlg.o \ - monolib_tipwin.o \ - monolib_treectlg.o \ - monolib_vlbox.o \ - monolib_vscroll.o \ - monolib_wizard.o \ - monolib_appcmn.o \ - monolib_fontmap.o \ + monolib_win32.o \ monolib_accesscmn.o \ + monolib_appcmn.o \ monolib_artprov.o \ monolib_artstd.o \ monolib_bmpbase.o \ @@ -2358,7 +2527,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_ctrlcmn.o \ monolib_ctrlsub.o \ monolib_datacmn.o \ - monolib_dbgrid.o \ monolib_dcbase.o \ monolib_dlgcmn.o \ monolib_dndcmn.o \ @@ -2371,9 +2539,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_fddlgcmn.o \ monolib_fldlgcmn.o \ monolib_fontcmn.o \ + monolib_fontmap.o \ monolib_framecmn.o \ - monolib_timercmn.o \ - monolib_toplvcmn.o \ monolib_gaugecmn.o \ monolib_gdicmn.o \ monolib_geometry.o \ @@ -2383,6 +2550,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_imagall.o \ monolib_imagbmp.o \ monolib_image.o \ + monolib_imagfill.o \ monolib_imaggif.o \ monolib_imagiff.o \ monolib_imagjpeg.o \ @@ -2391,7 +2559,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_imagpnm.o \ monolib_imagtiff.o \ monolib_imagxpm.o \ - monolib_imagfill.o \ monolib_layout.o \ monolib_lboxcmn.o \ monolib_matrix.o \ @@ -2409,50 +2576,40 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_statbar.o \ monolib_tbarbase.o \ monolib_textcmn.o \ + monolib_timercmn.o \ + monolib_toplvcmn.o \ monolib_treebase.o \ monolib_valgen.o \ monolib_validate.o \ monolib_valtext.o \ monolib_wincmn.o \ - monolib_xpmdecod.o + monolib_xpmdecod.o \ + monolib_busyinfo.o \ + monolib_choicdgg.o \ + monolib_dcpsg.o \ + monolib_dirctrlg.o \ + monolib_dragimgg.o \ + monolib_logg.o \ + monolib_numdlgg.o \ + monolib_panelg.o \ + monolib_progdlgg.o \ + monolib_renderg.o \ + monolib_scrlwing.o \ + monolib_selstore.o \ + monolib_spinctlg.o \ + monolib_splitter.o \ + monolib_tbarsmpl.o \ + monolib_textdlgg.o \ + monolib_tipwin.o \ + monolib_treectlg.o \ + monolib_vlbox.o \ + monolib_vscroll.o @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1) COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ $(__LOWLEVEL_SRC_OBJECTS_0) \ $(__GUI_SRC_OBJECTS_2) \ - coredll_busyinfo.o \ - coredll_calctrl.o \ - coredll_choicdgg.o \ - coredll_dcbuffer.o \ - coredll_dcpsg.o \ - coredll_dirctrlg.o \ - coredll_dragimgg.o \ - coredll_grid.o \ - coredll_gridctrl.o \ - coredll_gridsel.o \ - coredll_helpext.o \ - coredll_laywin.o \ - coredll_logg.o \ - coredll_numdlgg.o \ - coredll_panelg.o \ - coredll_progdlgg.o \ - coredll_renderg.o \ - coredll_sashwin.o \ - coredll_scrlwing.o \ - coredll_selstore.o \ - coredll_spinctlg.o \ - coredll_splash.o \ - coredll_splitter.o \ - coredll_tbarsmpl.o \ - coredll_textdlgg.o \ - coredll_tipdlg.o \ - coredll_tipwin.o \ - coredll_treectlg.o \ - coredll_vlbox.o \ - coredll_vscroll.o \ - coredll_wizard.o \ - coredll_appcmn.o \ - coredll_fontmap.o \ coredll_accesscmn.o \ + coredll_appcmn.o \ coredll_artprov.o \ coredll_artstd.o \ coredll_bmpbase.o \ @@ -2465,7 +2622,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_ctrlcmn.o \ coredll_ctrlsub.o \ coredll_datacmn.o \ - coredll_dbgrid.o \ coredll_dcbase.o \ coredll_dlgcmn.o \ coredll_dndcmn.o \ @@ -2478,9 +2634,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_fddlgcmn.o \ coredll_fldlgcmn.o \ coredll_fontcmn.o \ + coredll_fontmap.o \ coredll_framecmn.o \ - coredll_timercmn.o \ - coredll_toplvcmn.o \ coredll_gaugecmn.o \ coredll_gdicmn.o \ coredll_geometry.o \ @@ -2490,6 +2645,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_imagall.o \ coredll_imagbmp.o \ coredll_image.o \ + coredll_imagfill.o \ coredll_imaggif.o \ coredll_imagiff.o \ coredll_imagjpeg.o \ @@ -2498,7 +2654,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_imagpnm.o \ coredll_imagtiff.o \ coredll_imagxpm.o \ - coredll_imagfill.o \ coredll_layout.o \ coredll_lboxcmn.o \ coredll_matrix.o \ @@ -2516,16 +2671,50 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_statbar.o \ coredll_tbarbase.o \ coredll_textcmn.o \ + coredll_timercmn.o \ + coredll_toplvcmn.o \ coredll_treebase.o \ coredll_valgen.o \ coredll_validate.o \ coredll_valtext.o \ coredll_wincmn.o \ - coredll_xpmdecod.o + coredll_xpmdecod.o \ + coredll_busyinfo.o \ + coredll_choicdgg.o \ + coredll_dcpsg.o \ + coredll_dirctrlg.o \ + coredll_dragimgg.o \ + coredll_logg.o \ + coredll_numdlgg.o \ + coredll_panelg.o \ + coredll_progdlgg.o \ + coredll_renderg.o \ + coredll_scrlwing.o \ + coredll_selstore.o \ + coredll_spinctlg.o \ + coredll_splitter.o \ + coredll_tbarsmpl.o \ + coredll_textdlgg.o \ + coredll_tipwin.o \ + coredll_treectlg.o \ + coredll_vlbox.o \ + coredll_vscroll.o @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2) COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ $(__LOWLEVEL_SRC_OBJECTS_0) \ $(__UNIV_TEXTCTRL_OBJECTS_2) \ + coredll_accel.o \ + coredll_colrdlgg.o \ + coredll_dirdlgg.o \ + coredll_fdrepdlg.o \ + coredll_filedlgg.o \ + coredll_fontdlgg.o \ + coredll_imaglist.o \ + coredll_listctrl.o \ + coredll_mdig.o \ + coredll_msgdlgg.o \ + coredll_prntdlgg.o \ + coredll_tabg.o \ coredll_bmpbuttn.o \ coredll_button.o \ coredll_checkbox.o \ @@ -2534,9 +2723,9 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_colschem.o \ coredll_combobox.o \ coredll_control.o \ + coredll_ctrlrend.o \ coredll_dialog.o \ coredll_framuniv.o \ - coredll_topluniv.o \ coredll_gauge.o \ coredll_inpcons.o \ coredll_inphand.o \ @@ -2545,7 +2734,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_notebook.o \ coredll_radiobox.o \ coredll_radiobut.o \ - coredll_renderer.o \ coredll_scrarrow.o \ coredll_scrolbar.o \ coredll_scrthumb.o \ @@ -2556,58 +2744,15 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_statline.o \ coredll_stattext.o \ coredll_statusbr.o \ - coredll_toolbar.o \ coredll_theme.o \ + coredll_toolbar.o \ + coredll_topluniv.o \ coredll_winuniv.o \ - coredll_mdig.o \ - coredll_imaglist.o \ - coredll_colrdlgg.o \ - coredll_listctrl.o \ - coredll_filedlgg.o \ - coredll_dirdlgg.o \ - coredll_prntdlgg.o \ - coredll_accel.o \ - coredll_msgdlgg.o \ - coredll_fdrepdlg.o \ - coredll_fontdlgg.o \ - coredll_tabg.o \ coredll_gtk.o \ - coredll_win32.o \ coredll_metal.o \ - coredll_busyinfo.o \ - coredll_calctrl.o \ - coredll_choicdgg.o \ - coredll_dcbuffer.o \ - coredll_dcpsg.o \ - coredll_dirctrlg.o \ - coredll_dragimgg.o \ - coredll_grid.o \ - coredll_gridctrl.o \ - coredll_gridsel.o \ - coredll_helpext.o \ - coredll_laywin.o \ - coredll_logg.o \ - coredll_numdlgg.o \ - coredll_panelg.o \ - coredll_progdlgg.o \ - coredll_renderg.o \ - coredll_sashwin.o \ - coredll_scrlwing.o \ - coredll_selstore.o \ - coredll_spinctlg.o \ - coredll_splash.o \ - coredll_splitter.o \ - coredll_tbarsmpl.o \ - coredll_textdlgg.o \ - coredll_tipdlg.o \ - coredll_tipwin.o \ - coredll_treectlg.o \ - coredll_vlbox.o \ - coredll_vscroll.o \ - coredll_wizard.o \ - coredll_appcmn.o \ - coredll_fontmap.o \ + coredll_win32.o \ coredll_accesscmn.o \ + coredll_appcmn.o \ coredll_artprov.o \ coredll_artstd.o \ coredll_bmpbase.o \ @@ -2620,7 +2765,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_ctrlcmn.o \ coredll_ctrlsub.o \ coredll_datacmn.o \ - coredll_dbgrid.o \ coredll_dcbase.o \ coredll_dlgcmn.o \ coredll_dndcmn.o \ @@ -2633,9 +2777,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_fddlgcmn.o \ coredll_fldlgcmn.o \ coredll_fontcmn.o \ + coredll_fontmap.o \ coredll_framecmn.o \ - coredll_timercmn.o \ - coredll_toplvcmn.o \ coredll_gaugecmn.o \ coredll_gdicmn.o \ coredll_geometry.o \ @@ -2645,6 +2788,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_imagall.o \ coredll_imagbmp.o \ coredll_image.o \ + coredll_imagfill.o \ coredll_imaggif.o \ coredll_imagiff.o \ coredll_imagjpeg.o \ @@ -2653,7 +2797,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_imagpnm.o \ coredll_imagtiff.o \ coredll_imagxpm.o \ - coredll_imagfill.o \ coredll_layout.o \ coredll_lboxcmn.o \ coredll_matrix.o \ @@ -2671,50 +2814,40 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_statbar.o \ coredll_tbarbase.o \ coredll_textcmn.o \ + coredll_timercmn.o \ + coredll_toplvcmn.o \ coredll_treebase.o \ coredll_valgen.o \ coredll_validate.o \ coredll_valtext.o \ coredll_wincmn.o \ - coredll_xpmdecod.o + coredll_xpmdecod.o \ + coredll_busyinfo.o \ + coredll_choicdgg.o \ + coredll_dcpsg.o \ + coredll_dirctrlg.o \ + coredll_dragimgg.o \ + coredll_logg.o \ + coredll_numdlgg.o \ + coredll_panelg.o \ + coredll_progdlgg.o \ + coredll_renderg.o \ + coredll_scrlwing.o \ + coredll_selstore.o \ + coredll_spinctlg.o \ + coredll_splitter.o \ + coredll_tbarsmpl.o \ + coredll_textdlgg.o \ + coredll_tipwin.o \ + coredll_treectlg.o \ + coredll_vlbox.o \ + coredll_vscroll.o @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2) COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ - $(__LOWLEVEL_SRC_OBJECTS_8) \ + $(__LOWLEVEL_SRC_OBJECTS_9) \ $(__GUI_SRC_OBJECTS_3) \ - corelib_busyinfo.o \ - corelib_calctrl.o \ - corelib_choicdgg.o \ - corelib_dcbuffer.o \ - corelib_dcpsg.o \ - corelib_dirctrlg.o \ - corelib_dragimgg.o \ - corelib_grid.o \ - corelib_gridctrl.o \ - corelib_gridsel.o \ - corelib_helpext.o \ - corelib_laywin.o \ - corelib_logg.o \ - corelib_numdlgg.o \ - corelib_panelg.o \ - corelib_progdlgg.o \ - corelib_renderg.o \ - corelib_sashwin.o \ - corelib_scrlwing.o \ - corelib_selstore.o \ - corelib_spinctlg.o \ - corelib_splash.o \ - corelib_splitter.o \ - corelib_tbarsmpl.o \ - corelib_textdlgg.o \ - corelib_tipdlg.o \ - corelib_tipwin.o \ - corelib_treectlg.o \ - corelib_vlbox.o \ - corelib_vscroll.o \ - corelib_wizard.o \ - corelib_appcmn.o \ - corelib_fontmap.o \ corelib_accesscmn.o \ + corelib_appcmn.o \ corelib_artprov.o \ corelib_artstd.o \ corelib_bmpbase.o \ @@ -2727,7 +2860,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_ctrlcmn.o \ corelib_ctrlsub.o \ corelib_datacmn.o \ - corelib_dbgrid.o \ corelib_dcbase.o \ corelib_dlgcmn.o \ corelib_dndcmn.o \ @@ -2740,9 +2872,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_fddlgcmn.o \ corelib_fldlgcmn.o \ corelib_fontcmn.o \ + corelib_fontmap.o \ corelib_framecmn.o \ - corelib_timercmn.o \ - corelib_toplvcmn.o \ corelib_gaugecmn.o \ corelib_gdicmn.o \ corelib_geometry.o \ @@ -2752,6 +2883,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_imagall.o \ corelib_imagbmp.o \ corelib_image.o \ + corelib_imagfill.o \ corelib_imaggif.o \ corelib_imagiff.o \ corelib_imagjpeg.o \ @@ -2760,7 +2892,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_imagpnm.o \ corelib_imagtiff.o \ corelib_imagxpm.o \ - corelib_imagfill.o \ corelib_layout.o \ corelib_lboxcmn.o \ corelib_matrix.o \ @@ -2778,27 +2909,61 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_statbar.o \ corelib_tbarbase.o \ corelib_textcmn.o \ + corelib_timercmn.o \ + corelib_toplvcmn.o \ corelib_treebase.o \ corelib_valgen.o \ corelib_validate.o \ corelib_valtext.o \ corelib_wincmn.o \ - corelib_xpmdecod.o -@COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_3 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3) -COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ - $(__LOWLEVEL_SRC_OBJECTS_8) \ - $(__UNIV_TEXTCTRL_OBJECTS_3) \ - corelib_bmpbuttn.o \ - corelib_button.o \ + corelib_xpmdecod.o \ + corelib_busyinfo.o \ + corelib_choicdgg.o \ + corelib_dcpsg.o \ + corelib_dirctrlg.o \ + corelib_dragimgg.o \ + corelib_logg.o \ + corelib_numdlgg.o \ + corelib_panelg.o \ + corelib_progdlgg.o \ + corelib_renderg.o \ + corelib_scrlwing.o \ + corelib_selstore.o \ + corelib_spinctlg.o \ + corelib_splitter.o \ + corelib_tbarsmpl.o \ + corelib_textdlgg.o \ + corelib_tipwin.o \ + corelib_treectlg.o \ + corelib_vlbox.o \ + corelib_vscroll.o +@COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_3 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3) +COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ + $(__LOWLEVEL_SRC_OBJECTS_9) \ + $(__UNIV_TEXTCTRL_OBJECTS_3) \ + corelib_accel.o \ + corelib_colrdlgg.o \ + corelib_dirdlgg.o \ + corelib_fdrepdlg.o \ + corelib_filedlgg.o \ + corelib_fontdlgg.o \ + corelib_imaglist.o \ + corelib_listctrl.o \ + corelib_mdig.o \ + corelib_msgdlgg.o \ + corelib_prntdlgg.o \ + corelib_tabg.o \ + corelib_bmpbuttn.o \ + corelib_button.o \ corelib_checkbox.o \ corelib_checklst.o \ corelib_choice.o \ corelib_colschem.o \ corelib_combobox.o \ corelib_control.o \ + corelib_ctrlrend.o \ corelib_dialog.o \ corelib_framuniv.o \ - corelib_topluniv.o \ corelib_gauge.o \ corelib_inpcons.o \ corelib_inphand.o \ @@ -2807,7 +2972,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_notebook.o \ corelib_radiobox.o \ corelib_radiobut.o \ - corelib_renderer.o \ corelib_scrarrow.o \ corelib_scrolbar.o \ corelib_scrthumb.o \ @@ -2818,58 +2982,15 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_statline.o \ corelib_stattext.o \ corelib_statusbr.o \ - corelib_toolbar.o \ corelib_theme.o \ + corelib_toolbar.o \ + corelib_topluniv.o \ corelib_winuniv.o \ - corelib_mdig.o \ - corelib_imaglist.o \ - corelib_colrdlgg.o \ - corelib_listctrl.o \ - corelib_filedlgg.o \ - corelib_dirdlgg.o \ - corelib_prntdlgg.o \ - corelib_accel.o \ - corelib_msgdlgg.o \ - corelib_fdrepdlg.o \ - corelib_fontdlgg.o \ - corelib_tabg.o \ corelib_gtk.o \ - corelib_win32.o \ corelib_metal.o \ - corelib_busyinfo.o \ - corelib_calctrl.o \ - corelib_choicdgg.o \ - corelib_dcbuffer.o \ - corelib_dcpsg.o \ - corelib_dirctrlg.o \ - corelib_dragimgg.o \ - corelib_grid.o \ - corelib_gridctrl.o \ - corelib_gridsel.o \ - corelib_helpext.o \ - corelib_laywin.o \ - corelib_logg.o \ - corelib_numdlgg.o \ - corelib_panelg.o \ - corelib_progdlgg.o \ - corelib_renderg.o \ - corelib_sashwin.o \ - corelib_scrlwing.o \ - corelib_selstore.o \ - corelib_spinctlg.o \ - corelib_splash.o \ - corelib_splitter.o \ - corelib_tbarsmpl.o \ - corelib_textdlgg.o \ - corelib_tipdlg.o \ - corelib_tipwin.o \ - corelib_treectlg.o \ - corelib_vlbox.o \ - corelib_vscroll.o \ - corelib_wizard.o \ - corelib_appcmn.o \ - corelib_fontmap.o \ + corelib_win32.o \ corelib_accesscmn.o \ + corelib_appcmn.o \ corelib_artprov.o \ corelib_artstd.o \ corelib_bmpbase.o \ @@ -2882,7 +3003,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_ctrlcmn.o \ corelib_ctrlsub.o \ corelib_datacmn.o \ - corelib_dbgrid.o \ corelib_dcbase.o \ corelib_dlgcmn.o \ corelib_dndcmn.o \ @@ -2895,9 +3015,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_fddlgcmn.o \ corelib_fldlgcmn.o \ corelib_fontcmn.o \ + corelib_fontmap.o \ corelib_framecmn.o \ - corelib_timercmn.o \ - corelib_toplvcmn.o \ corelib_gaugecmn.o \ corelib_gdicmn.o \ corelib_geometry.o \ @@ -2907,6 +3026,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_imagall.o \ corelib_imagbmp.o \ corelib_image.o \ + corelib_imagfill.o \ corelib_imaggif.o \ corelib_imagiff.o \ corelib_imagjpeg.o \ @@ -2915,7 +3035,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_imagpnm.o \ corelib_imagtiff.o \ corelib_imagxpm.o \ - corelib_imagfill.o \ corelib_layout.o \ corelib_lboxcmn.o \ corelib_matrix.o \ @@ -2933,12 +3052,34 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_statbar.o \ corelib_tbarbase.o \ corelib_textcmn.o \ + corelib_timercmn.o \ + corelib_toplvcmn.o \ corelib_treebase.o \ corelib_valgen.o \ corelib_validate.o \ corelib_valtext.o \ corelib_wincmn.o \ - corelib_xpmdecod.o + corelib_xpmdecod.o \ + corelib_busyinfo.o \ + corelib_choicdgg.o \ + corelib_dcpsg.o \ + corelib_dirctrlg.o \ + corelib_dragimgg.o \ + corelib_logg.o \ + corelib_numdlgg.o \ + corelib_panelg.o \ + corelib_progdlgg.o \ + corelib_renderg.o \ + corelib_scrlwing.o \ + corelib_selstore.o \ + corelib_spinctlg.o \ + corelib_splitter.o \ + corelib_tbarsmpl.o \ + corelib_textdlgg.o \ + corelib_tipwin.o \ + corelib_treectlg.o \ + corelib_vlbox.o \ + corelib_vscroll.o @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_3 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3) COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS = \ monodll_NSBox.o \ @@ -2950,8 +3091,8 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS = \ monodll_NSView.o \ monodll_NSWindow.o \ monodll_app.o \ - monodll_bmpbuttn.o \ monodll_bitmap.o \ + monodll_bmpbuttn.o \ monodll_brush.o \ monodll_button.o \ monodll_checkbox.o \ @@ -2996,35 +3137,35 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS = \ monodll_utils.o \ monodll_utilsexc.o \ monodll_window.o \ - monodll_statusbr.o \ - monodll_imaglist.o \ - monodll_listctrl.o \ - monodll_fdrepdlg.o \ - monodll_tabg.o \ - monodll_fontdlgg.o \ + monodll_accel.o \ + monodll_caret.o \ monodll_colrdlgg.o \ - monodll_msgdlgg.o \ monodll_dirdlgg.o \ + monodll_fdrepdlg.o \ monodll_filedlgg.o \ + monodll_fontdlgg.o \ + monodll_imaglist.o \ + monodll_listctrl.o \ + monodll_mdig.o \ + monodll_msgdlgg.o \ monodll_notebook.o \ - monodll_accel.o \ monodll_paletteg.o \ - monodll_timer.o \ - monodll_caret.o \ - monodll_mdig.o + monodll_statusbr.o \ + monodll_tabg.o \ + monodll_timer.o @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS) COND_TOOLKIT_GTK___GUI_SRC_OBJECTS = \ - monodll_imaglist.o \ + monodll_accel.o \ monodll_colrdlgg.o \ - monodll_listctrl.o \ - monodll_filedlgg.o \ monodll_dirdlgg.o \ - monodll_prntdlgg.o \ - monodll_accel.o \ - monodll_msgdlgg.o \ monodll_fdrepdlg.o \ - monodll_tabg.o \ + monodll_filedlgg.o \ + monodll_imaglist.o \ + monodll_listctrl.o \ + monodll_msgdlgg.o \ + monodll_prntdlgg.o \ monodll_statusbr.o \ + monodll_tabg.o \ monodll_bmpbuttn.o \ monodll_button.o \ monodll_checkbox.o \ @@ -3036,7 +3177,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS = \ monodll_fontdlg.o \ monodll_frame.o \ monodll_gauge.o \ - monodll_joystick.o \ monodll_listbox.o \ monodll_mdi.o \ monodll_menu.o \ @@ -3045,7 +3185,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS = \ monodll_notebook.o \ monodll_radiobox.o \ monodll_radiobut.o \ - monodll_renderer.o \ monodll_scrolbar.o \ monodll_scrolwin.o \ monodll_slider.o \ @@ -3058,8 +3197,7 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS = \ monodll_tbargtk.o \ monodll_textctrl.o \ monodll_tglbtn.o \ - monodll_utilsres.o \ - monodll_wave.o + monodll_utilsres.o @COND_TOOLKIT_GTK@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_GTK___GUI_SRC_OBJECTS) COND_TOOLKIT_MAC___GUI_SRC_OBJECTS = \ monodll_accel.o \ @@ -3097,7 +3235,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS = \ monodll_gauge.o \ monodll_gdiobj.o \ monodll_icon.o \ - monodll_joystick.o \ monodll_listbox.o \ monodll_macnotfy.o \ monodll_mdi.o \ @@ -3105,6 +3242,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS = \ monodll_menuitem.o \ monodll_metafile.o \ monodll_minifram.o \ + monodll_MoreFilesX.o \ monodll_msgdlg.o \ monodll_notebmac.o \ monodll_palette.o \ @@ -3129,24 +3267,21 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS = \ monodll_textctrl.o \ monodll_thread.o \ monodll_timer.o \ - monodll_toplevel.o \ monodll_toolbar.o \ monodll_tooltip.o \ + monodll_toplevel.o \ monodll_uma.o \ - monodll_wave.o \ monodll_window.o \ - monodll_MoreFilesX.o \ - monodll_statusbr.o \ + monodll_caret.o \ + monodll_fdrepdlg.o \ + monodll_fontdlgg.o \ monodll_imaglist.o \ monodll_listctrl.o \ - monodll_fdrepdlg.o \ + monodll_statusbr.o \ monodll_tabg.o \ - monodll_fontdlgg.o \ - monodll_caret.o \ monodll_snglinst.o @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS) COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS = \ - monodll_gsockmot.o \ monodll_accel.o \ monodll_app.o \ monodll_bmpbuttn.o \ @@ -3174,6 +3309,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS = \ monodll_frame.o \ monodll_gauge.o \ monodll_gdiobj.o \ + monodll_gsockmot.o \ monodll_icon.o \ monodll_listbox.o \ monodll_main.o \ @@ -3192,28 +3328,26 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS = \ monodll_statbmp.o \ monodll_statbox.o \ monodll_stattext.o \ - monodll_toolbar.o \ monodll_textctrl.o \ monodll_timer.o \ + monodll_toolbar.o \ monodll_toplevel.o \ monodll_utils.o \ monodll_window.o \ + monodll_colrdlgg.o \ + monodll_dirdlgg.o \ monodll_fdrepdlg.o \ - monodll_listctrl.o \ + monodll_fontdlgg.o \ monodll_imaglist.o \ + monodll_listctrl.o \ monodll_notebook.o \ - monodll_fontdlgg.o \ - monodll_colrdlgg.o \ - monodll_statline.o \ - monodll_tabg.o \ - monodll_dirdlgg.o \ monodll_prntdlgg.o \ - monodll_statusbr.o + monodll_statline.o \ + monodll_statusbr.o \ + monodll_tabg.o @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS) COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ monodll_statusbr.o \ - monodll_uxtheme.o \ - monodll_access.o \ monodll_accel.o \ monodll_bmpbuttn.o \ monodll_button.o \ @@ -3241,13 +3375,13 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ monodll_msgdlg.o \ monodll_nativdlg.o \ monodll_notebook.o \ + monodll_access.o \ monodll_ownerdrw.o \ monodll_penwin.o \ monodll_printdlg.o \ monodll_printwin.o \ monodll_radiobox.o \ monodll_radiobut.o \ - monodll_renderer.o \ monodll_scrolbar.o \ monodll_slider95.o \ monodll_spinbutt.o \ @@ -3264,6 +3398,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ monodll_treectrl.o @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS) COND_TOOLKIT_OS2___GUI_SRC_OBJECTS = \ + monodll_caret.o \ monodll_accel.o \ monodll_app.o \ monodll_bitmap.o \ @@ -3296,10 +3431,11 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS = \ monodll_gauge.o \ monodll_gdiimage.o \ monodll_gdiobj.o \ + monodll_gsocket.o \ + monodll_gsockpm.o \ monodll_helpwin.o \ monodll_icon.o \ monodll_iniconf.o \ - monodll_joystick.o \ monodll_listbox.o \ monodll_main.o \ monodll_menu.o \ @@ -3327,16 +3463,12 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS = \ monodll_stattext.o \ monodll_tabctrl.o \ monodll_textctrl.o \ - monodll_timer.o \ monodll_thread.o \ + monodll_timer.o \ monodll_toolbar.o \ monodll_tooltip.o \ monodll_toplevel.o \ - monodll_wave.o \ - monodll_window.o \ - monodll_gsocket.o \ - monodll_gsockpm.o \ - monodll_caret.o + monodll_window.o @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_OS2___GUI_SRC_OBJECTS) COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 = \ monolib_NSBox.o \ @@ -3348,8 +3480,8 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 = \ monolib_NSView.o \ monolib_NSWindow.o \ monolib_app.o \ - monolib_bmpbuttn.o \ monolib_bitmap.o \ + monolib_bmpbuttn.o \ monolib_brush.o \ monolib_button.o \ monolib_checkbox.o \ @@ -3394,35 +3526,35 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 = \ monolib_utils.o \ monolib_utilsexc.o \ monolib_window.o \ - monolib_statusbr.o \ - monolib_imaglist.o \ - monolib_listctrl.o \ - monolib_fdrepdlg.o \ - monolib_tabg.o \ - monolib_fontdlgg.o \ + monolib_accel.o \ + monolib_caret.o \ monolib_colrdlgg.o \ - monolib_msgdlgg.o \ monolib_dirdlgg.o \ + monolib_fdrepdlg.o \ monolib_filedlgg.o \ + monolib_fontdlgg.o \ + monolib_imaglist.o \ + monolib_listctrl.o \ + monolib_mdig.o \ + monolib_msgdlgg.o \ monolib_notebook.o \ - monolib_accel.o \ monolib_paletteg.o \ - monolib_timer.o \ - monolib_caret.o \ - monolib_mdig.o + monolib_statusbr.o \ + monolib_tabg.o \ + monolib_timer.o @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1) COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_1 = \ - monolib_imaglist.o \ + monolib_accel.o \ monolib_colrdlgg.o \ - monolib_listctrl.o \ - monolib_filedlgg.o \ monolib_dirdlgg.o \ - monolib_prntdlgg.o \ - monolib_accel.o \ - monolib_msgdlgg.o \ monolib_fdrepdlg.o \ - monolib_tabg.o \ + monolib_filedlgg.o \ + monolib_imaglist.o \ + monolib_listctrl.o \ + monolib_msgdlgg.o \ + monolib_prntdlgg.o \ monolib_statusbr.o \ + monolib_tabg.o \ monolib_bmpbuttn.o \ monolib_button.o \ monolib_checkbox.o \ @@ -3434,7 +3566,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_1 = \ monolib_fontdlg.o \ monolib_frame.o \ monolib_gauge.o \ - monolib_joystick.o \ monolib_listbox.o \ monolib_mdi.o \ monolib_menu.o \ @@ -3443,7 +3574,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_1 = \ monolib_notebook.o \ monolib_radiobox.o \ monolib_radiobut.o \ - monolib_renderer.o \ monolib_scrolbar.o \ monolib_scrolwin.o \ monolib_slider.o \ @@ -3456,8 +3586,7 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_1 = \ monolib_tbargtk.o \ monolib_textctrl.o \ monolib_tglbtn.o \ - monolib_utilsres.o \ - monolib_wave.o + monolib_utilsres.o @COND_TOOLKIT_GTK@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_1) COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 = \ monolib_accel.o \ @@ -3495,7 +3624,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 = \ monolib_gauge.o \ monolib_gdiobj.o \ monolib_icon.o \ - monolib_joystick.o \ monolib_listbox.o \ monolib_macnotfy.o \ monolib_mdi.o \ @@ -3503,6 +3631,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 = \ monolib_menuitem.o \ monolib_metafile.o \ monolib_minifram.o \ + monolib_MoreFilesX.o \ monolib_msgdlg.o \ monolib_notebmac.o \ monolib_palette.o \ @@ -3527,24 +3656,21 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 = \ monolib_textctrl.o \ monolib_thread.o \ monolib_timer.o \ - monolib_toplevel.o \ monolib_toolbar.o \ monolib_tooltip.o \ + monolib_toplevel.o \ monolib_uma.o \ - monolib_wave.o \ monolib_window.o \ - monolib_MoreFilesX.o \ - monolib_statusbr.o \ + monolib_caret.o \ + monolib_fdrepdlg.o \ + monolib_fontdlgg.o \ monolib_imaglist.o \ monolib_listctrl.o \ - monolib_fdrepdlg.o \ + monolib_statusbr.o \ monolib_tabg.o \ - monolib_fontdlgg.o \ - monolib_caret.o \ monolib_snglinst.o @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1) COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 = \ - monolib_gsockmot.o \ monolib_accel.o \ monolib_app.o \ monolib_bmpbuttn.o \ @@ -3572,6 +3698,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 = \ monolib_frame.o \ monolib_gauge.o \ monolib_gdiobj.o \ + monolib_gsockmot.o \ monolib_icon.o \ monolib_listbox.o \ monolib_main.o \ @@ -3590,28 +3717,26 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 = \ monolib_statbmp.o \ monolib_statbox.o \ monolib_stattext.o \ - monolib_toolbar.o \ monolib_textctrl.o \ monolib_timer.o \ + monolib_toolbar.o \ monolib_toplevel.o \ monolib_utils.o \ monolib_window.o \ + monolib_colrdlgg.o \ + monolib_dirdlgg.o \ monolib_fdrepdlg.o \ - monolib_listctrl.o \ + monolib_fontdlgg.o \ monolib_imaglist.o \ + monolib_listctrl.o \ monolib_notebook.o \ - monolib_fontdlgg.o \ - monolib_colrdlgg.o \ - monolib_statline.o \ - monolib_tabg.o \ - monolib_dirdlgg.o \ monolib_prntdlgg.o \ - monolib_statusbr.o + monolib_statline.o \ + monolib_statusbr.o \ + monolib_tabg.o @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1) COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ monolib_statusbr.o \ - monolib_uxtheme.o \ - monolib_access.o \ monolib_accel.o \ monolib_bmpbuttn.o \ monolib_button.o \ @@ -3639,13 +3764,13 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ monolib_msgdlg.o \ monolib_nativdlg.o \ monolib_notebook.o \ + monolib_access.o \ monolib_ownerdrw.o \ monolib_penwin.o \ monolib_printdlg.o \ monolib_printwin.o \ monolib_radiobox.o \ monolib_radiobut.o \ - monolib_renderer.o \ monolib_scrolbar.o \ monolib_slider95.o \ monolib_spinbutt.o \ @@ -3662,6 +3787,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ monolib_treectrl.o @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1) COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_1 = \ + monolib_caret.o \ monolib_accel.o \ monolib_app.o \ monolib_bitmap.o \ @@ -3694,10 +3820,11 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_1 = \ monolib_gauge.o \ monolib_gdiimage.o \ monolib_gdiobj.o \ + monolib_gsocket.o \ + monolib_gsockpm.o \ monolib_helpwin.o \ monolib_icon.o \ monolib_iniconf.o \ - monolib_joystick.o \ monolib_listbox.o \ monolib_main.o \ monolib_menu.o \ @@ -3725,16 +3852,12 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_1 = \ monolib_stattext.o \ monolib_tabctrl.o \ monolib_textctrl.o \ - monolib_timer.o \ monolib_thread.o \ + monolib_timer.o \ monolib_toolbar.o \ monolib_tooltip.o \ monolib_toplevel.o \ - monolib_wave.o \ - monolib_window.o \ - monolib_gsocket.o \ - monolib_gsockpm.o \ - monolib_caret.o + monolib_window.o @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_1) COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 = \ coredll_NSBox.o \ @@ -3746,8 +3869,8 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 = \ coredll_NSView.o \ coredll_NSWindow.o \ coredll_app.o \ - coredll_bmpbuttn.o \ coredll_bitmap.o \ + coredll_bmpbuttn.o \ coredll_brush.o \ coredll_button.o \ coredll_checkbox.o \ @@ -3792,35 +3915,35 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 = \ coredll_utils.o \ coredll_utilsexc.o \ coredll_window.o \ - coredll_statusbr.o \ - coredll_imaglist.o \ - coredll_listctrl.o \ - coredll_fdrepdlg.o \ - coredll_tabg.o \ - coredll_fontdlgg.o \ + coredll_accel.o \ + coredll_caret.o \ coredll_colrdlgg.o \ - coredll_msgdlgg.o \ coredll_dirdlgg.o \ + coredll_fdrepdlg.o \ coredll_filedlgg.o \ + coredll_fontdlgg.o \ + coredll_imaglist.o \ + coredll_listctrl.o \ + coredll_mdig.o \ + coredll_msgdlgg.o \ coredll_notebook.o \ - coredll_accel.o \ coredll_paletteg.o \ - coredll_timer.o \ - coredll_caret.o \ - coredll_mdig.o + coredll_statusbr.o \ + coredll_tabg.o \ + coredll_timer.o @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2) COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_2 = \ - coredll_imaglist.o \ + coredll_accel.o \ coredll_colrdlgg.o \ - coredll_listctrl.o \ - coredll_filedlgg.o \ coredll_dirdlgg.o \ - coredll_prntdlgg.o \ - coredll_accel.o \ - coredll_msgdlgg.o \ coredll_fdrepdlg.o \ - coredll_tabg.o \ + coredll_filedlgg.o \ + coredll_imaglist.o \ + coredll_listctrl.o \ + coredll_msgdlgg.o \ + coredll_prntdlgg.o \ coredll_statusbr.o \ + coredll_tabg.o \ coredll_bmpbuttn.o \ coredll_button.o \ coredll_checkbox.o \ @@ -3832,7 +3955,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_2 = \ coredll_fontdlg.o \ coredll_frame.o \ coredll_gauge.o \ - coredll_joystick.o \ coredll_listbox.o \ coredll_mdi.o \ coredll_menu.o \ @@ -3841,7 +3963,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_2 = \ coredll_notebook.o \ coredll_radiobox.o \ coredll_radiobut.o \ - coredll_renderer.o \ coredll_scrolbar.o \ coredll_scrolwin.o \ coredll_slider.o \ @@ -3854,8 +3975,7 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_2 = \ coredll_tbargtk.o \ coredll_textctrl.o \ coredll_tglbtn.o \ - coredll_utilsres.o \ - coredll_wave.o + coredll_utilsres.o @COND_TOOLKIT_GTK@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_2) COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 = \ coredll_accel.o \ @@ -3893,7 +4013,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 = \ coredll_gauge.o \ coredll_gdiobj.o \ coredll_icon.o \ - coredll_joystick.o \ coredll_listbox.o \ coredll_macnotfy.o \ coredll_mdi.o \ @@ -3901,6 +4020,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 = \ coredll_menuitem.o \ coredll_metafile.o \ coredll_minifram.o \ + coredll_MoreFilesX.o \ coredll_msgdlg.o \ coredll_notebmac.o \ coredll_palette.o \ @@ -3925,24 +4045,21 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 = \ coredll_textctrl.o \ coredll_thread.o \ coredll_timer.o \ - coredll_toplevel.o \ coredll_toolbar.o \ coredll_tooltip.o \ + coredll_toplevel.o \ coredll_uma.o \ - coredll_wave.o \ coredll_window.o \ - coredll_MoreFilesX.o \ - coredll_statusbr.o \ + coredll_caret.o \ + coredll_fdrepdlg.o \ + coredll_fontdlgg.o \ coredll_imaglist.o \ coredll_listctrl.o \ - coredll_fdrepdlg.o \ + coredll_statusbr.o \ coredll_tabg.o \ - coredll_fontdlgg.o \ - coredll_caret.o \ coredll_snglinst.o @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2) COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 = \ - coredll_gsockmot.o \ coredll_accel.o \ coredll_app.o \ coredll_bmpbuttn.o \ @@ -3970,6 +4087,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 = \ coredll_frame.o \ coredll_gauge.o \ coredll_gdiobj.o \ + coredll_gsockmot.o \ coredll_icon.o \ coredll_listbox.o \ coredll_main.o \ @@ -3988,28 +4106,26 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 = \ coredll_statbmp.o \ coredll_statbox.o \ coredll_stattext.o \ - coredll_toolbar.o \ coredll_textctrl.o \ coredll_timer.o \ + coredll_toolbar.o \ coredll_toplevel.o \ coredll_utils.o \ coredll_window.o \ + coredll_colrdlgg.o \ + coredll_dirdlgg.o \ coredll_fdrepdlg.o \ - coredll_listctrl.o \ + coredll_fontdlgg.o \ coredll_imaglist.o \ + coredll_listctrl.o \ coredll_notebook.o \ - coredll_fontdlgg.o \ - coredll_colrdlgg.o \ - coredll_statline.o \ - coredll_tabg.o \ - coredll_dirdlgg.o \ coredll_prntdlgg.o \ - coredll_statusbr.o + coredll_statline.o \ + coredll_statusbr.o \ + coredll_tabg.o @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2) COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ coredll_statusbr.o \ - coredll_uxtheme.o \ - coredll_access.o \ coredll_accel.o \ coredll_bmpbuttn.o \ coredll_button.o \ @@ -4037,13 +4153,13 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ coredll_msgdlg.o \ coredll_nativdlg.o \ coredll_notebook.o \ + coredll_access.o \ coredll_ownerdrw.o \ coredll_penwin.o \ coredll_printdlg.o \ coredll_printwin.o \ coredll_radiobox.o \ coredll_radiobut.o \ - coredll_renderer.o \ coredll_scrolbar.o \ coredll_slider95.o \ coredll_spinbutt.o \ @@ -4060,6 +4176,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ coredll_treectrl.o @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2) COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_2 = \ + coredll_caret.o \ coredll_accel.o \ coredll_app.o \ coredll_bitmap.o \ @@ -4092,10 +4209,11 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_2 = \ coredll_gauge.o \ coredll_gdiimage.o \ coredll_gdiobj.o \ + coredll_gsocket.o \ + coredll_gsockpm.o \ coredll_helpwin.o \ coredll_icon.o \ coredll_iniconf.o \ - coredll_joystick.o \ coredll_listbox.o \ coredll_main.o \ coredll_menu.o \ @@ -4123,16 +4241,12 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_2 = \ coredll_stattext.o \ coredll_tabctrl.o \ coredll_textctrl.o \ - coredll_timer.o \ coredll_thread.o \ + coredll_timer.o \ coredll_toolbar.o \ coredll_tooltip.o \ coredll_toplevel.o \ - coredll_wave.o \ - coredll_window.o \ - coredll_gsocket.o \ - coredll_gsockpm.o \ - coredll_caret.o + coredll_window.o @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_2) COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 = \ corelib_NSBox.o \ @@ -4144,8 +4258,8 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 = \ corelib_NSView.o \ corelib_NSWindow.o \ corelib_app.o \ - corelib_bmpbuttn.o \ corelib_bitmap.o \ + corelib_bmpbuttn.o \ corelib_brush.o \ corelib_button.o \ corelib_checkbox.o \ @@ -4190,35 +4304,35 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 = \ corelib_utils.o \ corelib_utilsexc.o \ corelib_window.o \ - corelib_statusbr.o \ - corelib_imaglist.o \ - corelib_listctrl.o \ - corelib_fdrepdlg.o \ - corelib_tabg.o \ - corelib_fontdlgg.o \ + corelib_accel.o \ + corelib_caret.o \ corelib_colrdlgg.o \ - corelib_msgdlgg.o \ corelib_dirdlgg.o \ + corelib_fdrepdlg.o \ corelib_filedlgg.o \ + corelib_fontdlgg.o \ + corelib_imaglist.o \ + corelib_listctrl.o \ + corelib_mdig.o \ + corelib_msgdlgg.o \ corelib_notebook.o \ - corelib_accel.o \ corelib_paletteg.o \ - corelib_timer.o \ - corelib_caret.o \ - corelib_mdig.o + corelib_statusbr.o \ + corelib_tabg.o \ + corelib_timer.o @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3) COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_3 = \ - corelib_imaglist.o \ + corelib_accel.o \ corelib_colrdlgg.o \ - corelib_listctrl.o \ - corelib_filedlgg.o \ corelib_dirdlgg.o \ - corelib_prntdlgg.o \ - corelib_accel.o \ - corelib_msgdlgg.o \ corelib_fdrepdlg.o \ - corelib_tabg.o \ + corelib_filedlgg.o \ + corelib_imaglist.o \ + corelib_listctrl.o \ + corelib_msgdlgg.o \ + corelib_prntdlgg.o \ corelib_statusbr.o \ + corelib_tabg.o \ corelib_bmpbuttn.o \ corelib_button.o \ corelib_checkbox.o \ @@ -4230,7 +4344,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_3 = \ corelib_fontdlg.o \ corelib_frame.o \ corelib_gauge.o \ - corelib_joystick.o \ corelib_listbox.o \ corelib_mdi.o \ corelib_menu.o \ @@ -4239,7 +4352,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_3 = \ corelib_notebook.o \ corelib_radiobox.o \ corelib_radiobut.o \ - corelib_renderer.o \ corelib_scrolbar.o \ corelib_scrolwin.o \ corelib_slider.o \ @@ -4252,8 +4364,7 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_3 = \ corelib_tbargtk.o \ corelib_textctrl.o \ corelib_tglbtn.o \ - corelib_utilsres.o \ - corelib_wave.o + corelib_utilsres.o @COND_TOOLKIT_GTK@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_3) COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 = \ corelib_accel.o \ @@ -4291,7 +4402,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 = \ corelib_gauge.o \ corelib_gdiobj.o \ corelib_icon.o \ - corelib_joystick.o \ corelib_listbox.o \ corelib_macnotfy.o \ corelib_mdi.o \ @@ -4299,6 +4409,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 = \ corelib_menuitem.o \ corelib_metafile.o \ corelib_minifram.o \ + corelib_MoreFilesX.o \ corelib_msgdlg.o \ corelib_notebmac.o \ corelib_palette.o \ @@ -4323,24 +4434,21 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 = \ corelib_textctrl.o \ corelib_thread.o \ corelib_timer.o \ - corelib_toplevel.o \ corelib_toolbar.o \ corelib_tooltip.o \ + corelib_toplevel.o \ corelib_uma.o \ - corelib_wave.o \ corelib_window.o \ - corelib_MoreFilesX.o \ - corelib_statusbr.o \ + corelib_caret.o \ + corelib_fdrepdlg.o \ + corelib_fontdlgg.o \ corelib_imaglist.o \ corelib_listctrl.o \ - corelib_fdrepdlg.o \ + corelib_statusbr.o \ corelib_tabg.o \ - corelib_fontdlgg.o \ - corelib_caret.o \ corelib_snglinst.o @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3) COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 = \ - corelib_gsockmot.o \ corelib_accel.o \ corelib_app.o \ corelib_bmpbuttn.o \ @@ -4368,6 +4476,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 = \ corelib_frame.o \ corelib_gauge.o \ corelib_gdiobj.o \ + corelib_gsockmot.o \ corelib_icon.o \ corelib_listbox.o \ corelib_main.o \ @@ -4386,28 +4495,26 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 = \ corelib_statbmp.o \ corelib_statbox.o \ corelib_stattext.o \ - corelib_toolbar.o \ corelib_textctrl.o \ corelib_timer.o \ + corelib_toolbar.o \ corelib_toplevel.o \ corelib_utils.o \ corelib_window.o \ + corelib_colrdlgg.o \ + corelib_dirdlgg.o \ corelib_fdrepdlg.o \ - corelib_listctrl.o \ + corelib_fontdlgg.o \ corelib_imaglist.o \ + corelib_listctrl.o \ corelib_notebook.o \ - corelib_fontdlgg.o \ - corelib_colrdlgg.o \ - corelib_statline.o \ - corelib_tabg.o \ - corelib_dirdlgg.o \ corelib_prntdlgg.o \ - corelib_statusbr.o + corelib_statline.o \ + corelib_statusbr.o \ + corelib_tabg.o @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3) COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ corelib_statusbr.o \ - corelib_uxtheme.o \ - corelib_access.o \ corelib_accel.o \ corelib_bmpbuttn.o \ corelib_button.o \ @@ -4435,13 +4542,13 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ corelib_msgdlg.o \ corelib_nativdlg.o \ corelib_notebook.o \ + corelib_access.o \ corelib_ownerdrw.o \ corelib_penwin.o \ corelib_printdlg.o \ corelib_printwin.o \ corelib_radiobox.o \ corelib_radiobut.o \ - corelib_renderer.o \ corelib_scrolbar.o \ corelib_slider95.o \ corelib_spinbutt.o \ @@ -4458,6 +4565,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ corelib_treectrl.o @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3) COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_3 = \ + corelib_caret.o \ corelib_accel.o \ corelib_app.o \ corelib_bitmap.o \ @@ -4490,10 +4598,11 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_3 = \ corelib_gauge.o \ corelib_gdiimage.o \ corelib_gdiobj.o \ + corelib_gsocket.o \ + corelib_gsockpm.o \ corelib_helpwin.o \ corelib_icon.o \ corelib_iniconf.o \ - corelib_joystick.o \ corelib_listbox.o \ corelib_main.o \ corelib_menu.o \ @@ -4521,16 +4630,12 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_3 = \ corelib_stattext.o \ corelib_tabctrl.o \ corelib_textctrl.o \ - corelib_timer.o \ corelib_thread.o \ + corelib_timer.o \ corelib_toolbar.o \ corelib_tooltip.o \ corelib_toplevel.o \ - corelib_wave.o \ - corelib_window.o \ - corelib_gsocket.o \ - corelib_gsockpm.o \ - corelib_caret.o + corelib_window.o @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_3) @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS = monodll_helpbest.o @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_helpbest.o @@ -4562,16 +4667,13 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_3 = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS = COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS = \ + monodll_caret.o \ + monodll_printps.o \ + monodll_dialup.o \ monodll_fontenum.o \ monodll_fontutil.o \ monodll_utilsx11.o \ - monodll_taskbarcmn.o \ - monodll_taskbarx11.o \ - monodll_printps.o \ - monodll_caret.o \ - monodll_dialup.o \ - monodll_gsockgtk.o \ - monodll_win_gtk.o \ + monodll_paletteg.o \ monodll_app.o \ monodll_bitmap.o \ monodll_brush.o \ @@ -4587,63 +4689,63 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS = \ monodll_dnd.o \ monodll_evtloop.o \ monodll_font.o \ - monodll_toplevel.o \ monodll_gdiobj.o \ + monodll_gsockgtk.o \ monodll_icon.o \ monodll_main.o \ monodll_pen.o \ monodll_popupwin.o \ monodll_region.o \ + monodll_renderer.o \ monodll_settings.o \ monodll_timer.o \ monodll_tooltip.o \ + monodll_toplevel.o \ monodll_utilsgtk.o \ - monodll_window.o \ - monodll_paletteg.o + monodll_win_gtk.o \ + monodll_window.o @COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS) @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS = COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS = \ - monodll_colour.o \ - monodll_dc.o \ - monodll_gdiobj.o \ - monodll_palette.o \ - monodll_region.o \ - monodll_brush.o \ - monodll_pen.o \ - monodll_font.o \ - monodll_data.o \ - monodll_fontenum.o \ - monodll_fontutil.o \ - monodll_evtloop.o \ + monodll_caret.o \ + monodll_timer.o \ monodll_app.o \ monodll_bitmap.o \ - monodll_dirmgl.o \ + monodll_brush.o \ monodll_clipbrd.o \ + monodll_colour.o \ monodll_cursor.o \ + monodll_data.o \ + monodll_dc.o \ monodll_dcclient.o \ monodll_dcmemory.o \ monodll_dcscreen.o \ - monodll_toplevel.o \ + monodll_dirmgl.o \ + monodll_evtloop.o \ + monodll_font.o \ + monodll_fontenum.o \ + monodll_fontutil.o \ + monodll_gdiobj.o \ monodll_icon.o \ + monodll_palette.o \ + monodll_pen.o \ + monodll_region.o \ monodll_settings.o \ - monodll_window.o \ + monodll_toplevel.o \ monodll_utils.o \ - monodll_timer.o \ - monodll_caret.o + monodll_window.o @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS) COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS = \ + monodll_caret.o \ + monodll_printps.o \ + monodll_dialup.o \ monodll_fontenum.o \ monodll_fontutil.o \ monodll_utilsx11.o \ - monodll_taskbarcmn.o \ - monodll_taskbarx11.o \ - monodll_printps.o \ - monodll_caret.o \ - monodll_dialup.o \ - monodll_region.o \ - monodll_pen.o \ - monodll_brush.o \ monodll_bitmap.o \ + monodll_brush.o \ + monodll_pen.o \ + monodll_region.o \ monodll_utilsx.o @COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS) COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \ @@ -4671,43 +4773,39 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \ monodll_fontutil.o \ monodll_gdiimage.o \ monodll_gdiobj.o \ + monodll_gsockmsw.o \ monodll_helpchm.o \ monodll_helpwin.o \ monodll_icon.o \ - monodll_joystick.o \ monodll_minifram.o \ + monodll_automtn.o \ + monodll_dataobj.o \ + monodll_dropsrc.o \ + monodll_droptgt.o \ + monodll_oleutils.o \ + monodll_uuid.o \ monodll_palette.o \ monodll_pen.o \ monodll_popupwin.o \ monodll_region.o \ + monodll_renderer.o \ monodll_settings.o \ - monodll_taskbarcmn.o \ - monodll_taskbar.o \ monodll_timer.o \ monodll_tooltip.o \ monodll_toplevel.o \ monodll_utilsgui.o \ - monodll_wave.o \ - monodll_window.o \ - monodll_automtn.o \ - monodll_dataobj.o \ - monodll_dropsrc.o \ - monodll_droptgt.o \ - monodll_oleutils.o \ - monodll_uuid.o + monodll_uxtheme.o \ + monodll_window.o @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS) @COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS = COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS = \ + monodll_caret.o \ + monodll_printps.o \ + monodll_dialup.o \ monodll_fontenum.o \ monodll_fontutil.o \ monodll_utilsx11.o \ - monodll_taskbarcmn.o \ - monodll_taskbarx11.o \ - monodll_printps.o \ - monodll_caret.o \ - monodll_dialup.o \ - monodll_gsockx11.o \ - monodll_nanox.o \ + monodll_timer.o \ monodll_app.o \ monodll_bitmap.o \ monodll_brush.o \ @@ -4723,10 +4821,11 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS = \ monodll_evtloop.o \ monodll_font.o \ monodll_gdiobj.o \ + monodll_gsockx11.o \ monodll_icon.o \ - monodll_joystick.o \ monodll_main.o \ monodll_minifram.o \ + monodll_nanox.o \ monodll_palette.o \ monodll_pen.o \ monodll_popupwin.o \ @@ -4736,21 +4835,17 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS = \ monodll_toplevel.o \ monodll_utils.o \ monodll_utilsx.o \ - monodll_window.o \ - monodll_timer.o + monodll_window.o @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS) @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_0 = COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0 = \ + coredll_caret.o \ + coredll_printps.o \ + coredll_dialup.o \ coredll_fontenum.o \ coredll_fontutil.o \ coredll_utilsx11.o \ - coredll_taskbarcmn.o \ - coredll_taskbarx11.o \ - coredll_printps.o \ - coredll_caret.o \ - coredll_dialup.o \ - coredll_gsockgtk.o \ - coredll_win_gtk.o \ + coredll_paletteg.o \ coredll_app.o \ coredll_bitmap.o \ coredll_brush.o \ @@ -4766,63 +4861,63 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0 = \ coredll_dnd.o \ coredll_evtloop.o \ coredll_font.o \ - coredll_toplevel.o \ coredll_gdiobj.o \ + coredll_gsockgtk.o \ coredll_icon.o \ coredll_main.o \ coredll_pen.o \ coredll_popupwin.o \ coredll_region.o \ + coredll_renderer.o \ coredll_settings.o \ coredll_timer.o \ coredll_tooltip.o \ + coredll_toplevel.o \ coredll_utilsgtk.o \ - coredll_window.o \ - coredll_paletteg.o + coredll_win_gtk.o \ + coredll_window.o @COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0) @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_0 = COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_0 = \ - coredll_colour.o \ - coredll_dc.o \ - coredll_gdiobj.o \ - coredll_palette.o \ - coredll_region.o \ - coredll_brush.o \ - coredll_pen.o \ - coredll_font.o \ - coredll_data.o \ - coredll_fontenum.o \ - coredll_fontutil.o \ - coredll_evtloop.o \ + coredll_caret.o \ + coredll_timer.o \ coredll_app.o \ coredll_bitmap.o \ - coredll_dirmgl.o \ + coredll_brush.o \ coredll_clipbrd.o \ + coredll_colour.o \ coredll_cursor.o \ + coredll_data.o \ + coredll_dc.o \ coredll_dcclient.o \ coredll_dcmemory.o \ coredll_dcscreen.o \ - coredll_toplevel.o \ + coredll_dirmgl.o \ + coredll_evtloop.o \ + coredll_font.o \ + coredll_fontenum.o \ + coredll_fontutil.o \ + coredll_gdiobj.o \ coredll_icon.o \ + coredll_palette.o \ + coredll_pen.o \ + coredll_region.o \ coredll_settings.o \ - coredll_window.o \ + coredll_toplevel.o \ coredll_utils.o \ - coredll_timer.o \ - coredll_caret.o + coredll_window.o @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_0) COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_0 = \ + coredll_caret.o \ + coredll_printps.o \ + coredll_dialup.o \ coredll_fontenum.o \ coredll_fontutil.o \ coredll_utilsx11.o \ - coredll_taskbarcmn.o \ - coredll_taskbarx11.o \ - coredll_printps.o \ - coredll_caret.o \ - coredll_dialup.o \ - coredll_region.o \ - coredll_pen.o \ - coredll_brush.o \ coredll_bitmap.o \ + coredll_brush.o \ + coredll_pen.o \ + coredll_region.o \ coredll_utilsx.o @COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_0) COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0 = \ @@ -4850,43 +4945,39 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0 = \ coredll_fontutil.o \ coredll_gdiimage.o \ coredll_gdiobj.o \ + coredll_gsockmsw.o \ coredll_helpchm.o \ coredll_helpwin.o \ coredll_icon.o \ - coredll_joystick.o \ coredll_minifram.o \ + coredll_automtn.o \ + coredll_dataobj.o \ + coredll_dropsrc.o \ + coredll_droptgt.o \ + coredll_oleutils.o \ + coredll_uuid.o \ coredll_palette.o \ coredll_pen.o \ coredll_popupwin.o \ coredll_region.o \ + coredll_renderer.o \ coredll_settings.o \ - coredll_taskbarcmn.o \ - coredll_taskbar.o \ coredll_timer.o \ coredll_tooltip.o \ coredll_toplevel.o \ coredll_utilsgui.o \ - coredll_wave.o \ - coredll_window.o \ - coredll_automtn.o \ - coredll_dataobj.o \ - coredll_dropsrc.o \ - coredll_droptgt.o \ - coredll_oleutils.o \ - coredll_uuid.o + coredll_uxtheme.o \ + coredll_window.o @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0) @COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS_0 = COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0 = \ + coredll_caret.o \ + coredll_printps.o \ + coredll_dialup.o \ coredll_fontenum.o \ coredll_fontutil.o \ coredll_utilsx11.o \ - coredll_taskbarcmn.o \ - coredll_taskbarx11.o \ - coredll_printps.o \ - coredll_caret.o \ - coredll_dialup.o \ - coredll_gsockx11.o \ - coredll_nanox.o \ + coredll_timer.o \ coredll_app.o \ coredll_bitmap.o \ coredll_brush.o \ @@ -4902,10 +4993,11 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0 = \ coredll_evtloop.o \ coredll_font.o \ coredll_gdiobj.o \ + coredll_gsockx11.o \ coredll_icon.o \ - coredll_joystick.o \ coredll_main.o \ coredll_minifram.o \ + coredll_nanox.o \ coredll_palette.o \ coredll_pen.o \ coredll_popupwin.o \ @@ -4915,200 +5007,17 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0 = \ coredll_toplevel.o \ coredll_utils.o \ coredll_utilsx.o \ - coredll_window.o \ - coredll_timer.o + coredll_window.o @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0) @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_8 = COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8 = \ - corelib_fontenum.o \ - corelib_fontutil.o \ - corelib_utilsx11.o \ - corelib_taskbarcmn.o \ - corelib_taskbarx11.o \ - corelib_printps.o \ - corelib_caret.o \ - corelib_dialup.o \ - corelib_gsockgtk.o \ - corelib_win_gtk.o \ - corelib_app.o \ - corelib_bitmap.o \ - corelib_brush.o \ - corelib_clipbrd.o \ - corelib_colour.o \ - corelib_cursor.o \ - corelib_data.o \ - corelib_dataobj.o \ - corelib_dc.o \ - corelib_dcclient.o \ - corelib_dcmemory.o \ - corelib_dcscreen.o \ - corelib_dnd.o \ - corelib_evtloop.o \ - corelib_font.o \ - corelib_toplevel.o \ - corelib_gdiobj.o \ - corelib_icon.o \ - corelib_main.o \ - corelib_pen.o \ - corelib_popupwin.o \ - corelib_region.o \ - corelib_settings.o \ - corelib_timer.o \ - corelib_tooltip.o \ - corelib_utilsgtk.o \ - corelib_window.o \ - corelib_paletteg.o -@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8) -@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_8 = -COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_8 = \ - corelib_colour.o \ - corelib_dc.o \ - corelib_gdiobj.o \ - corelib_palette.o \ - corelib_region.o \ - corelib_brush.o \ - corelib_pen.o \ - corelib_font.o \ - corelib_data.o \ - corelib_fontenum.o \ - corelib_fontutil.o \ - corelib_evtloop.o \ - corelib_app.o \ - corelib_bitmap.o \ - corelib_dirmgl.o \ - corelib_clipbrd.o \ - corelib_cursor.o \ - corelib_dcclient.o \ - corelib_dcmemory.o \ - corelib_dcscreen.o \ - corelib_toplevel.o \ - corelib_icon.o \ - corelib_settings.o \ - corelib_window.o \ - corelib_utils.o \ - corelib_timer.o \ - corelib_caret.o -@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_8) -COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8 = \ - corelib_fontenum.o \ - corelib_fontutil.o \ - corelib_utilsx11.o \ - corelib_taskbarcmn.o \ - corelib_taskbarx11.o \ - corelib_printps.o \ - corelib_caret.o \ - corelib_dialup.o \ - corelib_region.o \ - corelib_pen.o \ - corelib_brush.o \ - corelib_bitmap.o \ - corelib_utilsx.o -@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8) -COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8 = \ - corelib_app.o \ - corelib_bitmap.o \ - corelib_brush.o \ - corelib_caret.o \ - corelib_clipbrd.o \ - corelib_colour.o \ - corelib_cursor.o \ - corelib_data.o \ - corelib_dc.o \ - corelib_dcclient.o \ - corelib_dcmemory.o \ - corelib_dcprint.o \ - corelib_dcscreen.o \ - corelib_dialup.o \ - corelib_dib.o \ - corelib_dirdlg.o \ - corelib_display.o \ - corelib_enhmeta.o \ - corelib_evtloop.o \ - corelib_font.o \ - corelib_fontenum.o \ - corelib_fontutil.o \ - corelib_gdiimage.o \ - corelib_gdiobj.o \ - corelib_helpchm.o \ - corelib_helpwin.o \ - corelib_icon.o \ - corelib_joystick.o \ - corelib_minifram.o \ - corelib_palette.o \ - corelib_pen.o \ - corelib_popupwin.o \ - corelib_region.o \ - corelib_settings.o \ - corelib_taskbarcmn.o \ - corelib_taskbar.o \ - corelib_timer.o \ - corelib_tooltip.o \ - corelib_toplevel.o \ - corelib_utilsgui.o \ - corelib_wave.o \ - corelib_window.o \ - corelib_automtn.o \ - corelib_dataobj.o \ - corelib_dropsrc.o \ - corelib_droptgt.o \ - corelib_oleutils.o \ - corelib_uuid.o -@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8) -@COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS_8 = -COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8 = \ - corelib_fontenum.o \ - corelib_fontutil.o \ - corelib_utilsx11.o \ - corelib_taskbarcmn.o \ - corelib_taskbarx11.o \ - corelib_printps.o \ - corelib_caret.o \ - corelib_dialup.o \ - corelib_gsockx11.o \ - corelib_nanox.o \ - corelib_app.o \ - corelib_bitmap.o \ - corelib_brush.o \ - corelib_clipbrd.o \ - corelib_colour.o \ - corelib_cursor.o \ - corelib_data.o \ - corelib_dataobj.o \ - corelib_dc.o \ - corelib_dcclient.o \ - corelib_dcmemory.o \ - corelib_dcscreen.o \ - corelib_evtloop.o \ - corelib_font.o \ - corelib_gdiobj.o \ - corelib_icon.o \ - corelib_joystick.o \ - corelib_main.o \ - corelib_minifram.o \ - corelib_palette.o \ - corelib_pen.o \ - corelib_popupwin.o \ - corelib_region.o \ - corelib_reparent.o \ - corelib_settings.o \ - corelib_toplevel.o \ - corelib_utils.o \ - corelib_utilsx.o \ - corelib_window.o \ - corelib_timer.o -@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8) -@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_9 = -COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9 = \ + monolib_caret.o \ + monolib_printps.o \ + monolib_dialup.o \ monolib_fontenum.o \ monolib_fontutil.o \ monolib_utilsx11.o \ - monolib_taskbarcmn.o \ - monolib_taskbarx11.o \ - monolib_printps.o \ - monolib_caret.o \ - monolib_dialup.o \ - monolib_gsockgtk.o \ - monolib_win_gtk.o \ + monolib_paletteg.o \ monolib_app.o \ monolib_bitmap.o \ monolib_brush.o \ @@ -5124,66 +5033,66 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9 = \ monolib_dnd.o \ monolib_evtloop.o \ monolib_font.o \ - monolib_toplevel.o \ monolib_gdiobj.o \ + monolib_gsockgtk.o \ monolib_icon.o \ monolib_main.o \ monolib_pen.o \ monolib_popupwin.o \ monolib_region.o \ + monolib_renderer.o \ monolib_settings.o \ monolib_timer.o \ monolib_tooltip.o \ + monolib_toplevel.o \ monolib_utilsgtk.o \ - monolib_window.o \ - monolib_paletteg.o -@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9) -@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_9 = -COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_9 = \ - monolib_colour.o \ - monolib_dc.o \ - monolib_gdiobj.o \ - monolib_palette.o \ - monolib_region.o \ - monolib_brush.o \ - monolib_pen.o \ - monolib_font.o \ - monolib_data.o \ - monolib_fontenum.o \ - monolib_fontutil.o \ - monolib_evtloop.o \ + monolib_win_gtk.o \ + monolib_window.o +@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8) +@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_8 = +COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_8 = \ + monolib_caret.o \ + monolib_timer.o \ monolib_app.o \ monolib_bitmap.o \ - monolib_dirmgl.o \ + monolib_brush.o \ monolib_clipbrd.o \ + monolib_colour.o \ monolib_cursor.o \ + monolib_data.o \ + monolib_dc.o \ monolib_dcclient.o \ monolib_dcmemory.o \ monolib_dcscreen.o \ - monolib_toplevel.o \ + monolib_dirmgl.o \ + monolib_evtloop.o \ + monolib_font.o \ + monolib_fontenum.o \ + monolib_fontutil.o \ + monolib_gdiobj.o \ monolib_icon.o \ + monolib_palette.o \ + monolib_pen.o \ + monolib_region.o \ monolib_settings.o \ - monolib_window.o \ + monolib_toplevel.o \ monolib_utils.o \ - monolib_timer.o \ - monolib_caret.o -@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_9) -COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_9 = \ + monolib_window.o +@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_8) +COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8 = \ + monolib_caret.o \ + monolib_printps.o \ + monolib_dialup.o \ monolib_fontenum.o \ monolib_fontutil.o \ monolib_utilsx11.o \ - monolib_taskbarcmn.o \ - monolib_taskbarx11.o \ - monolib_printps.o \ - monolib_caret.o \ - monolib_dialup.o \ - monolib_region.o \ - monolib_pen.o \ - monolib_brush.o \ monolib_bitmap.o \ + monolib_brush.o \ + monolib_pen.o \ + monolib_region.o \ monolib_utilsx.o -@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_9) -COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9 = \ +@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8) +COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8 = \ monolib_app.o \ monolib_bitmap.o \ monolib_brush.o \ @@ -5208,43 +5117,39 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9 = \ monolib_fontutil.o \ monolib_gdiimage.o \ monolib_gdiobj.o \ + monolib_gsockmsw.o \ monolib_helpchm.o \ monolib_helpwin.o \ monolib_icon.o \ - monolib_joystick.o \ monolib_minifram.o \ + monolib_automtn.o \ + monolib_dataobj.o \ + monolib_dropsrc.o \ + monolib_droptgt.o \ + monolib_oleutils.o \ + monolib_uuid.o \ monolib_palette.o \ monolib_pen.o \ monolib_popupwin.o \ monolib_region.o \ + monolib_renderer.o \ monolib_settings.o \ - monolib_taskbarcmn.o \ - monolib_taskbar.o \ monolib_timer.o \ monolib_tooltip.o \ monolib_toplevel.o \ monolib_utilsgui.o \ - monolib_wave.o \ - monolib_window.o \ - monolib_automtn.o \ - monolib_dataobj.o \ - monolib_dropsrc.o \ - monolib_droptgt.o \ - monolib_oleutils.o \ - monolib_uuid.o -@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9) -@COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS_9 = -COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9 = \ + monolib_uxtheme.o \ + monolib_window.o +@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8) +@COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS_8 = +COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8 = \ + monolib_caret.o \ + monolib_printps.o \ + monolib_dialup.o \ monolib_fontenum.o \ monolib_fontutil.o \ monolib_utilsx11.o \ - monolib_taskbarcmn.o \ - monolib_taskbarx11.o \ - monolib_printps.o \ - monolib_caret.o \ - monolib_dialup.o \ - monolib_gsockx11.o \ - monolib_nanox.o \ + monolib_timer.o \ monolib_app.o \ monolib_bitmap.o \ monolib_brush.o \ @@ -5260,10 +5165,11 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9 = \ monolib_evtloop.o \ monolib_font.o \ monolib_gdiobj.o \ + monolib_gsockx11.o \ monolib_icon.o \ - monolib_joystick.o \ monolib_main.o \ monolib_minifram.o \ + monolib_nanox.o \ monolib_palette.o \ monolib_pen.o \ monolib_popupwin.o \ @@ -5273,58 +5179,259 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9 = \ monolib_toplevel.o \ monolib_utils.o \ monolib_utilsx.o \ - monolib_window.o \ - monolib_timer.o + monolib_window.o +@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8) +@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_9 = +COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9 = \ + corelib_caret.o \ + corelib_printps.o \ + corelib_dialup.o \ + corelib_fontenum.o \ + corelib_fontutil.o \ + corelib_utilsx11.o \ + corelib_paletteg.o \ + corelib_app.o \ + corelib_bitmap.o \ + corelib_brush.o \ + corelib_clipbrd.o \ + corelib_colour.o \ + corelib_cursor.o \ + corelib_data.o \ + corelib_dataobj.o \ + corelib_dc.o \ + corelib_dcclient.o \ + corelib_dcmemory.o \ + corelib_dcscreen.o \ + corelib_dnd.o \ + corelib_evtloop.o \ + corelib_font.o \ + corelib_gdiobj.o \ + corelib_gsockgtk.o \ + corelib_icon.o \ + corelib_main.o \ + corelib_pen.o \ + corelib_popupwin.o \ + corelib_region.o \ + corelib_renderer.o \ + corelib_settings.o \ + corelib_timer.o \ + corelib_tooltip.o \ + corelib_toplevel.o \ + corelib_utilsgtk.o \ + corelib_win_gtk.o \ + corelib_window.o +@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9) +@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_9 = +COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_9 = \ + corelib_caret.o \ + corelib_timer.o \ + corelib_app.o \ + corelib_bitmap.o \ + corelib_brush.o \ + corelib_clipbrd.o \ + corelib_colour.o \ + corelib_cursor.o \ + corelib_data.o \ + corelib_dc.o \ + corelib_dcclient.o \ + corelib_dcmemory.o \ + corelib_dcscreen.o \ + corelib_dirmgl.o \ + corelib_evtloop.o \ + corelib_font.o \ + corelib_fontenum.o \ + corelib_fontutil.o \ + corelib_gdiobj.o \ + corelib_icon.o \ + corelib_palette.o \ + corelib_pen.o \ + corelib_region.o \ + corelib_settings.o \ + corelib_toplevel.o \ + corelib_utils.o \ + corelib_window.o +@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_9) +COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_9 = \ + corelib_caret.o \ + corelib_printps.o \ + corelib_dialup.o \ + corelib_fontenum.o \ + corelib_fontutil.o \ + corelib_utilsx11.o \ + corelib_bitmap.o \ + corelib_brush.o \ + corelib_pen.o \ + corelib_region.o \ + corelib_utilsx.o +@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_9) +COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9 = \ + corelib_app.o \ + corelib_bitmap.o \ + corelib_brush.o \ + corelib_caret.o \ + corelib_clipbrd.o \ + corelib_colour.o \ + corelib_cursor.o \ + corelib_data.o \ + corelib_dc.o \ + corelib_dcclient.o \ + corelib_dcmemory.o \ + corelib_dcprint.o \ + corelib_dcscreen.o \ + corelib_dialup.o \ + corelib_dib.o \ + corelib_dirdlg.o \ + corelib_display.o \ + corelib_enhmeta.o \ + corelib_evtloop.o \ + corelib_font.o \ + corelib_fontenum.o \ + corelib_fontutil.o \ + corelib_gdiimage.o \ + corelib_gdiobj.o \ + corelib_gsockmsw.o \ + corelib_helpchm.o \ + corelib_helpwin.o \ + corelib_icon.o \ + corelib_minifram.o \ + corelib_automtn.o \ + corelib_dataobj.o \ + corelib_dropsrc.o \ + corelib_droptgt.o \ + corelib_oleutils.o \ + corelib_uuid.o \ + corelib_palette.o \ + corelib_pen.o \ + corelib_popupwin.o \ + corelib_region.o \ + corelib_renderer.o \ + corelib_settings.o \ + corelib_timer.o \ + corelib_tooltip.o \ + corelib_toplevel.o \ + corelib_utilsgui.o \ + corelib_uxtheme.o \ + corelib_window.o +@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9) +@COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS_9 = +COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9 = \ + corelib_caret.o \ + corelib_printps.o \ + corelib_dialup.o \ + corelib_fontenum.o \ + corelib_fontutil.o \ + corelib_utilsx11.o \ + corelib_timer.o \ + corelib_app.o \ + corelib_bitmap.o \ + corelib_brush.o \ + corelib_clipbrd.o \ + corelib_colour.o \ + corelib_cursor.o \ + corelib_data.o \ + corelib_dataobj.o \ + corelib_dc.o \ + corelib_dcclient.o \ + corelib_dcmemory.o \ + corelib_dcscreen.o \ + corelib_evtloop.o \ + corelib_font.o \ + corelib_gdiobj.o \ + corelib_gsockx11.o \ + corelib_icon.o \ + corelib_main.o \ + corelib_minifram.o \ + corelib_nanox.o \ + corelib_palette.o \ + corelib_pen.o \ + corelib_popupwin.o \ + corelib_region.o \ + corelib_reparent.o \ + corelib_settings.o \ + corelib_toplevel.o \ + corelib_utils.o \ + corelib_utilsx.o \ + corelib_window.o @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9) COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \ $(__CORE_SRC_OBJECTS) \ + monodll_calctrl.o \ + monodll_dcbuffer.o \ + monodll_grid.o \ + monodll_gridctrl.o \ + monodll_gridsel.o \ + monodll_helpext.o \ + monodll_laywin.o \ + monodll_sashwin.o \ + monodll_splash.o \ + monodll_tipdlg.o \ + monodll_wizard.o \ + $(__ADVANCED_PLATFORM_SRC_OBJECTS) \ $(__HTML_SRC_PLATFORM_OBJECTS) \ + monodll_helpctrl.o \ monodll_helpdata.o \ monodll_helpfrm.o \ - monodll_helpctrl.o \ monodll_htmlcell.o \ monodll_htmlfilt.o \ monodll_htmlpars.o \ monodll_htmltag.o \ monodll_htmlwin.o \ - monodll_winpars.o \ + monodll_htmprint.o \ + monodll_m_dflist.o \ monodll_m_fonts.o \ monodll_m_hline.o \ monodll_m_image.o \ monodll_m_layout.o \ monodll_m_links.o \ monodll_m_list.o \ - monodll_m_dflist.o \ monodll_m_pre.o \ - monodll_m_tables.o \ monodll_m_style.o \ - monodll_htmprint.o \ - monodll_htmllbox.o + monodll_m_tables.o \ + monodll_winpars.o \ + monodll_htmllbox.o \ + monodll_db.o \ + monodll_dbtable.o \ + monodll_dbgrid.o @COND_USE_GUI_1@__MONOLIB_GUI_SRC_OBJECTS = $(COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS) COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ $(__CORE_SRC_OBJECTS_1) \ + monolib_calctrl.o \ + monolib_dcbuffer.o \ + monolib_grid.o \ + monolib_gridctrl.o \ + monolib_gridsel.o \ + monolib_helpext.o \ + monolib_laywin.o \ + monolib_sashwin.o \ + monolib_splash.o \ + monolib_tipdlg.o \ + monolib_wizard.o \ + $(__ADVANCED_PLATFORM_SRC_OBJECTS_1) \ $(__HTML_SRC_PLATFORM_OBJECTS_1) \ + monolib_helpctrl.o \ monolib_helpdata.o \ monolib_helpfrm.o \ - monolib_helpctrl.o \ monolib_htmlcell.o \ monolib_htmlfilt.o \ monolib_htmlpars.o \ monolib_htmltag.o \ monolib_htmlwin.o \ - monolib_winpars.o \ + monolib_htmprint.o \ + monolib_m_dflist.o \ monolib_m_fonts.o \ monolib_m_hline.o \ monolib_m_image.o \ monolib_m_layout.o \ monolib_m_links.o \ monolib_m_list.o \ - monolib_m_dflist.o \ monolib_m_pre.o \ - monolib_m_tables.o \ monolib_m_style.o \ - monolib_htmprint.o \ - monolib_htmllbox.o + monolib_m_tables.o \ + monolib_winpars.o \ + monolib_htmllbox.o \ + monolib_db.o \ + monolib_dbtable.o \ + monolib_dbgrid.o @COND_USE_GUI_1@__MONOLIB_GUI_SRC_OBJECTS_1 = $(COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1) @COND_TOOLKIT_COCOA@__NET_MACOSX_SRC_OBJECTS = monodll_gsocket.o @COND_TOOLKIT_GTK@__NET_MACOSX_SRC_OBJECTS = monodll_gsocket.o @@ -5341,23 +5448,19 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS \ @COND_PLATFORM_MACOSX_1@ = $(__NET_MACOSX_SRC_OBJECTS) @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o -@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS = \ -@COND_PLATFORM_WIN32_1@ monodll_gsocket.o monodll_gsockmsw.o +@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_1 \ @COND_PLATFORM_MACOSX_1@ = $(__NET_MACOSX_SRC_OBJECTS_1) @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o -@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_1 \ -@COND_PLATFORM_WIN32_1@ = monolib_gsocket.o monolib_gsockmsw.o +@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_2 \ @COND_PLATFORM_MACOSX_1@ = $(__NET_MACOSX_SRC_OBJECTS_2) @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o -@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_2 \ -@COND_PLATFORM_WIN32_1@ = netdll_gsocket.o netdll_gsockmsw.o +@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_3 \ @COND_PLATFORM_MACOSX_1@ = $(__NET_MACOSX_SRC_OBJECTS_3) @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_gsocket.o -@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_3 \ -@COND_PLATFORM_WIN32_1@ = netlib_gsocket.o netlib_gsockmsw.o +@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_gsocket.o @COND_TOOLKIT_GTK@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o @COND_TOOLKIT_MAC@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o @COND_TOOLKIT_MOTIF@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o @@ -5396,6 +5499,44 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname = \ + $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__advdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname) +COND_PLATFORM_WIN32_1___advdll___importlib = \ + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@__advdll___importlib = $(COND_PLATFORM_WIN32_1___advdll___importlib) +COND_PLATFORM_MACOSX_1___advdll___macinstnamecmd = -install_name \ + $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) +@COND_PLATFORM_MACOSX_1@__advdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___advdll___macinstnamecmd) +COND_USE_SOSYMLINKS_1___advdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) +@COND_USE_SOSYMLINKS_1@__advdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___advdll___so_symlinks_cmd) +COND_USE_SOSYMLINKS_1___advdll___so_symlinks_inst_cmd = rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOSYMLINKS_1@__advdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___advdll___so_symlinks_inst_cmd) +COND_USE_SOVERLINUX_1___advdll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) +@COND_USE_SOVERLINUX_1@__advdll___soname_flags = $(COND_USE_SOVERLINUX_1___advdll___soname_flags) +COND_USE_SOVERSOLARIS_1___advdll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) +@COND_USE_SOVERSOLARIS_1@__advdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___advdll___soname_flags) +COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \ + $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).a +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__advlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname) COND_MONOLITHIC_0_SHARED_1___basedll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) @COND_MONOLITHIC_0_SHARED_1@__basedll___depname = $(COND_MONOLITHIC_0_SHARED_1___basedll___depname) @@ -5472,6 +5613,44 @@ COND_USE_SOVERSOLARIS_1___coredll___soname_flags = \ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname = \ $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX).a @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__corelib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname) +COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___dbgriddll___depname = \ + $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__dbgriddll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___dbgriddll___depname) +COND_PLATFORM_WIN32_1___dbgriddll___importlib = \ + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@__dbgriddll___importlib = $(COND_PLATFORM_WIN32_1___dbgriddll___importlib) +COND_PLATFORM_MACOSX_1___dbgriddll___macinstnamecmd = -install_name \ + $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) +@COND_PLATFORM_MACOSX_1@__dbgriddll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___dbgriddll___macinstnamecmd) +COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) +@COND_USE_SOSYMLINKS_1@__dbgriddll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_cmd) +COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_inst_cmd = rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOSYMLINKS_1@__dbgriddll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_inst_cmd) +COND_USE_SOVERLINUX_1___dbgriddll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) +@COND_USE_SOVERLINUX_1@__dbgriddll___soname_flags = $(COND_USE_SOVERLINUX_1___dbgriddll___soname_flags) +COND_USE_SOVERSOLARIS_1___dbgriddll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) +@COND_USE_SOVERSOLARIS_1@__dbgriddll___soname_flags = $(COND_USE_SOVERSOLARIS_1___dbgriddll___soname_flags) +COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___dbgridlib___depname = \ + $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX).a +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@__dbgridlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___dbgridlib___depname) COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@__gldll___depname = $(COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname) @@ -5548,6 +5727,10 @@ COND_USE_SOVERSOLARIS_1___htmldll___soname_flags = \ COND_MONOLITHIC_0_SHARED_0_USE_HTML_1___htmllib___depname = \ $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX).a @COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@__htmllib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_HTML_1___htmllib___depname) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__install_advdll___depname \ +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = install_advdll +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__install_advlib___depname \ +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = install_advlib @COND_USE_GUI_1@__install_afm___depname = install-afm @COND_MONOLITHIC_0_SHARED_1@__install_basedll___depname = install_basedll @COND_MONOLITHIC_0_SHARED_0@__install_baselib___depname = install_baselib @@ -5555,6 +5738,10 @@ COND_MONOLITHIC_0_SHARED_0_USE_HTML_1___htmllib___depname = \ @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = install_coredll @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__install_corelib___depname \ @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = install_corelib +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__install_dbgriddll___depname \ +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ = install_dbgriddll +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@__install_dbgridlib___depname \ +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ = install_dbgridlib @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@__install_gldll___depname \ @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ = install_gldll @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@__install_gllib___depname \ @@ -5568,6 +5755,10 @@ COND_MONOLITHIC_0_SHARED_0_USE_HTML_1___htmllib___depname = \ @COND_MONOLITHIC_1_SHARED_0@__install_monolib___depname = install_monolib @COND_MONOLITHIC_0_SHARED_1@__install_netdll___depname = install_netdll @COND_MONOLITHIC_0_SHARED_0@__install_netlib___depname = install_netlib +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__install_odbcdll___depname \ +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ = install_odbcdll +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@__install_odbclib___depname \ +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ = install_odbclib @COND_WXUSE_EXPAT_BUILTIN@__install_wxexpat___depname = install_wxexpat @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__install_wxjpeg___depname \ @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = install_wxjpeg @@ -5658,6 +5849,44 @@ COND_USE_SOVERSOLARIS_1___netdll___soname_flags = \ COND_MONOLITHIC_0_SHARED_0___netlib___depname = \ $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX).a @COND_MONOLITHIC_0_SHARED_0@__netlib___depname = $(COND_MONOLITHIC_0_SHARED_0___netlib___depname) +COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___odbcdll___depname = \ + $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__odbcdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___odbcdll___depname) +COND_PLATFORM_WIN32_1___odbcdll___importlib = \ + -Wl,--out-implib,$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@__odbcdll___importlib = $(COND_PLATFORM_WIN32_1___odbcdll___importlib) +COND_PLATFORM_MACOSX_1___odbcdll___macinstnamecmd = -install_name \ + $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) +@COND_PLATFORM_MACOSX_1@__odbcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___odbcdll___macinstnamecmd) +COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ + libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ + libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) +@COND_USE_SOSYMLINKS_1@__odbcdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_cmd) +COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_inst_cmd = rm -f \ + libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ + libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOSYMLINKS_1@__odbcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_inst_cmd) +COND_USE_SOVERLINUX_1___odbcdll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) +@COND_USE_SOVERLINUX_1@__odbcdll___soname_flags = $(COND_USE_SOVERLINUX_1___odbcdll___soname_flags) +COND_USE_SOVERSOLARIS_1___odbcdll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) +@COND_USE_SOVERSOLARIS_1@__odbcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___odbcdll___soname_flags) +COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___odbclib___depname = \ + $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@__odbclib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___odbclib___depname) @COND_WXUSE_EXPAT_BUILTIN@__wxexpat___depname = \ @COND_WXUSE_EXPAT_BUILTIN@ $(LIBDIRNAME)/libwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__wxjpeg___depname \ @@ -5726,7 +5955,202 @@ COND_MONOLITHIC_0_SHARED_0___xmllib___depname = \ ### Targets: ### -all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) $(__macos_res___depname) +all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) $(__macos_res___depname) + +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(ADVDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__advdll___macinstnamecmd) $(__advdll___importlib) $(__advdll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__advdll___so_symlinks_cmd) + +advdll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +advdll_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +advdll_grid.o: $(srcdir)/src/generic/grid.cpp + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +advdll_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +advdll_gridsel.o: $(srcdir)/src/generic/gridsel.cpp + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +advdll_helpext.o: $(srcdir)/src/generic/helpext.cpp + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +@COND_TOOLKIT_MSW@advdll_joystick.o: $(srcdir)/src/msw/joystick.cpp +@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +@COND_TOOLKIT_MAC@advdll_joystick.o: $(srcdir)/src/mac/joystick.cpp +@COND_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF@advdll_joystick.o: $(srcdir)/src/unix/joystick.cpp +@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +@COND_TOOLKIT_GTK@advdll_joystick.o: $(srcdir)/src/unix/joystick.cpp +@COND_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +@COND_TOOLKIT_X11@advdll_joystick.o: $(srcdir)/src/unix/joystick.cpp +@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +@COND_TOOLKIT_OS2@advdll_joystick.o: $(srcdir)/src/os2/joystick.cpp +@COND_TOOLKIT_OS2@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +advdll_laywin.o: $(srcdir)/src/generic/laywin.cpp + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +advdll_sashwin.o: $(srcdir)/src/generic/sashwin.cpp + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +advdll_splash.o: $(srcdir)/src/generic/splash.cpp + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +advdll_taskbar.o: $(srcdir)/src/msw/taskbar.cpp + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +@COND_TOOLKIT_MSW@advdll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp +@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF@advdll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp +@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +@COND_TOOLKIT_GTK@advdll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp +@COND_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +@COND_TOOLKIT_X11@advdll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp +@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF@advdll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp +@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +@COND_TOOLKIT_GTK@advdll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp +@COND_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +@COND_TOOLKIT_X11@advdll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp +@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +advdll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +@COND_TOOLKIT_OS2@advdll_wave.o: $(srcdir)/src/os2/wave.cpp +@COND_TOOLKIT_OS2@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +@COND_TOOLKIT_MSW@advdll_wave.o: $(srcdir)/src/msw/wave.cpp +@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF@advdll_wave.o: $(srcdir)/src/unix/wave.cpp +@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +@COND_TOOLKIT_GTK@advdll_wave.o: $(srcdir)/src/unix/wave.cpp +@COND_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +@COND_TOOLKIT_X11@advdll_wave.o: $(srcdir)/src/unix/wave.cpp +@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +@COND_TOOLKIT_MAC@advdll_wave.o: $(srcdir)/src/mac/wave.cpp +@COND_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).a: $(ADVLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ rm -f $@ +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(AR) rcu $@ $(ADVLIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(RANLIB) $@ + +advlib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +advlib_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +advlib_grid.o: $(srcdir)/src/generic/grid.cpp + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +advlib_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +advlib_gridsel.o: $(srcdir)/src/generic/gridsel.cpp + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +advlib_helpext.o: $(srcdir)/src/generic/helpext.cpp + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +@COND_TOOLKIT_MSW@advlib_joystick.o: $(srcdir)/src/msw/joystick.cpp +@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +@COND_TOOLKIT_MAC@advlib_joystick.o: $(srcdir)/src/mac/joystick.cpp +@COND_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF@advlib_joystick.o: $(srcdir)/src/unix/joystick.cpp +@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +@COND_TOOLKIT_GTK@advlib_joystick.o: $(srcdir)/src/unix/joystick.cpp +@COND_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +@COND_TOOLKIT_X11@advlib_joystick.o: $(srcdir)/src/unix/joystick.cpp +@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +@COND_TOOLKIT_OS2@advlib_joystick.o: $(srcdir)/src/os2/joystick.cpp +@COND_TOOLKIT_OS2@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +advlib_laywin.o: $(srcdir)/src/generic/laywin.cpp + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +advlib_sashwin.o: $(srcdir)/src/generic/sashwin.cpp + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +advlib_splash.o: $(srcdir)/src/generic/splash.cpp + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +advlib_taskbar.o: $(srcdir)/src/msw/taskbar.cpp + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +@COND_TOOLKIT_MSW@advlib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp +@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF@advlib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp +@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +@COND_TOOLKIT_GTK@advlib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp +@COND_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +@COND_TOOLKIT_X11@advlib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp +@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp +@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +@COND_TOOLKIT_GTK@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp +@COND_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +@COND_TOOLKIT_X11@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp +@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +advlib_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +@COND_TOOLKIT_OS2@advlib_wave.o: $(srcdir)/src/os2/wave.cpp +@COND_TOOLKIT_OS2@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +@COND_TOOLKIT_MSW@advlib_wave.o: $(srcdir)/src/msw/wave.cpp +@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF@advlib_wave.o: $(srcdir)/src/unix/wave.cpp +@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +@COND_TOOLKIT_GTK@advlib_wave.o: $(srcdir)/src/unix/wave.cpp +@COND_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +@COND_TOOLKIT_X11@advlib_wave.o: $(srcdir)/src/unix/wave.cpp +@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +@COND_TOOLKIT_MAC@advlib_wave.o: $(srcdir)/src/mac/wave.cpp +@COND_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< @COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_0_SHARED_1@ $(SHARED_LD_CXX) $@ $(BASEDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__basedll___macinstnamecmd) $(__basedll___importlib) $(__basedll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) @@ -5768,12 +6192,6 @@ basedll_datetime.o: $(srcdir)/src/common/datetime.cpp basedll_datstrm.o: $(srcdir)/src/common/datstrm.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< -basedll_db.o: $(srcdir)/src/common/db.cpp - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< - -basedll_dbtable.o: $(srcdir)/src/common/dbtable.cpp - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< - basedll_dde.o: $(srcdir)/src/msw/dde.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -6008,7 +6426,7 @@ basedll_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp basedll_zstream.o: $(srcdir)/src/common/zstream.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a: $(BASELIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a: $(BASELIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_0_SHARED_0@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0@ $(AR) rcu $@ $(BASELIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0@ $(RANLIB) $@ @@ -6049,12 +6467,6 @@ baselib_datetime.o: $(srcdir)/src/common/datetime.cpp baselib_datstrm.o: $(srcdir)/src/common/datstrm.cpp $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< -baselib_db.o: $(srcdir)/src/common/db.cpp - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< - -baselib_dbtable.o: $(srcdir)/src/common/dbtable.cpp - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< - baselib_dde.o: $(srcdir)/src/msw/dde.cpp $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6315,6 +6727,18 @@ clean: rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX).a + rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).a + rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) + rm -f $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a + rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX).a rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) @@ -6525,9 +6949,6 @@ coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_button.o: $(srcdir)/src/mac/button.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1@coredll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_caret.o: $(srcdir)/src/generic/caret.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -6753,6 +7174,9 @@ coredll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp @COND_USE_GUI_1@coredll_ctrlcmn.o: $(srcdir)/src/common/ctrlcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1@coredll_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -6828,9 +7252,6 @@ coredll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp @COND_TOOLKIT_GTK_USE_GUI_1@coredll_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1@coredll_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_X11_USE_GUI_1@coredll_dc.o: $(srcdir)/src/x11/dc.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -6858,9 +7279,6 @@ coredll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp @COND_USE_GUI_1@coredll_dcbase.o: $(srcdir)/src/common/dcbase.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1@coredll_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MGL_USE_GUI_1@coredll_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7311,15 +7729,6 @@ coredll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp @COND_USE_GUI_1@coredll_gifdecod.o: $(srcdir)/src/common/gifdecod.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1@coredll_grid.o: $(srcdir)/src/generic/grid.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_USE_GUI_1@coredll_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_USE_GUI_1@coredll_gridsel.o: $(srcdir)/src/generic/gridsel.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - coredll_gsocket.o: $(srcdir)/src/os2/gsocket.c $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< @@ -7329,6 +7738,9 @@ coredll_gsocket.o: $(srcdir)/src/os2/gsocket.c coredll_gsockmot.o: $(srcdir)/src/motif/gsockmot.c $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@coredll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< + coredll_gsockpm.o: $(srcdir)/src/os2/gsockpm.c $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< @@ -7344,9 +7756,6 @@ coredll_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp @COND_TOOLKIT_MSW_USE_GUI_1@coredll_helpchm.o: $(srcdir)/src/msw/helpchm.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1@coredll_helpext.o: $(srcdir)/src/generic/helpext.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_helpwin.o: $(srcdir)/src/os2/helpwin.cpp @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7446,27 +7855,9 @@ coredll_inpcons.o: $(srcdir)/src/univ/inpcons.cpp coredll_inphand.o: $(srcdir)/src/univ/inphand.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@coredll_joystick.o: $(srcdir)/src/msw/joystick.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_joystick.o: $(srcdir)/src/gtk/joystick.cpp -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_joystick.o: $(srcdir)/src/mac/joystick.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_X11_USE_GUI_1@coredll_joystick.o: $(srcdir)/src/x11/joystick.cpp -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_joystick.o: $(srcdir)/src/os2/joystick.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_USE_GUI_1@coredll_layout.o: $(srcdir)/src/common/layout.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1@coredll_laywin.o: $(srcdir)/src/generic/laywin.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_USE_GUI_1@coredll_lboxcmn.o: $(srcdir)/src/common/lboxcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7740,9 +8131,6 @@ coredll_notebmac.o: $(srcdir)/src/mac/notebmac.cpp @COND_TOOLKIT_GTK_USE_GUI_1@coredll_pen.o: $(srcdir)/src/gtk/pen.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_pen.o: $(srcdir)/src/cocoa/pen.cpp -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_pen.o: $(srcdir)/src/x11/pen.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7752,6 +8140,9 @@ coredll_notebmac.o: $(srcdir)/src/mac/notebmac.cpp @COND_TOOLKIT_MGL_USE_GUI_1@coredll_pen.o: $(srcdir)/src/mgl/pen.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_pen.o: $(srcdir)/src/cocoa/pen.mm +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + coredll_penwin.o: $(srcdir)/src/msw/penwin.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7887,14 +8278,11 @@ coredll_printwin.o: $(srcdir)/src/msw/printwin.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_renderer.o: $(srcdir)/src/mac/renderer.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_renderer.o: $(srcdir)/src/gtk/renderer.cpp -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_renderer.o: $(srcdir)/src/msw/renderer.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@coredll_renderer.o: $(srcdir)/src/gtk/renderer.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1_WXUNIV_1@coredll_renderer.o: $(srcdir)/src/univ/renderer.cpp -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@coredll_renderer.o: $(srcdir)/src/msw/renderer.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_USE_GUI_1@coredll_renderg.o: $(srcdir)/src/generic/renderg.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7905,9 +8293,6 @@ coredll_printwin.o: $(srcdir)/src/msw/printwin.cpp @COND_USE_GUI_1@coredll_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1@coredll_sashwin.o: $(srcdir)/src/generic/sashwin.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - coredll_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8028,9 +8413,6 @@ coredll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1@coredll_splash.o: $(srcdir)/src/generic/splash.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_USE_GUI_1@coredll_splitter.o: $(srcdir)/src/generic/splitter.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8157,41 +8539,17 @@ coredll_statlmac.o: $(srcdir)/src/mac/statlmac.cpp @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_USE_GUI_1_WXUNIV_1@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1@coredll_taskbar.o: $(srcdir)/src/msw/taskbar.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@coredll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp -@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1@coredll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_X11_USE_GUI_1@coredll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1@coredll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp -@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_X11_USE_GUI_1@coredll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_USE_GUI_1_WXUNIV_1@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< coredll_tbar95.o: $(srcdir)/src/msw/tbar95.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8283,9 +8641,6 @@ coredll_theme.o: $(srcdir)/src/univ/theme.cpp @COND_USE_GUI_1@coredll_timercmn.o: $(srcdir)/src/common/timercmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1@coredll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_USE_GUI_1@coredll_tipwin.o: $(srcdir)/src/generic/tipwin.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8406,8 +8761,8 @@ coredll_utilsres.o: $(srcdir)/src/gtk/utilsres.cpp @COND_TOOLKIT_MSW_USE_GUI_1@coredll_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -coredll_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@coredll_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_USE_GUI_1@coredll_valgen.o: $(srcdir)/src/common/valgen.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8427,18 +8782,6 @@ coredll_volume.o: $(srcdir)/src/msw/volume.cpp @COND_USE_GUI_1@coredll_vscroll.o: $(srcdir)/src/generic/vscroll.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_wave.o: $(srcdir)/src/os2/wave.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1@coredll_wave.o: $(srcdir)/src/msw/wave.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_wave.o: $(srcdir)/src/gtk/wave.cpp -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_wave.o: $(srcdir)/src/mac/wave.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8475,13 +8818,10 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp coredll_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1@coredll_wizard.o: $(srcdir)/src/generic/wizard.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_USE_GUI_1@coredll_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX).a: $(CORELIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX).a: $(CORELIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(AR) rcu $@ $(CORELIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(RANLIB) $@ @@ -8678,9 +9018,6 @@ corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_button.o: $(srcdir)/src/mac/button.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1@corelib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_caret.o: $(srcdir)/src/generic/caret.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -8906,6 +9243,9 @@ corelib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp @COND_USE_GUI_1@corelib_ctrlcmn.o: $(srcdir)/src/common/ctrlcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1@corelib_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -8981,9 +9321,6 @@ corelib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp @COND_TOOLKIT_GTK_USE_GUI_1@corelib_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1@corelib_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_X11_USE_GUI_1@corelib_dc.o: $(srcdir)/src/x11/dc.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9011,9 +9348,6 @@ corelib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp @COND_USE_GUI_1@corelib_dcbase.o: $(srcdir)/src/common/dcbase.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1@corelib_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MGL_USE_GUI_1@corelib_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9464,15 +9798,6 @@ corelib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp @COND_USE_GUI_1@corelib_gifdecod.o: $(srcdir)/src/common/gifdecod.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1@corelib_grid.o: $(srcdir)/src/generic/grid.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_USE_GUI_1@corelib_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_USE_GUI_1@corelib_gridsel.o: $(srcdir)/src/generic/gridsel.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - corelib_gsocket.o: $(srcdir)/src/os2/gsocket.c $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< @@ -9482,6 +9807,9 @@ corelib_gsocket.o: $(srcdir)/src/os2/gsocket.c corelib_gsockmot.o: $(srcdir)/src/motif/gsockmot.c $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@corelib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< + corelib_gsockpm.o: $(srcdir)/src/os2/gsockpm.c $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< @@ -9497,9 +9825,6 @@ corelib_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp @COND_TOOLKIT_MSW_USE_GUI_1@corelib_helpchm.o: $(srcdir)/src/msw/helpchm.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1@corelib_helpext.o: $(srcdir)/src/generic/helpext.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_helpwin.o: $(srcdir)/src/os2/helpwin.cpp @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9599,27 +9924,9 @@ corelib_inpcons.o: $(srcdir)/src/univ/inpcons.cpp corelib_inphand.o: $(srcdir)/src/univ/inphand.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@corelib_joystick.o: $(srcdir)/src/msw/joystick.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_joystick.o: $(srcdir)/src/gtk/joystick.cpp -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_joystick.o: $(srcdir)/src/mac/joystick.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_X11_USE_GUI_1@corelib_joystick.o: $(srcdir)/src/x11/joystick.cpp -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_joystick.o: $(srcdir)/src/os2/joystick.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_USE_GUI_1@corelib_layout.o: $(srcdir)/src/common/layout.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1@corelib_laywin.o: $(srcdir)/src/generic/laywin.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_USE_GUI_1@corelib_lboxcmn.o: $(srcdir)/src/common/lboxcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9893,9 +10200,6 @@ corelib_notebmac.o: $(srcdir)/src/mac/notebmac.cpp @COND_TOOLKIT_GTK_USE_GUI_1@corelib_pen.o: $(srcdir)/src/gtk/pen.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_pen.o: $(srcdir)/src/cocoa/pen.cpp -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_pen.o: $(srcdir)/src/x11/pen.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9905,6 +10209,9 @@ corelib_notebmac.o: $(srcdir)/src/mac/notebmac.cpp @COND_TOOLKIT_MGL_USE_GUI_1@corelib_pen.o: $(srcdir)/src/mgl/pen.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_pen.o: $(srcdir)/src/cocoa/pen.mm +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + corelib_penwin.o: $(srcdir)/src/msw/penwin.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10040,14 +10347,11 @@ corelib_printwin.o: $(srcdir)/src/msw/printwin.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_renderer.o: $(srcdir)/src/mac/renderer.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_renderer.o: $(srcdir)/src/gtk/renderer.cpp -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_renderer.o: $(srcdir)/src/msw/renderer.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@corelib_renderer.o: $(srcdir)/src/gtk/renderer.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1_WXUNIV_1@corelib_renderer.o: $(srcdir)/src/univ/renderer.cpp -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@corelib_renderer.o: $(srcdir)/src/msw/renderer.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_USE_GUI_1@corelib_renderg.o: $(srcdir)/src/generic/renderg.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10058,9 +10362,6 @@ corelib_printwin.o: $(srcdir)/src/msw/printwin.cpp @COND_USE_GUI_1@corelib_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1@corelib_sashwin.o: $(srcdir)/src/generic/sashwin.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - corelib_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10181,9 +10482,6 @@ corelib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1@corelib_splash.o: $(srcdir)/src/generic/splash.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_USE_GUI_1@corelib_splitter.o: $(srcdir)/src/generic/splitter.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10322,30 +10620,6 @@ corelib_statlmac.o: $(srcdir)/src/mac/statlmac.cpp @COND_USE_GUI_1_WXUNIV_1@corelib_tabg.o: $(srcdir)/src/generic/tabg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@corelib_taskbar.o: $(srcdir)/src/msw/taskbar.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@corelib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp -@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1@corelib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_X11_USE_GUI_1@corelib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@corelib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp -@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_X11_USE_GUI_1@corelib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - corelib_tbar95.o: $(srcdir)/src/msw/tbar95.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10436,9 +10710,6 @@ corelib_theme.o: $(srcdir)/src/univ/theme.cpp @COND_USE_GUI_1@corelib_timercmn.o: $(srcdir)/src/common/timercmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1@corelib_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_USE_GUI_1@corelib_tipwin.o: $(srcdir)/src/generic/tipwin.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10559,8 +10830,8 @@ corelib_utilsres.o: $(srcdir)/src/gtk/utilsres.cpp @COND_TOOLKIT_MSW_USE_GUI_1@corelib_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -corelib_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@corelib_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_USE_GUI_1@corelib_valgen.o: $(srcdir)/src/common/valgen.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10580,18 +10851,6 @@ corelib_volume.o: $(srcdir)/src/msw/volume.cpp @COND_USE_GUI_1@corelib_vscroll.o: $(srcdir)/src/generic/vscroll.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_wave.o: $(srcdir)/src/os2/wave.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1@corelib_wave.o: $(srcdir)/src/msw/wave.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_wave.o: $(srcdir)/src/gtk/wave.cpp -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_wave.o: $(srcdir)/src/mac/wave.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10628,12 +10887,24 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp corelib_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1@corelib_wizard.o: $(srcdir)/src/generic/wizard.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_USE_GUI_1@corelib_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(SHARED_LD_CXX) $@ $(DBGRIDDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__dbgriddll___macinstnamecmd) $(__dbgriddll___importlib) $(__dbgriddll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(__dbgriddll___so_symlinks_cmd) + +dbgriddll_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp + $(CXXC) -c -o $@ $(DBGRIDDLL_CXXFLAGS) $< + +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX).a: $(DBGRIDLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ rm -f $@ +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(AR) rcu $@ $(DBGRIDLIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(RANLIB) $@ + +dbgridlib_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp + $(CXXC) -c -o $@ $(DBGRIDLIB_CXXFLAGS) $< + distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh @@ -10657,7 +10928,7 @@ distclean: clean @COND_TOOLKIT_MSW@gldll_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp @COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $< -@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a: $(GLLIB_OBJECTS) +@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a: $(GLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ rm -f $@ @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(AR) rcu $@ $(GLLIB_OBJECTS) @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(RANLIB) $@ @@ -10747,7 +11018,7 @@ htmldll_m_tables.o: $(srcdir)/src/html/m_tables.cpp htmldll_winpars.o: $(srcdir)/src/html/winpars.cpp $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX).a: $(HTMLLIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX).a: $(HTMLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@ $(AR) rcu $@ $(HTMLLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@ $(RANLIB) $@ @@ -10818,13 +11089,13 @@ htmllib_m_tables.o: $(srcdir)/src/html/m_tables.cpp htmllib_winpars.o: $(srcdir)/src/html/winpars.cpp $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $< -install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig $(__macos_res_install___depname) +install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig $(__macos_res_install___depname) $(INSTALL_DIR) $(datadir)/aclocal (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(datadir)/aclocal) $(INSTALL_DIR) $(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx) $(INSTALL_DIR) $(includedir) - for f in 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/buffer.h wx/build.h wx/chkconf.h wx/clntdata.h wx/cmdline.h wx/confbase.h wx/config.h wx/datetime.h wx/datetime.inl wx/datstrm.h wx/db.h wx/dbkeyg.h wx/dbtable.h wx/dde.h wx/debug.h wx/defs.h wx/dir.h wx/dynarray.h wx/arrstr.h wx/dynlib.h wx/dynload.h wx/encconv.h wx/event.h wx/features.h wx/ffile.h wx/file.h wx/fileconf.h wx/filefn.h wx/filename.h wx/filesys.h wx/fontenc.h wx/fontmap.h wx/fs_zip.h wx/fs_mem.h wx/hash.h wx/hashmap.h wx/iconloc.h wx/intl.h wx/iosfwrap.h wx/ioswrap.h wx/ipc.h wx/ipcbase.h wx/isql.h wx/isqlext.h wx/list.h wx/log.h wx/longlong.h wx/math.h wx/memory.h wx/memconf.h wx/memtext.h wx/mimetype.h wx/module.h wx/msgout.h wx/mstream.h wx/object.h wx/platform.h wx/process.h wx/regex.h wx/snglinst.h wx/stopwatch.h wx/strconv.h wx/stream.h wx/string.h wx/sysopt.h wx/textbuf.h wx/textfile.h wx/thread.h wx/thrimpl.cpp wx/tokenzr.h wx/txtstrm.h wx/utils.h wx/variant.h wx/vector.h wx/version.h wx/volume.h wx/wfstream.h wx/wx.h wx/wxchar.h wx/wxprec.h wx/zipstrm.h wx/zstream.h $(BASE_PLATFORM_HDR) wx/fs_inet.h wx/url.h wx/protocol/protocol.h wx/protocol/http.h wx/protocol/ftp.h wx/protocol/file.h wx/gsocket.h wx/sckaddr.h wx/sckipc.h wx/sckstrm.h wx/socket.h $(NET_PLATFORM_HDR) $(ALL_GUI_HEADERS) 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 wx/htmllbox.h wx/xml/xml.h $(OPENGL_HDR); do \ + for f in $(ALL_HEADERS); do \ if test ! -d $(includedir)/`dirname $$f` ; then \ $(INSTALL_DIR) $(includedir)/`dirname $$f`; \ fi; \ @@ -10844,6 +11115,9 @@ install-strip: install $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) @@ -10853,6 +11127,16 @@ install-wxconfig: $(INSTALL_PROGRAM) wx$(TOOLCHAIN_NAME)-config $(bindir) (cd $(bindir) && rm -f wx-config && $(LN_S) wx$(TOOLCHAIN_NAME)-config wx-config) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_advdll: +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(libdir) ; $(__advdll___so_symlinks_inst_cmd)) + +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@install_advlib: +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DIR) $(libdir) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).a $(libdir) + @COND_MONOLITHIC_0_SHARED_1@install_basedll: @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(libdir) @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) @@ -10873,6 +11157,16 @@ install-wxconfig: @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DIR) $(libdir) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX).a $(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@install_dbgriddll: +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DIR) $(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ (cd $(libdir) ; $(__dbgriddll___so_symlinks_inst_cmd)) + +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@install_dbgridlib: +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DIR) $(libdir) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX).a $(libdir) + @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@install_gldll: @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DIR) $(libdir) @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) @@ -10913,6 +11207,16 @@ install-wxconfig: @COND_MONOLITHIC_0_SHARED_0@ $(INSTALL_DIR) $(libdir) @COND_MONOLITHIC_0_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX).a $(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@install_odbcdll: +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DIR) $(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ (cd $(libdir) ; $(__odbcdll___so_symlinks_inst_cmd)) + +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@install_odbclib: +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DIR) $(libdir) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a $(libdir) + @COND_WXUSE_EXPAT_BUILTIN@install_wxexpat: @COND_WXUSE_EXPAT_BUILTIN@ $(INSTALL_DIR) $(libdir) @COND_WXUSE_EXPAT_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/libwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir) @@ -10960,7 +11264,7 @@ install-wxconfig: @COND_TOOLKIT_MAC@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc $(libdir) @COND_MONOLITHIC_1_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) -@COND_MONOLITHIC_1_SHARED_1@ $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(EXTRALIBS_XML) +@COND_MONOLITHIC_1_SHARED_1@ $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(EXTRALIBS_XML) $(EXTRALIBS_ODBC) @COND_MONOLITHIC_1_SHARED_1@ $(__monodll___so_symlinks_cmd) monodll_MoreFilesX.o: $(srcdir)/src/mac/morefilex/MoreFilesX.c @@ -11173,8 +11477,8 @@ monodll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_button.o: $(srcdir)/src/mac/button.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1@monodll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_caret.o: $(srcdir)/src/generic/caret.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11413,6 +11717,9 @@ monodll_crashrpt.o: $(srcdir)/src/msw/crashrpt.cpp @COND_USE_GUI_1@monodll_ctrlcmn.o: $(srcdir)/src/common/ctrlcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1@monodll_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11497,8 +11804,8 @@ monodll_datstrm.o: $(srcdir)/src/common/datstrm.cpp monodll_db.o: $(srcdir)/src/common/db.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1@monodll_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< monodll_dbtable.o: $(srcdir)/src/common/dbtable.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11530,8 +11837,8 @@ monodll_dbtable.o: $(srcdir)/src/common/dbtable.cpp @COND_USE_GUI_1@monodll_dcbase.o: $(srcdir)/src/common/dcbase.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1@monodll_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MGL_USE_GUI_1@monodll_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12049,14 +12356,14 @@ monodll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp @COND_USE_GUI_1@monodll_gifdecod.o: $(srcdir)/src/common/gifdecod.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1@monodll_grid.o: $(srcdir)/src/generic/grid.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_grid.o: $(srcdir)/src/generic/grid.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1@monodll_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1@monodll_gridsel.o: $(srcdir)/src/generic/gridsel.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_gridsel.o: $(srcdir)/src/generic/gridsel.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monodll_gsocket.o: $(srcdir)/src/mac/gsocket.c @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< @@ -12082,8 +12389,8 @@ monodll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp monodll_gsockmot.o: $(srcdir)/src/motif/gsockmot.c $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< -monodll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c - $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@monodll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< monodll_gsockpm.o: $(srcdir)/src/os2/gsockpm.c $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< @@ -12115,8 +12422,8 @@ monodll_helpctrl.o: $(srcdir)/src/html/helpctrl.cpp monodll_helpdata.o: $(srcdir)/src/html/helpdata.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1@monodll_helpext.o: $(srcdir)/src/generic/helpext.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_helpext.o: $(srcdir)/src/generic/helpext.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< monodll_helpfrm.o: $(srcdir)/src/html/helpfrm.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12256,23 +12563,26 @@ monodll_ipcbase.o: $(srcdir)/src/common/ipcbase.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/msw/joystick.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_joystick.o: $(srcdir)/src/gtk/joystick.cpp -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MAC_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/mac/joystick.cpp +@COND_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_joystick.o: $(srcdir)/src/mac/joystick.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/unix/joystick.cpp +@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_GTK_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/unix/joystick.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_X11_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/x11/joystick.cpp +@COND_TOOLKIT_X11_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/unix/joystick.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_joystick.o: $(srcdir)/src/os2/joystick.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_OS2_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/os2/joystick.cpp +@COND_TOOLKIT_OS2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_USE_GUI_1@monodll_layout.o: $(srcdir)/src/common/layout.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1@monodll_laywin.o: $(srcdir)/src/generic/laywin.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_laywin.o: $(srcdir)/src/generic/laywin.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_USE_GUI_1@monodll_lboxcmn.o: $(srcdir)/src/common/lboxcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12616,9 +12926,6 @@ monodll_object.o: $(srcdir)/src/common/object.cpp @COND_TOOLKIT_GTK_USE_GUI_1@monodll_pen.o: $(srcdir)/src/gtk/pen.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_pen.o: $(srcdir)/src/cocoa/pen.cpp -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_pen.o: $(srcdir)/src/x11/pen.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12628,6 +12935,9 @@ monodll_object.o: $(srcdir)/src/common/object.cpp @COND_TOOLKIT_MGL_USE_GUI_1@monodll_pen.o: $(srcdir)/src/mgl/pen.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_pen.o: $(srcdir)/src/cocoa/pen.mm +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + monodll_penwin.o: $(srcdir)/src/msw/penwin.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12778,14 +13088,11 @@ monodll_registry.o: $(srcdir)/src/msw/registry.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_renderer.o: $(srcdir)/src/mac/renderer.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_renderer.o: $(srcdir)/src/gtk/renderer.cpp -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_renderer.o: $(srcdir)/src/msw/renderer.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monodll_renderer.o: $(srcdir)/src/gtk/renderer.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1_WXUNIV_1@monodll_renderer.o: $(srcdir)/src/univ/renderer.cpp -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@monodll_renderer.o: $(srcdir)/src/msw/renderer.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_USE_GUI_1@monodll_renderg.o: $(srcdir)/src/generic/renderg.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12796,8 +13103,8 @@ monodll_registry.o: $(srcdir)/src/msw/registry.cpp @COND_USE_GUI_1@monodll_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1@monodll_sashwin.o: $(srcdir)/src/generic/sashwin.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_sashwin.o: $(srcdir)/src/generic/sashwin.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< monodll_sckaddr.o: $(srcdir)/src/common/sckaddr.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12946,8 +13253,8 @@ monodll_socket.o: $(srcdir)/src/common/socket.cpp @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1@monodll_splash.o: $(srcdir)/src/generic/splash.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_splash.o: $(srcdir)/src/generic/splash.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_USE_GUI_1@monodll_splitter.o: $(srcdir)/src/generic/splitter.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13102,27 +13409,27 @@ monodll_sysopt.o: $(srcdir)/src/common/sysopt.cpp @COND_USE_GUI_1_WXUNIV_1@monodll_tabg.o: $(srcdir)/src/generic/tabg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@monodll_taskbar.o: $(srcdir)/src/msw/taskbar.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_taskbar.o: $(srcdir)/src/msw/taskbar.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13234,8 +13541,8 @@ monodll_theme.o: $(srcdir)/src/univ/theme.cpp @COND_USE_GUI_1@monodll_timercmn.o: $(srcdir)/src/common/timercmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1@monodll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_USE_GUI_1@monodll_tipwin.o: $(srcdir)/src/generic/tipwin.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13381,8 +13688,8 @@ monodll_utilsres.o: $(srcdir)/src/gtk/utilsres.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monodll_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -monodll_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@monodll_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_USE_GUI_1@monodll_valgen.o: $(srcdir)/src/common/valgen.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13405,17 +13712,23 @@ monodll_volume.o: $(srcdir)/src/msw/volume.cpp @COND_USE_GUI_1@monodll_vscroll.o: $(srcdir)/src/generic/vscroll.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_wave.o: $(srcdir)/src/os2/wave.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_OS2_USE_GUI_1@monodll_wave.o: $(srcdir)/src/os2/wave.cpp +@COND_TOOLKIT_OS2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@monodll_wave.o: $(srcdir)/src/msw/wave.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_wave.o: $(srcdir)/src/gtk/wave.cpp -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_wave.o: $(srcdir)/src/unix/wave.cpp +@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_wave.o: $(srcdir)/src/mac/wave.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monodll_wave.o: $(srcdir)/src/unix/wave.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_X11_USE_GUI_1@monodll_wave.o: $(srcdir)/src/unix/wave.cpp +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_MAC_USE_GUI_1@monodll_wave.o: $(srcdir)/src/mac/wave.cpp +@COND_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< monodll_wfstream.o: $(srcdir)/src/common/wfstream.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13459,8 +13772,8 @@ monodll_winpars.o: $(srcdir)/src/html/winpars.cpp monodll_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1@monodll_wizard.o: $(srcdir)/src/generic/wizard.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_wizard.o: $(srcdir)/src/generic/wizard.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< monodll_wxchar.o: $(srcdir)/src/common/wxchar.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13477,7 +13790,7 @@ monodll_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp monodll_zstream.o: $(srcdir)/src/common/zstream.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_MONOLITHIC_1_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a: $(MONOLIB_OBJECTS) +@COND_MONOLITHIC_1_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a: $(MONOLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_1_SHARED_0@ rm -f $@ @COND_MONOLITHIC_1_SHARED_0@ $(AR) rcu $@ $(MONOLIB_OBJECTS) @COND_MONOLITHIC_1_SHARED_0@ $(RANLIB) $@ @@ -13692,8 +14005,8 @@ monolib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/mac/button.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1@monolib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_caret.o: $(srcdir)/src/generic/caret.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -13932,6 +14245,9 @@ monolib_crashrpt.o: $(srcdir)/src/msw/crashrpt.cpp @COND_USE_GUI_1@monolib_ctrlcmn.o: $(srcdir)/src/common/ctrlcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1@monolib_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14016,8 +14332,8 @@ monolib_datstrm.o: $(srcdir)/src/common/datstrm.cpp monolib_db.o: $(srcdir)/src/common/db.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1@monolib_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< monolib_dbtable.o: $(srcdir)/src/common/dbtable.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14049,8 +14365,8 @@ monolib_dbtable.o: $(srcdir)/src/common/dbtable.cpp @COND_USE_GUI_1@monolib_dcbase.o: $(srcdir)/src/common/dcbase.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1@monolib_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MGL_USE_GUI_1@monolib_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14568,14 +14884,14 @@ monolib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp @COND_USE_GUI_1@monolib_gifdecod.o: $(srcdir)/src/common/gifdecod.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1@monolib_grid.o: $(srcdir)/src/generic/grid.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_grid.o: $(srcdir)/src/generic/grid.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1@monolib_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1@monolib_gridsel.o: $(srcdir)/src/generic/gridsel.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_gridsel.o: $(srcdir)/src/generic/gridsel.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monolib_gsocket.o: $(srcdir)/src/mac/gsocket.c @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< @@ -14601,8 +14917,8 @@ monolib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp monolib_gsockmot.o: $(srcdir)/src/motif/gsockmot.c $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< -monolib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c - $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@monolib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< monolib_gsockpm.o: $(srcdir)/src/os2/gsockpm.c $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< @@ -14634,8 +14950,8 @@ monolib_helpctrl.o: $(srcdir)/src/html/helpctrl.cpp monolib_helpdata.o: $(srcdir)/src/html/helpdata.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1@monolib_helpext.o: $(srcdir)/src/generic/helpext.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_helpext.o: $(srcdir)/src/generic/helpext.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< monolib_helpfrm.o: $(srcdir)/src/html/helpfrm.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14775,23 +15091,26 @@ monolib_ipcbase.o: $(srcdir)/src/common/ipcbase.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/msw/joystick.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_joystick.o: $(srcdir)/src/gtk/joystick.cpp -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MAC_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/mac/joystick.cpp +@COND_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_joystick.o: $(srcdir)/src/mac/joystick.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/unix/joystick.cpp +@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_GTK_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/unix/joystick.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_X11_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/x11/joystick.cpp +@COND_TOOLKIT_X11_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/unix/joystick.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_joystick.o: $(srcdir)/src/os2/joystick.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_OS2_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/os2/joystick.cpp +@COND_TOOLKIT_OS2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_USE_GUI_1@monolib_layout.o: $(srcdir)/src/common/layout.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1@monolib_laywin.o: $(srcdir)/src/generic/laywin.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_laywin.o: $(srcdir)/src/generic/laywin.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_USE_GUI_1@monolib_lboxcmn.o: $(srcdir)/src/common/lboxcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15135,9 +15454,6 @@ monolib_object.o: $(srcdir)/src/common/object.cpp @COND_TOOLKIT_GTK_USE_GUI_1@monolib_pen.o: $(srcdir)/src/gtk/pen.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_pen.o: $(srcdir)/src/cocoa/pen.cpp -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_pen.o: $(srcdir)/src/x11/pen.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15147,6 +15463,9 @@ monolib_object.o: $(srcdir)/src/common/object.cpp @COND_TOOLKIT_MGL_USE_GUI_1@monolib_pen.o: $(srcdir)/src/mgl/pen.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_pen.o: $(srcdir)/src/cocoa/pen.mm +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + monolib_penwin.o: $(srcdir)/src/msw/penwin.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15297,14 +15616,11 @@ monolib_registry.o: $(srcdir)/src/msw/registry.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_renderer.o: $(srcdir)/src/mac/renderer.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_renderer.o: $(srcdir)/src/gtk/renderer.cpp -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_renderer.o: $(srcdir)/src/msw/renderer.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monolib_renderer.o: $(srcdir)/src/gtk/renderer.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1_WXUNIV_1@monolib_renderer.o: $(srcdir)/src/univ/renderer.cpp -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@monolib_renderer.o: $(srcdir)/src/msw/renderer.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_USE_GUI_1@monolib_renderg.o: $(srcdir)/src/generic/renderg.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15315,8 +15631,8 @@ monolib_registry.o: $(srcdir)/src/msw/registry.cpp @COND_USE_GUI_1@monolib_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1@monolib_sashwin.o: $(srcdir)/src/generic/sashwin.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_sashwin.o: $(srcdir)/src/generic/sashwin.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< monolib_sckaddr.o: $(srcdir)/src/common/sckaddr.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15465,8 +15781,8 @@ monolib_socket.o: $(srcdir)/src/common/socket.cpp @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1@monolib_splash.o: $(srcdir)/src/generic/splash.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_splash.o: $(srcdir)/src/generic/splash.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_USE_GUI_1@monolib_splitter.o: $(srcdir)/src/generic/splitter.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15621,27 +15937,27 @@ monolib_sysopt.o: $(srcdir)/src/common/sysopt.cpp @COND_USE_GUI_1_WXUNIV_1@monolib_tabg.o: $(srcdir)/src/generic/tabg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@monolib_taskbar.o: $(srcdir)/src/msw/taskbar.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_taskbar.o: $(srcdir)/src/msw/taskbar.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15753,8 +16069,8 @@ monolib_theme.o: $(srcdir)/src/univ/theme.cpp @COND_USE_GUI_1@monolib_timercmn.o: $(srcdir)/src/common/timercmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1@monolib_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_USE_GUI_1@monolib_tipwin.o: $(srcdir)/src/generic/tipwin.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15900,8 +16216,8 @@ monolib_utilsres.o: $(srcdir)/src/gtk/utilsres.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monolib_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -monolib_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@monolib_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_USE_GUI_1@monolib_valgen.o: $(srcdir)/src/common/valgen.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15924,17 +16240,23 @@ monolib_volume.o: $(srcdir)/src/msw/volume.cpp @COND_USE_GUI_1@monolib_vscroll.o: $(srcdir)/src/generic/vscroll.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_wave.o: $(srcdir)/src/os2/wave.cpp -@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_OS2_USE_GUI_1@monolib_wave.o: $(srcdir)/src/os2/wave.cpp +@COND_TOOLKIT_OS2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@monolib_wave.o: $(srcdir)/src/msw/wave.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_wave.o: $(srcdir)/src/gtk/wave.cpp -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_wave.o: $(srcdir)/src/unix/wave.cpp +@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_wave.o: $(srcdir)/src/mac/wave.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monolib_wave.o: $(srcdir)/src/unix/wave.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_X11_USE_GUI_1@monolib_wave.o: $(srcdir)/src/unix/wave.cpp +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_MAC_USE_GUI_1@monolib_wave.o: $(srcdir)/src/mac/wave.cpp +@COND_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< monolib_wfstream.o: $(srcdir)/src/common/wfstream.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15978,8 +16300,8 @@ monolib_winpars.o: $(srcdir)/src/html/winpars.cpp monolib_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1@monolib_wizard.o: $(srcdir)/src/generic/wizard.cpp -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_wizard.o: $(srcdir)/src/generic/wizard.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< monolib_wxchar.o: $(srcdir)/src/common/wxchar.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16021,9 +16343,6 @@ netdll_ftp.o: $(srcdir)/src/common/ftp.cpp @COND_PLATFORM_WIN32_1@netdll_gsocket.o: $(srcdir)/src/msw/gsocket.c @COND_PLATFORM_WIN32_1@ $(CCC) -c -o $@ $(NETDLL_CFLAGS) $< -netdll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c - $(CCC) -c -o $@ $(NETDLL_CFLAGS) $< - netdll_http.o: $(srcdir)/src/common/http.cpp $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $< @@ -16048,7 +16367,7 @@ netdll_socket.o: $(srcdir)/src/common/socket.cpp netdll_url.o: $(srcdir)/src/common/url.cpp $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX).a: $(NETLIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX).a: $(NETLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_0_SHARED_0@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0@ $(AR) rcu $@ $(NETLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0@ $(RANLIB) $@ @@ -16074,9 +16393,6 @@ netlib_ftp.o: $(srcdir)/src/common/ftp.cpp @COND_PLATFORM_WIN32_1@netlib_gsocket.o: $(srcdir)/src/msw/gsocket.c @COND_PLATFORM_WIN32_1@ $(CCC) -c -o $@ $(NETLIB_CFLAGS) $< -netlib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c - $(CCC) -c -o $@ $(NETLIB_CFLAGS) $< - netlib_http.o: $(srcdir)/src/common/http.cpp $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $< @@ -16101,6 +16417,27 @@ netlib_socket.o: $(srcdir)/src/common/socket.cpp netlib_url.o: $(srcdir)/src/common/url.cpp $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $< +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(SHARED_LD_CXX) $@ $(ODBCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__odbcdll___macinstnamecmd) $(__odbcdll___importlib) $(__odbcdll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(EXTRALIBS_ODBC) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(__odbcdll___so_symlinks_cmd) + +odbcdll_db.o: $(srcdir)/src/common/db.cpp + $(CXXC) -c -o $@ $(ODBCDLL_CXXFLAGS) $< + +odbcdll_dbtable.o: $(srcdir)/src/common/dbtable.cpp + $(CXXC) -c -o $@ $(ODBCDLL_CXXFLAGS) $< + +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a: $(ODBCLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ rm -f $@ +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(AR) rcu $@ $(ODBCLIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(RANLIB) $@ + +odbclib_db.o: $(srcdir)/src/common/db.cpp + $(CXXC) -c -o $@ $(ODBCLIB_CXXFLAGS) $< + +odbclib_dbtable.o: $(srcdir)/src/common/dbtable.cpp + $(CXXC) -c -o $@ $(ODBCLIB_CXXFLAGS) $< + uninstall: @COND_WXUSE_EXPAT_BUILTIN@$(LIBDIRNAME)/libwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a: $(WXEXPAT_OBJECTS) @@ -16547,7 +16884,7 @@ wxzlib_zutil.o: $(srcdir)/src/zlib/zutil.c xmldll_xml.o: $(srcdir)/src/xml/xml.cpp $(CXXC) -c -o $@ $(XMLDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a: $(XMLLIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a: $(XMLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_0_SHARED_0@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0@ $(AR) rcu $@ $(XMLLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0@ $(RANLIB) $@ @@ -16559,4 +16896,4 @@ xmllib_xml.o: $(srcdir)/src/xml/xml.cpp # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install install_basedll install_baselib install_coredll install_corelib install_gldll install_gllib install_htmldll install_htmllib install_monodll install_monolib install_netdll install_netlib install_wxexpat install_wxjpeg install_wxodbc install_wxpng install_wxregex install_wxtiff install_wxzlib install_xmldll install_xmllib uninstall +.PHONY: all clean distclean install install_advdll install_advlib install_basedll install_baselib install_coredll install_corelib install_dbgriddll install_dbgridlib install_gldll install_gllib install_htmldll install_htmllib install_monodll install_monolib install_netdll install_netlib install_odbcdll install_odbclib install_wxexpat install_wxjpeg install_wxodbc install_wxpng install_wxregex install_wxtiff install_wxzlib install_xmldll install_xmllib uninstall