X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/96c1699d51fffb849efe52cd4294730971c4e278..7db33cc31068fcbc0444a3b93829833662fb977a:/Makefile.in diff --git a/Makefile.in b/Makefile.in index c91e713ed4..6ab4675741 100644 --- a/Makefile.in +++ b/Makefile.in @@ -179,6 +179,8 @@ ALL_BASE_HEADERS = \ wx/wx.h \ wx/wxchar.h \ wx/wxprec.h \ + wx/xti.h \ + wx/xtistrm.h \ wx/zipstrm.h \ wx/zstream.h \ $(BASE_PLATFORM_HDR) \ @@ -195,6 +197,7 @@ ALL_BASE_HEADERS = \ wx/url.h \ $(NET_PLATFORM_HDR) \ wx/xml/xml.h \ + wx/xtixml.h \ wx/db.h \ wx/dbkeyg.h \ wx/dbtable.h @@ -247,6 +250,8 @@ ALL_BASE_SOURCES = \ src/common/variant.cpp \ src/common/wfstream.cpp \ src/common/wxchar.cpp \ + src/common/xti.cpp \ + src/common/xtistrm.cpp \ src/common/zipstrm.cpp \ src/common/zstream.cpp \ src/unix/baseunix.cpp \ @@ -275,6 +280,8 @@ ALL_BASE_SOURCES = \ src/unix/snglinst.cpp \ src/unix/threadpsx.cpp \ src/os2/dir.cpp \ + src/os2/mimetype.cpp \ + src/os2/thread.cpp \ src/os2/utils.cpp \ src/os2/utilsexc.cpp \ src/common/event.cpp \ @@ -301,6 +308,7 @@ ALL_BASE_SOURCES = \ src/msw/gsocket.c \ src/mac/gsocket.c \ src/xml/xml.cpp \ + src/common/xtixml.cpp \ src/common/db.cpp \ src/common/dbtable.cpp ALL_HEADERS = \ @@ -365,6 +373,8 @@ BASEDLL_OBJECTS = \ basedll_variant.o \ basedll_wfstream.o \ basedll_wxchar.o \ + basedll_xti.o \ + basedll_xtistrm.o \ basedll_zipstrm.o \ basedll_zstream.o \ $(__BASE_PLATFORM_SRC_OBJECTS_2) \ @@ -431,6 +441,8 @@ BASELIB_OBJECTS = \ baselib_variant.o \ baselib_wfstream.o \ baselib_wxchar.o \ + baselib_xti.o \ + baselib_xtistrm.o \ baselib_zipstrm.o \ baselib_zstream.o \ $(__BASE_PLATFORM_SRC_OBJECTS_3) \ @@ -616,6 +628,8 @@ MONODLL_OBJECTS = \ monodll_variant.o \ monodll_wfstream.o \ monodll_wxchar.o \ + monodll_xti.o \ + monodll_xtistrm.o \ monodll_zipstrm.o \ monodll_zstream.o \ $(__BASE_PLATFORM_SRC_OBJECTS) \ @@ -637,7 +651,8 @@ MONODLL_OBJECTS = \ monodll_url.o \ $(__NET_PLATFORM_SRC_OBJECTS) \ $(__MONOLIB_GUI_SRC_OBJECTS) \ - monodll_xml.o + monodll_xml.o \ + monodll_xtixml.o MONOLIB_CFLAGS = $(__monolib_PCH_INC) $(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) \ @@ -695,6 +710,8 @@ MONOLIB_OBJECTS = \ monolib_variant.o \ monolib_wfstream.o \ monolib_wxchar.o \ + monolib_xti.o \ + monolib_xtistrm.o \ monolib_zipstrm.o \ monolib_zstream.o \ $(__BASE_PLATFORM_SRC_OBJECTS_1) \ @@ -716,7 +733,8 @@ MONOLIB_OBJECTS = \ monolib_url.o \ $(__NET_PLATFORM_SRC_OBJECTS_1) \ $(__MONOLIB_GUI_SRC_OBJECTS_1) \ - monolib_xml.o + monolib_xml.o \ + monolib_xtixml.o NETDLL_CFLAGS = $(__netdll_PCH_INC) $(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) \ @@ -927,13 +945,15 @@ XMLDLL_CXXFLAGS = $(__xmldll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \ -DWXMAKINGDLL_XML $(CXXFLAGS) $(PIC_FLAG) XMLDLL_OBJECTS = \ - xmldll_xml.o + xmldll_xml.o \ + xmldll_xtixml.o XMLLIB_CXXFLAGS = $(__xmllib_PCH_INC) $(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) -DwxUSE_GUI=0 $(CXXFLAGS) XMLLIB_OBJECTS = \ - xmllib_xml.o + xmllib_xml.o \ + xmllib_xtixml.o ### Conditionally set variables: ### @@ -1030,6 +1050,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/access.h \ wx/artprov.h \ wx/bitmap.h \ + wx/bookctrl.h \ wx/busyinfo.h \ wx/caret.h \ wx/clipbrd.h \ @@ -1074,6 +1095,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/imagtiff.h \ wx/imagxpm.h \ wx/listbase.h \ + wx/listbook.h \ wx/listctrl.h \ wx/matrix.h \ wx/menuitem.h \ @@ -1268,6 +1290,7 @@ COND_TOOLKIT_COCOA_GUI_HDR = \ wx/cocoa/gdiobj.h \ wx/cocoa/icon.h \ wx/cocoa/listbox.h \ + wx/cocoa/mbarman.h \ wx/cocoa/menu.h \ wx/cocoa/menuitem.h \ wx/cocoa/pen.h \ @@ -1499,7 +1522,6 @@ COND_TOOLKIT_MOTIF_GUI_HDR = \ wx/motif/radiobut.h \ wx/motif/region.h \ wx/motif/scrolbar.h \ - wx/motif/settings.h \ wx/motif/slider.h \ wx/motif/spinbutt.h \ wx/motif/statbmp.h \ @@ -1645,6 +1667,11 @@ COND_TOOLKIT_MSW_GUI_HDR = \ @COND_TOOLKIT_MSW@GUI_HDR = $(COND_TOOLKIT_MSW_GUI_HDR) COND_TOOLKIT_PM_GUI_HDR = \ wx/generic/caret.h \ + wx/generic/colrdlgg.h \ + wx/generic/dirdlgg.h \ + wx/generic/fdrepdlg.h \ + wx/generic/mdig.h \ + wx/generic/statusbr.h \ wx/os2/accel.h \ wx/os2/app.h \ wx/os2/bitmap.h \ @@ -1676,11 +1703,11 @@ COND_TOOLKIT_PM_GUI_HDR = \ wx/os2/gauge.h \ wx/os2/gdiimage.h \ wx/os2/gdiobj.h \ - wx/os2/gsockos2.h \ wx/os2/helpwin.h \ wx/os2/icon.h \ wx/os2/iniconf.h \ wx/os2/listbox.h \ + wx/os2/listctrl.h \ wx/os2/menu.h \ wx/os2/menuitem.h \ wx/os2/metafile.h \ @@ -1712,6 +1739,7 @@ COND_TOOLKIT_PM_GUI_HDR = \ wx/os2/toolbar.h \ wx/os2/tooltip.h \ wx/os2/toplevel.h \ + wx/msw/treectrl.h \ wx/os2/window.h @COND_TOOLKIT_PM@GUI_HDR = $(COND_TOOLKIT_PM_GUI_HDR) @COND_TOOLKIT_COCOA@LOWLEVEL_HDR = @@ -1747,8 +1775,15 @@ COND_TOOLKIT_MGL_LOWLEVEL_HDR = \ wx/mgl/toplevel.h \ wx/mgl/window.h @COND_TOOLKIT_MGL@LOWLEVEL_HDR = $(COND_TOOLKIT_MGL_LOWLEVEL_HDR) -@COND_TOOLKIT_MOTIF@LOWLEVEL_HDR = wx/generic/caret.h \ -@COND_TOOLKIT_MOTIF@ wx/unix/fontutil.h wx/unix/utilsx11.h +COND_TOOLKIT_MOTIF_LOWLEVEL_HDR = \ + wx/generic/caret.h \ + wx/unix/fontutil.h \ + wx/unix/utilsx11.h \ + wx/x11/bitmap.h \ + wx/x11/brush.h \ + wx/x11/pen.h \ + wx/x11/region.h +@COND_TOOLKIT_MOTIF@LOWLEVEL_HDR = $(COND_TOOLKIT_MOTIF_LOWLEVEL_HDR) @COND_TOOLKIT_MSW@LOWLEVEL_HDR = @COND_TOOLKIT_PM@LOWLEVEL_HDR = COND_TOOLKIT_X11_LOWLEVEL_HDR = \ @@ -1787,8 +1822,9 @@ COND_TOOLKIT_X11_LOWLEVEL_HDR = \ @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 -@COND_TOOLKIT_COCOA@NET_PLATFORM_HDR = wx/unix/gsockunx.h +@COND_PLATFORM_OS2_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h @COND_TOOLKIT_MAC@NET_PLATFORM_HDR = wx/mac/gsockmac.h +@COND_TOOLKIT_COCOA@NET_PLATFORM_HDR = wx/unix/gsockunx.h @COND_TOOLKIT_GTK@OPENGL_HDR = wx/gtk/glcanvas.h @COND_TOOLKIT_MAC@OPENGL_HDR = wx/mac/glcanvas.h @COND_TOOLKIT_MOTIF@OPENGL_HDR = wx/motif/glcanvas.h @@ -2005,6 +2041,13 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3 = \ @COND_TOOLKIT_MAC@ baselib_utilsexc.o @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS \ @COND_PLATFORM_MACOSX_1@ = $(__BASE_MACOSX_SRC_OBJECTS) +COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS = \ + monodll_dir.o \ + monodll_mimetype.o \ + monodll_thread.o \ + monodll_utils.o \ + monodll_utilsexc.o +@COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS) COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS = \ monodll_baseunix.o \ monodll_dir.o \ @@ -2027,6 +2070,13 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \ @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) +COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ + monolib_dir.o \ + monolib_mimetype.o \ + monolib_thread.o \ + monolib_utils.o \ + monolib_utilsexc.o +@COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_1) COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ monolib_baseunix.o \ monolib_dir.o \ @@ -2049,6 +2099,13 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ @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) +COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ + basedll_dir.o \ + basedll_mimetype.o \ + basedll_thread.o \ + basedll_utils.o \ + basedll_utilsexc.o +@COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_2) COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ basedll_baseunix.o \ basedll_dir.o \ @@ -2071,6 +2128,13 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ @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) +COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ + baselib_dir.o \ + baselib_mimetype.o \ + baselib_thread.o \ + baselib_utils.o \ + baselib_utilsexc.o +@COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_3) COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ baselib_baseunix.o \ baselib_dir.o \ @@ -2099,6 +2163,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_artprov.o \ monodll_artstd.o \ monodll_bmpbase.o \ + monodll_bookctrl.o \ monodll_choiccmn.o \ monodll_clipcmn.o \ monodll_cmdproc.o \ @@ -2170,6 +2235,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_dcpsg.o \ monodll_dirctrlg.o \ monodll_dragimgg.o \ + monodll_listbkg.o \ monodll_logg.o \ monodll_numdlgg.o \ monodll_panelg.o \ @@ -2242,6 +2308,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_artprov.o \ monodll_artstd.o \ monodll_bmpbase.o \ + monodll_bookctrl.o \ monodll_choiccmn.o \ monodll_clipcmn.o \ monodll_cmdproc.o \ @@ -2313,6 +2380,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_dcpsg.o \ monodll_dirctrlg.o \ monodll_dragimgg.o \ + monodll_listbkg.o \ monodll_logg.o \ monodll_numdlgg.o \ monodll_panelg.o \ @@ -2337,6 +2405,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_artprov.o \ monolib_artstd.o \ monolib_bmpbase.o \ + monolib_bookctrl.o \ monolib_choiccmn.o \ monolib_clipcmn.o \ monolib_cmdproc.o \ @@ -2408,6 +2477,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_dcpsg.o \ monolib_dirctrlg.o \ monolib_dragimgg.o \ + monolib_listbkg.o \ monolib_logg.o \ monolib_numdlgg.o \ monolib_panelg.o \ @@ -2480,6 +2550,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_artprov.o \ monolib_artstd.o \ monolib_bmpbase.o \ + monolib_bookctrl.o \ monolib_choiccmn.o \ monolib_clipcmn.o \ monolib_cmdproc.o \ @@ -2551,6 +2622,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_dcpsg.o \ monolib_dirctrlg.o \ monolib_dragimgg.o \ + monolib_listbkg.o \ monolib_logg.o \ monolib_numdlgg.o \ monolib_panelg.o \ @@ -2575,6 +2647,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_artprov.o \ coredll_artstd.o \ coredll_bmpbase.o \ + coredll_bookctrl.o \ coredll_choiccmn.o \ coredll_clipcmn.o \ coredll_cmdproc.o \ @@ -2646,6 +2719,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_dcpsg.o \ coredll_dirctrlg.o \ coredll_dragimgg.o \ + coredll_listbkg.o \ coredll_logg.o \ coredll_numdlgg.o \ coredll_panelg.o \ @@ -2718,6 +2792,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_artprov.o \ coredll_artstd.o \ coredll_bmpbase.o \ + coredll_bookctrl.o \ coredll_choiccmn.o \ coredll_clipcmn.o \ coredll_cmdproc.o \ @@ -2789,6 +2864,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_dcpsg.o \ coredll_dirctrlg.o \ coredll_dragimgg.o \ + coredll_listbkg.o \ coredll_logg.o \ coredll_numdlgg.o \ coredll_panelg.o \ @@ -2813,6 +2889,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_artprov.o \ corelib_artstd.o \ corelib_bmpbase.o \ + corelib_bookctrl.o \ corelib_choiccmn.o \ corelib_clipcmn.o \ corelib_cmdproc.o \ @@ -2884,6 +2961,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_dcpsg.o \ corelib_dirctrlg.o \ corelib_dragimgg.o \ + corelib_listbkg.o \ corelib_logg.o \ corelib_numdlgg.o \ corelib_panelg.o \ @@ -2956,6 +3034,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_artprov.o \ corelib_artstd.o \ corelib_bmpbase.o \ + corelib_bookctrl.o \ corelib_choiccmn.o \ corelib_clipcmn.o \ corelib_cmdproc.o \ @@ -3027,6 +3106,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_dcpsg.o \ corelib_dirctrlg.o \ corelib_dragimgg.o \ + corelib_listbkg.o \ corelib_logg.o \ corelib_numdlgg.o \ corelib_panelg.o \ @@ -3082,6 +3162,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS = \ monodll_icon.o \ monodll_listbox.o \ monodll_main.o \ + monodll_mbarman.o \ monodll_menu.o \ monodll_menuitem.o \ monodll_pen.o \ @@ -3298,6 +3379,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS = \ monodll_toplevel.o \ monodll_utils.o \ monodll_window.o \ + monodll_xmcombo.o \ monodll_colrdlgg.o \ monodll_dirdlgg.o \ monodll_fdrepdlg.o \ @@ -3360,6 +3442,14 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS) COND_TOOLKIT_PM___GUI_SRC_OBJECTS = \ monodll_caret.o \ + monodll_colrdlgg.o \ + monodll_dirdlgg.o \ + monodll_fdrepdlg.o \ + monodll_imaglist.o \ + monodll_mdig.o \ + monodll_msgdlgg.o \ + monodll_prntdlgg.o \ + monodll_statusbr.o \ monodll_accel.o \ monodll_app.o \ monodll_bitmap.o \ @@ -3392,17 +3482,16 @@ COND_TOOLKIT_PM___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_listbox.o \ + monodll_listctrl.o \ monodll_main.o \ monodll_menu.o \ monodll_menuitem.o \ monodll_metafile.o \ - monodll_mimetype.o \ monodll_msgdlg.o \ monodll_nativdlg.o \ monodll_notebook.o \ @@ -3424,11 +3513,12 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS = \ monodll_stattext.o \ monodll_tabctrl.o \ monodll_textctrl.o \ - monodll_thread.o \ monodll_timer.o \ monodll_toolbar.o \ monodll_tooltip.o \ monodll_toplevel.o \ + monodll_treectrl.o \ + monodll_utilsgui.o \ monodll_window.o @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS) COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 = \ @@ -3470,6 +3560,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 = \ monolib_icon.o \ monolib_listbox.o \ monolib_main.o \ + monolib_mbarman.o \ monolib_menu.o \ monolib_menuitem.o \ monolib_pen.o \ @@ -3686,6 +3777,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 = \ monolib_toplevel.o \ monolib_utils.o \ monolib_window.o \ + monolib_xmcombo.o \ monolib_colrdlgg.o \ monolib_dirdlgg.o \ monolib_fdrepdlg.o \ @@ -3748,6 +3840,14 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1) COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 = \ monolib_caret.o \ + monolib_colrdlgg.o \ + monolib_dirdlgg.o \ + monolib_fdrepdlg.o \ + monolib_imaglist.o \ + monolib_mdig.o \ + monolib_msgdlgg.o \ + monolib_prntdlgg.o \ + monolib_statusbr.o \ monolib_accel.o \ monolib_app.o \ monolib_bitmap.o \ @@ -3780,17 +3880,16 @@ COND_TOOLKIT_PM___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_listbox.o \ + monolib_listctrl.o \ monolib_main.o \ monolib_menu.o \ monolib_menuitem.o \ monolib_metafile.o \ - monolib_mimetype.o \ monolib_msgdlg.o \ monolib_nativdlg.o \ monolib_notebook.o \ @@ -3812,11 +3911,12 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 = \ monolib_stattext.o \ monolib_tabctrl.o \ monolib_textctrl.o \ - monolib_thread.o \ monolib_timer.o \ monolib_toolbar.o \ monolib_tooltip.o \ monolib_toplevel.o \ + monolib_treectrl.o \ + monolib_utilsgui.o \ monolib_window.o @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1) COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 = \ @@ -3858,6 +3958,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 = \ coredll_icon.o \ coredll_listbox.o \ coredll_main.o \ + coredll_mbarman.o \ coredll_menu.o \ coredll_menuitem.o \ coredll_pen.o \ @@ -4074,6 +4175,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 = \ coredll_toplevel.o \ coredll_utils.o \ coredll_window.o \ + coredll_xmcombo.o \ coredll_colrdlgg.o \ coredll_dirdlgg.o \ coredll_fdrepdlg.o \ @@ -4136,6 +4238,14 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2) COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2 = \ coredll_caret.o \ + coredll_colrdlgg.o \ + coredll_dirdlgg.o \ + coredll_fdrepdlg.o \ + coredll_imaglist.o \ + coredll_mdig.o \ + coredll_msgdlgg.o \ + coredll_prntdlgg.o \ + coredll_statusbr.o \ coredll_accel.o \ coredll_app.o \ coredll_bitmap.o \ @@ -4168,17 +4278,16 @@ COND_TOOLKIT_PM___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_listbox.o \ + coredll_listctrl.o \ coredll_main.o \ coredll_menu.o \ coredll_menuitem.o \ coredll_metafile.o \ - coredll_mimetype.o \ coredll_msgdlg.o \ coredll_nativdlg.o \ coredll_notebook.o \ @@ -4200,11 +4309,12 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2 = \ coredll_stattext.o \ coredll_tabctrl.o \ coredll_textctrl.o \ - coredll_thread.o \ coredll_timer.o \ coredll_toolbar.o \ coredll_tooltip.o \ coredll_toplevel.o \ + coredll_treectrl.o \ + coredll_utilsgui.o \ coredll_window.o @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2) COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 = \ @@ -4246,6 +4356,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 = \ corelib_icon.o \ corelib_listbox.o \ corelib_main.o \ + corelib_mbarman.o \ corelib_menu.o \ corelib_menuitem.o \ corelib_pen.o \ @@ -4462,6 +4573,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 = \ corelib_toplevel.o \ corelib_utils.o \ corelib_window.o \ + corelib_xmcombo.o \ corelib_colrdlgg.o \ corelib_dirdlgg.o \ corelib_fdrepdlg.o \ @@ -4524,6 +4636,14 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3) COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3 = \ corelib_caret.o \ + corelib_colrdlgg.o \ + corelib_dirdlgg.o \ + corelib_fdrepdlg.o \ + corelib_imaglist.o \ + corelib_mdig.o \ + corelib_msgdlgg.o \ + corelib_prntdlgg.o \ + corelib_statusbr.o \ corelib_accel.o \ corelib_app.o \ corelib_bitmap.o \ @@ -4556,17 +4676,16 @@ COND_TOOLKIT_PM___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_listbox.o \ + corelib_listctrl.o \ corelib_main.o \ corelib_menu.o \ corelib_menuitem.o \ corelib_metafile.o \ - corelib_mimetype.o \ corelib_msgdlg.o \ corelib_nativdlg.o \ corelib_notebook.o \ @@ -4588,11 +4707,12 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3 = \ corelib_stattext.o \ corelib_tabctrl.o \ corelib_textctrl.o \ - corelib_thread.o \ corelib_timer.o \ corelib_toolbar.o \ corelib_tooltip.o \ corelib_toplevel.o \ + corelib_treectrl.o \ + corelib_utilsgui.o \ corelib_window.o @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3) @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS = monodll_helpbest.o @@ -5401,18 +5521,22 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ @COND_TOOLKIT_MAC@__NET_MACOSX_SRC_OBJECTS_3 = netlib_gsocket.o @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS \ @COND_PLATFORM_MACOSX_1@ = $(__NET_MACOSX_SRC_OBJECTS) +@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.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_OS2_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.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_OS2_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.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_OS2_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_gsocket.o @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_gsocket.o @COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_gsocket.o @COND_TOOLKIT_GTK@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o @@ -6251,6 +6375,9 @@ basedll_dde.o: $(srcdir)/src/msw/dde.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@basedll_dir.o: $(srcdir)/src/unix/dir.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@basedll_dir.o: $(srcdir)/src/os2/dir.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< + @COND_PLATFORM_WIN32_1@basedll_dir.o: $(srcdir)/src/msw/dir.cpp @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -6353,6 +6480,9 @@ basedll_mimetmac.o: $(srcdir)/src/mac/mimetmac.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@basedll_mimetype.o: $(srcdir)/src/unix/mimetype.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@basedll_mimetype.o: $(srcdir)/src/os2/mimetype.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< + basedll_module.o: $(srcdir)/src/common/module.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -6413,8 +6543,11 @@ basedll_textbuf.o: $(srcdir)/src/common/textbuf.cpp basedll_textfile.o: $(srcdir)/src/common/textfile.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< -basedll_thread.o: $(srcdir)/src/msw/thread.cpp - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< +@COND_PLATFORM_WIN32_1@basedll_thread.o: $(srcdir)/src/msw/thread.cpp +@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< + +@COND_PLATFORM_OS2_1@basedll_thread.o: $(srcdir)/src/os2/thread.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< @COND_PLATFORM_UNIX_1@basedll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -6437,6 +6570,9 @@ basedll_unzip.o: $(srcdir)/src/common/unzip.c @COND_TOOLKIT_MAC@basedll_utils.o: $(srcdir)/src/mac/utils.cpp @COND_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@basedll_utils.o: $(srcdir)/src/os2/utils.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< + @COND_PLATFORM_WIN32_1@basedll_utils.o: $(srcdir)/src/msw/utils.cpp @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -6446,6 +6582,9 @@ basedll_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp @COND_PLATFORM_WIN32_1@basedll_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@basedll_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< + @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@basedll_utilsexc.o: $(srcdir)/src/mac/utilsexc.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -6467,6 +6606,12 @@ basedll_wfstream.o: $(srcdir)/src/common/wfstream.cpp basedll_wxchar.o: $(srcdir)/src/common/wxchar.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< +basedll_xti.o: $(srcdir)/src/common/xti.cpp + $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< + +basedll_xtistrm.o: $(srcdir)/src/common/xtistrm.cpp + $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< + basedll_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -6526,6 +6671,9 @@ baselib_dde.o: $(srcdir)/src/msw/dde.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@baselib_dir.o: $(srcdir)/src/unix/dir.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@baselib_dir.o: $(srcdir)/src/os2/dir.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< + @COND_PLATFORM_WIN32_1@baselib_dir.o: $(srcdir)/src/msw/dir.cpp @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6628,6 +6776,9 @@ baselib_mimetmac.o: $(srcdir)/src/mac/mimetmac.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@baselib_mimetype.o: $(srcdir)/src/unix/mimetype.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@baselib_mimetype.o: $(srcdir)/src/os2/mimetype.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< + baselib_module.o: $(srcdir)/src/common/module.cpp $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6688,8 +6839,11 @@ baselib_textbuf.o: $(srcdir)/src/common/textbuf.cpp baselib_textfile.o: $(srcdir)/src/common/textfile.cpp $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< -baselib_thread.o: $(srcdir)/src/msw/thread.cpp - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< +@COND_PLATFORM_WIN32_1@baselib_thread.o: $(srcdir)/src/msw/thread.cpp +@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< + +@COND_PLATFORM_OS2_1@baselib_thread.o: $(srcdir)/src/os2/thread.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @COND_PLATFORM_UNIX_1@baselib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6712,6 +6866,9 @@ baselib_unzip.o: $(srcdir)/src/common/unzip.c @COND_TOOLKIT_MAC@baselib_utils.o: $(srcdir)/src/mac/utils.cpp @COND_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@baselib_utils.o: $(srcdir)/src/os2/utils.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< + @COND_PLATFORM_WIN32_1@baselib_utils.o: $(srcdir)/src/msw/utils.cpp @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6721,6 +6878,9 @@ baselib_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp @COND_PLATFORM_WIN32_1@baselib_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@baselib_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< + @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@baselib_utilsexc.o: $(srcdir)/src/mac/utilsexc.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6742,6 +6902,12 @@ baselib_wfstream.o: $(srcdir)/src/common/wfstream.cpp baselib_wxchar.o: $(srcdir)/src/common/wxchar.cpp $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< +baselib_xti.o: $(srcdir)/src/common/xti.cpp + $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< + +baselib_xtistrm.o: $(srcdir)/src/common/xtistrm.cpp + $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< + baselib_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6961,6 +7127,9 @@ coredll_aga.o: $(srcdir)/src/mac/aga.cpp coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_USE_GUI_1@coredll_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_brush.o: $(srcdir)/src/os2/brush.cpp @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7174,6 +7343,9 @@ coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7477,6 +7649,9 @@ coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7570,6 +7745,9 @@ coredll_event.o: $(srcdir)/src/common/event.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7789,9 +7967,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) $< -coredll_gsocket.o: $(srcdir)/src/os2/gsocket.c - $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< - @COND_TOOLKIT_GTK_USE_GUI_1@coredll_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.c @COND_TOOLKIT_GTK_USE_GUI_1@ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< @@ -7882,6 +8057,9 @@ coredll_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@coredll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7921,6 +8099,9 @@ coredll_inphand.o: $(srcdir)/src/univ/inphand.cpp @COND_USE_GUI_1@coredll_lboxcmn.o: $(srcdir)/src/common/lboxcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_USE_GUI_1@coredll_listbkg.o: $(srcdir)/src/generic/listbkg.cpp +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/os2/listbox.cpp @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7942,6 +8123,9 @@ coredll_inphand.o: $(srcdir)/src/univ/inphand.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/mac/listbox.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/os2/listctrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/msw/listctrl.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7987,6 +8171,9 @@ coredll_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp @COND_USE_GUI_1@coredll_matrix.o: $(srcdir)/src/common/matrix.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +coredll_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_mdi.o: $(srcdir)/src/mac/mdi.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8002,6 +8189,9 @@ coredll_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8056,9 +8246,6 @@ coredll_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp coredll_metal.o: $(srcdir)/src/univ/themes/metal.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -coredll_mimetype.o: $(srcdir)/src/os2/mimetype.cpp - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_minifram.o: $(srcdir)/src/motif/minifram.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8095,6 +8282,9 @@ coredll_mimetype.o: $(srcdir)/src/os2/mimetype.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8248,6 +8438,9 @@ coredll_printmac.o: $(srcdir)/src/mac/printmac.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8581,6 +8774,9 @@ coredll_statlmac.o: $(srcdir)/src/mac/statlmac.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8650,11 +8846,8 @@ coredll_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp coredll_theme.o: $(srcdir)/src/univ/theme.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_thread.o: $(srcdir)/src/os2/thread.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_thread.o: $(srcdir)/src/mac/thread.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +coredll_thread.o: $(srcdir)/src/mac/thread.cpp + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@coredll_timer.o: $(srcdir)/src/msw/timer.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8746,8 +8939,11 @@ coredll_topluniv.o: $(srcdir)/src/univ/topluniv.cpp @COND_USE_GUI_1@coredll_treectlg.o: $(srcdir)/src/generic/treectlg.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -coredll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_treectrl.o: $(srcdir)/src/os2/treectrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< coredll_uma.o: $(srcdir)/src/mac/uma.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8779,6 +8975,9 @@ coredll_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.cpp @COND_TOOLKIT_MSW_USE_GUI_1@coredll_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + coredll_utilsres.o: $(srcdir)/src/gtk/utilsres.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8863,6 +9062,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp coredll_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +coredll_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c + $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< + @COND_USE_GUI_1@coredll_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -9018,6 +9220,9 @@ corelib_aga.o: $(srcdir)/src/mac/aga.cpp corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_USE_GUI_1@corelib_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_brush.o: $(srcdir)/src/os2/brush.cpp @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9231,6 +9436,9 @@ corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9534,6 +9742,9 @@ corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9627,6 +9838,9 @@ corelib_event.o: $(srcdir)/src/common/event.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9846,9 +10060,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) $< -corelib_gsocket.o: $(srcdir)/src/os2/gsocket.c - $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< - @COND_TOOLKIT_GTK_USE_GUI_1@corelib_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.c @COND_TOOLKIT_GTK_USE_GUI_1@ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< @@ -9939,6 +10150,9 @@ corelib_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@corelib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9978,6 +10192,9 @@ corelib_inphand.o: $(srcdir)/src/univ/inphand.cpp @COND_USE_GUI_1@corelib_lboxcmn.o: $(srcdir)/src/common/lboxcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_USE_GUI_1@corelib_listbkg.o: $(srcdir)/src/generic/listbkg.cpp +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/os2/listbox.cpp @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9999,6 +10216,9 @@ corelib_inphand.o: $(srcdir)/src/univ/inphand.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/mac/listbox.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/os2/listctrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/msw/listctrl.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10044,6 +10264,9 @@ corelib_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp @COND_USE_GUI_1@corelib_matrix.o: $(srcdir)/src/common/matrix.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +corelib_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_mdi.o: $(srcdir)/src/mac/mdi.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10059,6 +10282,9 @@ corelib_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_mdig.o: $(srcdir)/src/generic/mdig.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_mdig.o: $(srcdir)/src/generic/mdig.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@corelib_mdig.o: $(srcdir)/src/generic/mdig.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10113,9 +10339,6 @@ corelib_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp corelib_metal.o: $(srcdir)/src/univ/themes/metal.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -corelib_mimetype.o: $(srcdir)/src/os2/mimetype.cpp - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_minifram.o: $(srcdir)/src/motif/minifram.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10152,6 +10375,9 @@ corelib_mimetype.o: $(srcdir)/src/os2/mimetype.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10305,6 +10531,9 @@ corelib_printmac.o: $(srcdir)/src/mac/printmac.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10638,6 +10867,9 @@ corelib_statlmac.o: $(srcdir)/src/mac/statlmac.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10707,11 +10939,8 @@ corelib_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp corelib_theme.o: $(srcdir)/src/univ/theme.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_thread.o: $(srcdir)/src/os2/thread.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_thread.o: $(srcdir)/src/mac/thread.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +corelib_thread.o: $(srcdir)/src/mac/thread.cpp + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@corelib_timer.o: $(srcdir)/src/msw/timer.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10803,8 +11032,11 @@ corelib_topluniv.o: $(srcdir)/src/univ/topluniv.cpp @COND_USE_GUI_1@corelib_treectlg.o: $(srcdir)/src/generic/treectlg.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -corelib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_treectrl.o: $(srcdir)/src/os2/treectrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< corelib_uma.o: $(srcdir)/src/mac/uma.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10836,6 +11068,9 @@ corelib_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.cpp @COND_TOOLKIT_MSW_USE_GUI_1@corelib_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + corelib_utilsres.o: $(srcdir)/src/gtk/utilsres.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10920,6 +11155,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp corelib_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +corelib_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c + $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< + @COND_USE_GUI_1@corelib_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10941,7 +11179,7 @@ dbgridlib_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__gldll_PCH_DEP) $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) +@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__gldll_PCH_DEP) $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname) $(__coredll___depname) @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@ $(GLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__gldll___macinstnamecmd) $(__gldll___importlib) $(__gldll___soname_flags) $(dll___macver) $(EXTRALIBS_OPENGL) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(__gldll___so_symlinks_cmd) @@ -11495,6 +11733,9 @@ monodll_basemsw.o: $(srcdir)/src/msw/basemsw.cpp monodll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_USE_GUI_1@monodll_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_brush.o: $(srcdir)/src/os2/brush.cpp @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11717,6 +11958,9 @@ monodll_cmdline.o: $(srcdir)/src/common/cmdline.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12038,6 +12282,9 @@ monodll_dde.o: $(srcdir)/src/msw/dde.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monodll_dir.o: $(srcdir)/src/unix/dir.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@monodll_dir.o: $(srcdir)/src/os2/dir.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_PLATFORM_WIN32_1@monodll_dir.o: $(srcdir)/src/msw/dir.cpp @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12062,6 +12309,9 @@ monodll_dircmn.o: $(srcdir)/src/common/dircmn.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12173,6 +12423,9 @@ monodll_extended.o: $(srcdir)/src/common/extended.c @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12443,8 +12696,8 @@ monodll_gridsel.o: $(srcdir)/src/generic/gridsel.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.c @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_gsocket.o: $(srcdir)/src/os2/gsocket.c -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< +@COND_PLATFORM_OS2_1@monodll_gsocket.o: $(srcdir)/src/os2/gsocket.c +@COND_PLATFORM_OS2_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< @COND_PLATFORM_WIN32_1@monodll_gsocket.o: $(srcdir)/src/msw/gsocket.c @COND_PLATFORM_WIN32_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< @@ -12584,6 +12837,9 @@ monodll_http.o: $(srcdir)/src/common/http.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monodll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12656,6 +12912,9 @@ monodll_laywin.o: $(srcdir)/src/generic/laywin.cpp monodll_list.o: $(srcdir)/src/common/list.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_USE_GUI_1@monodll_listbkg.o: $(srcdir)/src/generic/listbkg.cpp +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/os2/listbox.cpp @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12677,6 +12936,9 @@ monodll_list.o: $(srcdir)/src/common/list.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/mac/listbox.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/os2/listctrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/msw/listctrl.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12758,6 +13020,9 @@ monodll_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp @COND_USE_GUI_1@monodll_matrix.o: $(srcdir)/src/common/matrix.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_mdi.o: $(srcdir)/src/mac/mdi.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12773,6 +13038,9 @@ monodll_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12848,8 +13116,8 @@ monodll_mimetmac.o: $(srcdir)/src/mac/mimetmac.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monodll_mimetype.o: $(srcdir)/src/unix/mimetype.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_mimetype.o: $(srcdir)/src/os2/mimetype.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@monodll_mimetype.o: $(srcdir)/src/os2/mimetype.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_minifram.o: $(srcdir)/src/motif/minifram.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12890,6 +13158,9 @@ monodll_module.o: $(srcdir)/src/common/module.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monodll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13049,6 +13320,9 @@ monodll_printmac.o: $(srcdir)/src/mac/printmac.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13430,6 +13704,9 @@ monodll_statlmac.o: $(srcdir)/src/mac/statlmac.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + monodll_stopwatch.o: $(srcdir)/src/common/stopwatch.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13547,8 +13824,8 @@ monodll_theme.o: $(srcdir)/src/univ/theme.cpp @COND_PLATFORM_WIN32_1@monodll_thread.o: $(srcdir)/src/msw/thread.cpp @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_thread.o: $(srcdir)/src/os2/thread.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@monodll_thread.o: $(srcdir)/src/os2/thread.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_thread.o: $(srcdir)/src/mac/thread.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13658,8 +13935,11 @@ monodll_topluniv.o: $(srcdir)/src/univ/topluniv.cpp @COND_USE_GUI_1@monodll_treectlg.o: $(srcdir)/src/generic/treectlg.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -monodll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_treectrl.o: $(srcdir)/src/os2/treectrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< monodll_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13679,6 +13959,9 @@ monodll_url.o: $(srcdir)/src/common/url.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_utils.o: $(srcdir)/src/motif/utils.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@monodll_utils.o: $(srcdir)/src/os2/utils.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@monodll_utils.o: $(srcdir)/src/x11/utils.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13700,6 +13983,9 @@ monodll_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@monodll_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monodll_utilsexc.o: $(srcdir)/src/mac/utilsexc.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13709,6 +13995,9 @@ monodll_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monodll_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + monodll_utilsres.o: $(srcdir)/src/gtk/utilsres.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13826,12 +14115,24 @@ monodll_wizard.o: $(srcdir)/src/generic/wizard.cpp monodll_wxchar.o: $(srcdir)/src/common/wxchar.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c + $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< + monodll_xml.o: $(srcdir)/src/xml/xml.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_USE_GUI_1@monodll_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_xti.o: $(srcdir)/src/common/xti.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +monodll_xtistrm.o: $(srcdir)/src/common/xtistrm.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +monodll_xtixml.o: $(srcdir)/src/common/xtixml.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + monodll_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -14008,6 +14309,9 @@ monolib_basemsw.o: $(srcdir)/src/msw/basemsw.cpp monolib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_USE_GUI_1@monolib_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_brush.o: $(srcdir)/src/os2/brush.cpp @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14230,6 +14534,9 @@ monolib_cmdline.o: $(srcdir)/src/common/cmdline.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14551,6 +14858,9 @@ monolib_dde.o: $(srcdir)/src/msw/dde.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monolib_dir.o: $(srcdir)/src/unix/dir.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@monolib_dir.o: $(srcdir)/src/os2/dir.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_PLATFORM_WIN32_1@monolib_dir.o: $(srcdir)/src/msw/dir.cpp @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14575,6 +14885,9 @@ monolib_dircmn.o: $(srcdir)/src/common/dircmn.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14686,6 +14999,9 @@ monolib_extended.o: $(srcdir)/src/common/extended.c @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14956,8 +15272,8 @@ monolib_gridsel.o: $(srcdir)/src/generic/gridsel.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.c @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_gsocket.o: $(srcdir)/src/os2/gsocket.c -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< +@COND_PLATFORM_OS2_1@monolib_gsocket.o: $(srcdir)/src/os2/gsocket.c +@COND_PLATFORM_OS2_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< @COND_PLATFORM_WIN32_1@monolib_gsocket.o: $(srcdir)/src/msw/gsocket.c @COND_PLATFORM_WIN32_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< @@ -15097,6 +15413,9 @@ monolib_http.o: $(srcdir)/src/common/http.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monolib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15169,6 +15488,9 @@ monolib_laywin.o: $(srcdir)/src/generic/laywin.cpp monolib_list.o: $(srcdir)/src/common/list.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_USE_GUI_1@monolib_listbkg.o: $(srcdir)/src/generic/listbkg.cpp +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/os2/listbox.cpp @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15190,6 +15512,9 @@ monolib_list.o: $(srcdir)/src/common/list.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/mac/listbox.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/os2/listctrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/msw/listctrl.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15271,6 +15596,9 @@ monolib_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp @COND_USE_GUI_1@monolib_matrix.o: $(srcdir)/src/common/matrix.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_mdi.o: $(srcdir)/src/mac/mdi.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15286,6 +15614,9 @@ monolib_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15361,8 +15692,8 @@ monolib_mimetmac.o: $(srcdir)/src/mac/mimetmac.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monolib_mimetype.o: $(srcdir)/src/unix/mimetype.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_mimetype.o: $(srcdir)/src/os2/mimetype.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@monolib_mimetype.o: $(srcdir)/src/os2/mimetype.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_minifram.o: $(srcdir)/src/motif/minifram.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15403,6 +15734,9 @@ monolib_module.o: $(srcdir)/src/common/module.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15562,6 +15896,9 @@ monolib_printmac.o: $(srcdir)/src/mac/printmac.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15943,6 +16280,9 @@ monolib_statlmac.o: $(srcdir)/src/mac/statlmac.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + monolib_stopwatch.o: $(srcdir)/src/common/stopwatch.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16060,8 +16400,8 @@ monolib_theme.o: $(srcdir)/src/univ/theme.cpp @COND_PLATFORM_WIN32_1@monolib_thread.o: $(srcdir)/src/msw/thread.cpp @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_thread.o: $(srcdir)/src/os2/thread.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@monolib_thread.o: $(srcdir)/src/os2/thread.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_thread.o: $(srcdir)/src/mac/thread.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16171,8 +16511,11 @@ monolib_topluniv.o: $(srcdir)/src/univ/topluniv.cpp @COND_USE_GUI_1@monolib_treectlg.o: $(srcdir)/src/generic/treectlg.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -monolib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_treectrl.o: $(srcdir)/src/os2/treectrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< monolib_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16192,6 +16535,9 @@ monolib_url.o: $(srcdir)/src/common/url.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_utils.o: $(srcdir)/src/motif/utils.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@monolib_utils.o: $(srcdir)/src/os2/utils.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@monolib_utils.o: $(srcdir)/src/x11/utils.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16213,6 +16559,9 @@ monolib_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@monolib_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monolib_utilsexc.o: $(srcdir)/src/mac/utilsexc.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16222,6 +16571,9 @@ monolib_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monolib_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + monolib_utilsres.o: $(srcdir)/src/gtk/utilsres.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16339,12 +16691,24 @@ monolib_wizard.o: $(srcdir)/src/generic/wizard.cpp monolib_wxchar.o: $(srcdir)/src/common/wxchar.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c + $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< + monolib_xml.o: $(srcdir)/src/xml/xml.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_USE_GUI_1@monolib_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_xti.o: $(srcdir)/src/common/xti.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +monolib_xtistrm.o: $(srcdir)/src/common/xtistrm.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +monolib_xtixml.o: $(srcdir)/src/common/xtixml.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + monolib_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16373,6 +16737,9 @@ netdll_ftp.o: $(srcdir)/src/common/ftp.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.c @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CCC) -c -o $@ $(NETDLL_CFLAGS) $< +@COND_PLATFORM_OS2_1@netdll_gsocket.o: $(srcdir)/src/os2/gsocket.c +@COND_PLATFORM_OS2_1@ $(CCC) -c -o $@ $(NETDLL_CFLAGS) $< + @COND_PLATFORM_WIN32_1@netdll_gsocket.o: $(srcdir)/src/msw/gsocket.c @COND_PLATFORM_WIN32_1@ $(CCC) -c -o $@ $(NETDLL_CFLAGS) $< @@ -16423,6 +16790,9 @@ netlib_ftp.o: $(srcdir)/src/common/ftp.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.c @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CCC) -c -o $@ $(NETLIB_CFLAGS) $< +@COND_PLATFORM_OS2_1@netlib_gsocket.o: $(srcdir)/src/os2/gsocket.c +@COND_PLATFORM_OS2_1@ $(CCC) -c -o $@ $(NETLIB_CFLAGS) $< + @COND_PLATFORM_WIN32_1@netlib_gsocket.o: $(srcdir)/src/msw/gsocket.c @COND_PLATFORM_WIN32_1@ $(CCC) -c -o $@ $(NETLIB_CFLAGS) $< @@ -16920,6 +17290,9 @@ wxzlib_zutil.o: $(srcdir)/src/zlib/zutil.c xmldll_xml.o: $(srcdir)/src/xml/xml.cpp $(CXXC) -c -o $@ $(XMLDLL_CXXFLAGS) $< +xmldll_xtixml.o: $(srcdir)/src/common/xtixml.cpp + $(CXXC) -c -o $@ $(XMLDLL_CXXFLAGS) $< + @COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a: $(__xmllib_PCH_DEP) $(XMLLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0@ $(AR) rcu $@ $(XMLLIB_OBJECTS) @@ -16928,10 +17301,12 @@ xmldll_xml.o: $(srcdir)/src/xml/xml.cpp xmllib_xml.o: $(srcdir)/src/xml/xml.cpp $(CXXC) -c -o $@ $(XMLLIB_CXXFLAGS) $< +xmllib_xtixml.o: $(srcdir)/src/common/xtixml.cpp + $(CXXC) -c -o $@ $(XMLLIB_CXXFLAGS) $< + # # "make dist" target implementation: -# $Id$ # @@ -16951,6 +17326,7 @@ JPEGDIR = $(WXDIR)/src/jpeg TIFFDIR = $(WXDIR)/src/tiff ZLIBDIR = $(WXDIR)/src/zlib REGEXDIR = $(WXDIR)/src/regex +EXPATDIR = $(WXDIR)/src/expat GTKDIR = $(WXDIR)/src/gtk X11DIR = $(WXDIR)/src/x11 X11INC = $(WXDIR)/include/wx/x11 @@ -17041,6 +17417,8 @@ ALL_DIST: distrib_clean cp $(REGEXDIR)/WHATSNEW $(DISTDIR)/src/regex cp $(REGEXDIR)/mkh $(DISTDIR)/src/regex cp $(REGEXDIR)/tests $(DISTDIR)/src/regex + cp -Rf $(EXPATDIR) $(DISTDIR)/src + (cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`) mkdir $(DISTDIR)/src/iodbc cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc @@ -17186,6 +17564,8 @@ MOTIF_DIST: ALL_GUI_DIST cp $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \ $(X11INC)/bitmap.h $(X11INC)/private.h $(X11INC)/region.h \ $(DISTDIR)/include/wx/x11 + mkdir $(DISTDIR)/contrib + cp -R $(WXDIR)/contrib $(DISTDIR) MACX_DIST: ALL_GUI_DIST cp $(INCDIR)/*.* $(DISTDIR)/include @@ -17199,6 +17579,8 @@ MACX_DIST: ALL_GUI_DIST cp $(MACDIR)/morefile/*.c $(DISTDIR)/src/mac/morefile mkdir $(DISTDIR)/src/mac/macsock cp $(MACDIR)/macsock/*.lib $(DISTDIR)/src/mac/macsock + mkdir $(DISTDIR)/contrib + cp -R $(WXDIR)/contrib $(DISTDIR) # TODO: Distribute some files COCOA_DIST: ALL_GUI_DIST @@ -17391,6 +17773,11 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs cp $(SAMPDIR)/dialogs/*.mms $(DISTDIR)/samples/dialogs + mkdir $(DISTDIR)/samples/dialup + cp $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup + cp $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup + cp $(SAMPDIR)/dialup/*.cpp $(DISTDIR)/samples/dialup + mkdir $(DISTDIR)/samples/dnd cp $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd cp $(SAMPDIR)/dnd/makefile.unx $(DISTDIR)/samples/dnd @@ -17468,6 +17855,12 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/help/*.xpm $(DISTDIR)/samples/help cp $(SAMPDIR)/help/doc/*.* $(DISTDIR)/samples/help/doc + mkdir $(DISTDIR)/samples/htlbox + cp $(SAMPDIR)/htlbox/Makefile.in $(DISTDIR)/samples/htlbox + cp $(SAMPDIR)/htlbox/makefile.unx $(DISTDIR)/samples/htlbox + cp $(SAMPDIR)/htlbox/*.cpp $(DISTDIR)/samples/htlbox + cp $(SAMPDIR)/htlbox/*.xpm $(DISTDIR)/samples/htlbox + mkdir $(DISTDIR)/samples/html cp $(SAMPDIR)/html/Makefile.in $(DISTDIR)/samples/html mkdir $(DISTDIR)/samples/html/about @@ -17621,10 +18014,10 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/mobile/styles/*.h $(DISTDIR)/samples/mobile/styles cp $(SAMPDIR)/mobile/styles/*.jpg $(DISTDIR)/samples/mobile/styles - mkdir $(DISTDIR)/samples/dialup - cp $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup - cp $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup - cp $(SAMPDIR)/dialup/*.cpp $(DISTDIR)/samples/dialup + mkdir $(DISTDIR)/samples/multimon + cp $(SAMPDIR)/multimon/Makefile.in $(DISTDIR)/samples/multimon + cp $(SAMPDIR)/multimon/makefile.unx $(DISTDIR)/samples/multimon + cp $(SAMPDIR)/multimon/*.cpp $(DISTDIR)/samples/multimon mkdir $(DISTDIR)/samples/notebook cp $(SAMPDIR)/notebook/Makefile.in $(DISTDIR)/samples/notebook @@ -17675,6 +18068,11 @@ SAMPLES_DIST: ALL_GUI_DIST # cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource # cp $(SAMPDIR)/resource/*.wxr $(DISTDIR)/samples/resource + mkdir $(DISTDIR)/samples/render + cp $(SAMPDIR)/render/Makefile.in $(DISTDIR)/samples/render + cp $(SAMPDIR)/render/makefile.unx $(DISTDIR)/samples/render + cp $(SAMPDIR)/render/*.cpp $(DISTDIR)/samples/render + mkdir $(DISTDIR)/samples/rotate cp $(SAMPDIR)/rotate/Makefile.in $(DISTDIR)/samples/rotate cp $(SAMPDIR)/rotate/makefile.unx $(DISTDIR)/samples/rotate @@ -17825,12 +18223,6 @@ UTILS_DIST: ALL_GUI_DIST cp $(UTILSDIR)/emulator/docs/*.txt $(DISTDIR)/utils/emulator/docs cp $(UTILSDIR)/emulator/docs/*.jpg $(DISTDIR)/utils/emulator/docs - mkdir $(DISTDIR)/utils/makegen - mkdir $(DISTDIR)/utils/makegen/templates - cp $(UTILSDIR)/makegen/Makefile.in $(DISTDIR)/utils/makegen - cp $(UTILSDIR)/makegen/*.cpp $(DISTDIR)/utils/makegen - cp $(UTILSDIR)/makegen/templates/*.* $(DISTDIR)/utils/makegen/templates - mkdir $(DISTDIR)/utils/hhp2cached cp $(UTILSDIR)/hhp2cached/*.* $(DISTDIR)/utils/hhp2cached