X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dbeb8eacae2401b0b6fd72455435f269c85f2365..9b6bbdccba27401cf85654cd0fb3533902c4ad5c:/Makefile.in diff --git a/Makefile.in b/Makefile.in index 36732b731b..17ff0fdd00 100644 --- a/Makefile.in +++ b/Makefile.in @@ -45,6 +45,7 @@ LDFLAGS = @LDFLAGS@ VENDOR = @VENDOR@ WX_FLAVOUR = @WX_FLAVOUR@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ +REZ = @REZ@ DEREZ = @DEREZ@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ @@ -464,6 +465,7 @@ ALL_PORTS_BASE_HEADERS = \ wx/msw/dde.h \ wx/msw/debughlp.h \ wx/msw/gccpriv.h \ + wx/msw/libraries.h \ wx/msw/mimetype.h \ wx/msw/stackwalk.h \ wx/msw/stdpaths.h \ @@ -1133,7 +1135,9 @@ HTMLDLL_OBJECTS = \ $(__HTML_SRC_PLATFORM_OBJECTS_2) \ htmldll_helpctrl.o \ htmldll_helpdata.o \ + htmldll_helpdlg.o \ htmldll_helpfrm.o \ + htmldll_helpwnd.o \ htmldll_htmlcell.o \ htmldll_htmlfilt.o \ htmldll_htmlpars.o \ @@ -1162,7 +1166,9 @@ HTMLLIB_OBJECTS = \ $(__HTML_SRC_PLATFORM_OBJECTS_3) \ htmllib_helpctrl.o \ htmllib_helpdata.o \ + htmllib_helpdlg.o \ htmllib_helpfrm.o \ + htmllib_helpwnd.o \ htmllib_htmlcell.o \ htmllib_htmlfilt.o \ htmllib_htmlpars.o \ @@ -1241,6 +1247,7 @@ XRCDLL_OBJECTS = \ xrcdll_xh_mdi.o \ xrcdll_xh_gauge.o \ xrcdll_xh_gdctl.o \ + xrcdll_xh_grid.o \ xrcdll_xh_html.o \ xrcdll_xh_listb.o \ xrcdll_xh_listbk.o \ @@ -1291,6 +1298,7 @@ XRCLIB_OBJECTS = \ xrclib_xh_mdi.o \ xrclib_xh_gauge.o \ xrclib_xh_gdctl.o \ + xrclib_xh_grid.o \ xrclib_xh_html.o \ xrclib_xh_listb.o \ xrclib_xh_listbk.o \ @@ -1530,6 +1538,7 @@ COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR = \ wx/msw/dde.h \ wx/msw/debughlp.h \ wx/msw/gccpriv.h \ + wx/msw/libraries.h \ wx/msw/mimetype.h \ wx/msw/stackwalk.h \ wx/msw/stdpaths.h \ @@ -1586,6 +1595,7 @@ COND_TOOLKIT_MGL_LOWLEVEL_HDR = \ wx/mgl/app.h \ wx/mgl/bitmap.h \ wx/mgl/brush.h \ + wx/mgl/chkconf.h \ wx/mgl/clipbrd.h \ wx/mgl/colour.h \ wx/mgl/cursor.h \ @@ -1823,6 +1833,7 @@ COND_TOOLKIT_MAC_GUI_HDR = \ wx/mac/dirdlg.h \ wx/mac/display.h \ wx/mac/dnd.h \ + wx/mac/evtloop.h \ wx/mac/filedlg.h \ wx/mac/font.h \ wx/mac/fontdlg.h \ @@ -1907,6 +1918,7 @@ COND_TOOLKIT_MAC_GUI_HDR = \ wx/mac/carbon/dirdlg.h \ wx/mac/carbon/display.h \ wx/mac/carbon/dnd.h \ + wx/mac/carbon/evtloop.h \ wx/mac/carbon/filedlg.h \ wx/mac/carbon/font.h \ wx/mac/carbon/fontdlg.h \ @@ -2042,7 +2054,6 @@ COND_TOOLKIT_MSW_GUI_HDR = \ wx/msw/button.h \ wx/msw/caret.h \ wx/msw/checkbox.h \ - wx/msw/checklst.h \ wx/msw/choice.h \ wx/msw/clipbrd.h \ wx/msw/colordlg.h \ @@ -2099,6 +2110,7 @@ COND_TOOLKIT_MSW_GUI_HDR = \ wx/msw/regconf.h \ wx/msw/region.h \ wx/msw/registry.h \ + wx/msw/rcdefs.h \ wx/msw/scrolbar.h \ wx/msw/setup0.h \ wx/msw/slider95.h \ @@ -2120,6 +2132,8 @@ COND_TOOLKIT_MSW_GUI_HDR = \ wx/msw/treectrl.h \ wx/msw/window.h \ wx/msw/wx.manifest \ + wx/msw/amd64.manifest \ + wx/msw/ia64.manifest \ wx/msw/wx.rc \ wx/msw/colours.bmp \ wx/msw/csquery.bmp \ @@ -2146,6 +2160,7 @@ COND_TOOLKIT_MSW_GUI_HDR = \ wx/msw/question.ico \ wx/msw/removble.ico \ wx/msw/std.ico \ + wx/msw/checklst.h \ wx/msw/fdrepdlg.h \ wx/msw/fontdlg.h \ wx/msw/helpbest.h \ @@ -2183,6 +2198,7 @@ COND_TOOLKIT_PM_GUI_HDR = \ wx/os2/dcprint.h \ wx/os2/dcscreen.h \ wx/os2/dialog.h \ + wx/os2/display.h \ wx/os2/dnd.h \ wx/os2/filedlg.h \ wx/os2/font.h \ @@ -2238,7 +2254,6 @@ COND_TOOLKIT_WINCE_GUI_HDR = \ wx/msw/button.h \ wx/msw/caret.h \ wx/msw/checkbox.h \ - wx/msw/checklst.h \ wx/msw/choice.h \ wx/msw/clipbrd.h \ wx/msw/colordlg.h \ @@ -2295,6 +2310,7 @@ COND_TOOLKIT_WINCE_GUI_HDR = \ wx/msw/regconf.h \ wx/msw/region.h \ wx/msw/registry.h \ + wx/msw/rcdefs.h \ wx/msw/scrolbar.h \ wx/msw/setup0.h \ wx/msw/slider95.h \ @@ -2316,6 +2332,8 @@ COND_TOOLKIT_WINCE_GUI_HDR = \ wx/msw/treectrl.h \ wx/msw/window.h \ wx/msw/wx.manifest \ + wx/msw/amd64.manifest \ + wx/msw/ia64.manifest \ wx/msw/wx.rc \ wx/msw/colours.bmp \ wx/msw/csquery.bmp \ @@ -2344,6 +2362,7 @@ COND_TOOLKIT_WINCE_GUI_HDR = \ wx/msw/std.ico \ wx/generic/fdrepdlg.h \ wx/generic/fontdlgg.h \ + wx/msw/wince/checklst.h \ wx/msw/wince/choicece.h \ wx/msw/wince/helpwce.h \ wx/msw/wince/libraries.h \ @@ -2675,7 +2694,9 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ $(MEDIA_PLATFORM_HDR) \ wx/html/helpctrl.h \ wx/html/helpdata.h \ + wx/html/helpdlg.h \ wx/html/helpfrm.h \ + wx/html/helpwnd.h \ wx/html/htmlcell.h \ wx/html/htmldefs.h \ wx/html/htmlfilt.h \ @@ -2707,6 +2728,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/xrc/xh_mdi.h \ wx/xrc/xh_gauge.h \ wx/xrc/xh_gdctl.h \ + wx/xrc/xh_grid.h \ wx/xrc/xh_html.h \ wx/xrc/xh_listb.h \ wx/xrc/xh_listbk.h \ @@ -2944,7 +2966,9 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \ $(__HTML_SRC_PLATFORM_OBJECTS) \ monodll_helpctrl.o \ monodll_helpdata.o \ + monodll_helpdlg.o \ monodll_helpfrm.o \ + monodll_helpwnd.o \ monodll_htmlcell.o \ monodll_htmlfilt.o \ monodll_htmlpars.o \ @@ -2983,6 +3007,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \ monodll_xh_mdi.o \ monodll_xh_gauge.o \ monodll_xh_gdctl.o \ + monodll_xh_grid.o \ monodll_xh_html.o \ monodll_xh_listb.o \ monodll_xh_listbk.o \ @@ -3040,6 +3065,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_dpycmn.o \ monodll_dseldlg.o \ monodll_effects.o \ + monodll_evtloopcmn.o \ monodll_fddlgcmn.o \ monodll_fldlgcmn.o \ monodll_fontcmn.o \ @@ -3189,6 +3215,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_dpycmn.o \ monodll_dseldlg.o \ monodll_effects.o \ + monodll_evtloopcmn.o \ monodll_fddlgcmn.o \ monodll_fldlgcmn.o \ monodll_fontcmn.o \ @@ -3651,6 +3678,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS = \ monodll_dirdlg.o \ monodll_display.o \ monodll_dnd.o \ + monodll_evtloop.o \ monodll_filedlg.o \ monodll_font.o \ monodll_fontdlg.o \ @@ -3779,7 +3807,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ monodll_bmpbuttn.o \ monodll_button.o \ monodll_checkbox.o \ - monodll_checklst.o \ monodll_choice.o \ monodll_colordlg.o \ monodll_combobox.o \ @@ -3819,6 +3846,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ monodll_textctrl.o \ monodll_tglbtn.o \ monodll_treectrl.o \ + monodll_checklst.o \ monodll_fdrepdlg.o \ monodll_fontdlg.o @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS) @@ -3855,6 +3883,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS = \ monodll_dcprint.o \ monodll_dcscreen.o \ monodll_dialog.o \ + monodll_display.o \ monodll_dnd.o \ monodll_evtloop.o \ monodll_filedlg.o \ @@ -3912,7 +3941,6 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS = \ monodll_bmpbuttn.o \ monodll_button.o \ monodll_checkbox.o \ - monodll_checklst.o \ monodll_choice.o \ monodll_colordlg.o \ monodll_combobox.o \ @@ -3955,6 +3983,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS = \ monodll_dirdlgg.o \ monodll_fdrepdlg.o \ monodll_fontdlgg.o \ + monodll_checklst.o \ monodll_choicece.o \ monodll_crt.o \ monodll_filedlgwce.o \ @@ -4208,6 +4237,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS = \ monodll_richtextbuffer.o \ monodll_richtextstyles.o \ monodll_richtextxml.o \ + monodll_richtexthtml.o \ $(__ADVANCED_PLATFORM_SRC_OBJECTS) \ $(__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS) @COND_WXUNIV_0@__ADVANCED_SRC_OBJECTS = $(COND_WXUNIV_0___ADVANCED_SRC_OBJECTS) @@ -4228,6 +4258,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS = \ monodll_richtextbuffer.o \ monodll_richtextstyles.o \ monodll_richtextxml.o \ + monodll_richtexthtml.o \ $(__ADVANCED_PLATFORM_SRC_OBJECTS) @COND_WXUNIV_1@__ADVANCED_SRC_OBJECTS = $(COND_WXUNIV_1___ADVANCED_SRC_OBJECTS) @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS \ @@ -4422,7 +4453,9 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ $(__HTML_SRC_PLATFORM_OBJECTS_1) \ monolib_helpctrl.o \ monolib_helpdata.o \ + monolib_helpdlg.o \ monolib_helpfrm.o \ + monolib_helpwnd.o \ monolib_htmlcell.o \ monolib_htmlfilt.o \ monolib_htmlpars.o \ @@ -4461,6 +4494,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ monolib_xh_mdi.o \ monolib_xh_gauge.o \ monolib_xh_gdctl.o \ + monolib_xh_grid.o \ monolib_xh_html.o \ monolib_xh_listb.o \ monolib_xh_listbk.o \ @@ -4518,6 +4552,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_dpycmn.o \ monolib_dseldlg.o \ monolib_effects.o \ + monolib_evtloopcmn.o \ monolib_fddlgcmn.o \ monolib_fldlgcmn.o \ monolib_fontcmn.o \ @@ -4667,6 +4702,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_dpycmn.o \ monolib_dseldlg.o \ monolib_effects.o \ + monolib_evtloopcmn.o \ monolib_fddlgcmn.o \ monolib_fldlgcmn.o \ monolib_fontcmn.o \ @@ -5130,6 +5166,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 = \ monolib_dirdlg.o \ monolib_display.o \ monolib_dnd.o \ + monolib_evtloop.o \ monolib_filedlg.o \ monolib_font.o \ monolib_fontdlg.o \ @@ -5258,7 +5295,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ monolib_bmpbuttn.o \ monolib_button.o \ monolib_checkbox.o \ - monolib_checklst.o \ monolib_choice.o \ monolib_colordlg.o \ monolib_combobox.o \ @@ -5298,6 +5334,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ monolib_textctrl.o \ monolib_tglbtn.o \ monolib_treectrl.o \ + monolib_checklst.o \ monolib_fdrepdlg.o \ monolib_fontdlg.o @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1) @@ -5334,6 +5371,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 = \ monolib_dcprint.o \ monolib_dcscreen.o \ monolib_dialog.o \ + monolib_display.o \ monolib_dnd.o \ monolib_evtloop.o \ monolib_filedlg.o \ @@ -5391,7 +5429,6 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 = \ monolib_bmpbuttn.o \ monolib_button.o \ monolib_checkbox.o \ - monolib_checklst.o \ monolib_choice.o \ monolib_colordlg.o \ monolib_combobox.o \ @@ -5434,6 +5471,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 = \ monolib_dirdlgg.o \ monolib_fdrepdlg.o \ monolib_fontdlgg.o \ + monolib_checklst.o \ monolib_choicece.o \ monolib_crt.o \ monolib_filedlgwce.o \ @@ -5688,6 +5726,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_1 = \ monolib_richtextbuffer.o \ monolib_richtextstyles.o \ monolib_richtextxml.o \ + monolib_richtexthtml.o \ $(__ADVANCED_PLATFORM_SRC_OBJECTS_0) \ $(__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1) @COND_WXUNIV_0@__ADVANCED_SRC_OBJECTS_1 = $(COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_1) @@ -5708,6 +5747,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_1 = \ monolib_richtextbuffer.o \ monolib_richtextstyles.o \ monolib_richtextxml.o \ + monolib_richtexthtml.o \ $(__ADVANCED_PLATFORM_SRC_OBJECTS_0) @COND_WXUNIV_1@__ADVANCED_SRC_OBJECTS_1 = $(COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_1) @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 \ @@ -6225,6 +6265,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_dpycmn.o \ coredll_dseldlg.o \ coredll_effects.o \ + coredll_evtloopcmn.o \ coredll_fddlgcmn.o \ coredll_fldlgcmn.o \ coredll_fontcmn.o \ @@ -6374,6 +6415,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_dpycmn.o \ coredll_dseldlg.o \ coredll_effects.o \ + coredll_evtloopcmn.o \ coredll_fddlgcmn.o \ coredll_fldlgcmn.o \ coredll_fontcmn.o \ @@ -6837,6 +6879,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 = \ coredll_dirdlg.o \ coredll_display.o \ coredll_dnd.o \ + coredll_evtloop.o \ coredll_filedlg.o \ coredll_font.o \ coredll_fontdlg.o \ @@ -6965,7 +7008,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ coredll_bmpbuttn.o \ coredll_button.o \ coredll_checkbox.o \ - coredll_checklst.o \ coredll_choice.o \ coredll_colordlg.o \ coredll_combobox.o \ @@ -7005,6 +7047,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ coredll_textctrl.o \ coredll_tglbtn.o \ coredll_treectrl.o \ + coredll_checklst.o \ coredll_fdrepdlg.o \ coredll_fontdlg.o @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2) @@ -7041,6 +7084,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2 = \ coredll_dcprint.o \ coredll_dcscreen.o \ coredll_dialog.o \ + coredll_display.o \ coredll_dnd.o \ coredll_evtloop.o \ coredll_filedlg.o \ @@ -7098,7 +7142,6 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 = \ coredll_bmpbuttn.o \ coredll_button.o \ coredll_checkbox.o \ - coredll_checklst.o \ coredll_choice.o \ coredll_colordlg.o \ coredll_combobox.o \ @@ -7141,6 +7184,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 = \ coredll_dirdlgg.o \ coredll_fdrepdlg.o \ coredll_fontdlgg.o \ + coredll_checklst.o \ coredll_choicece.o \ coredll_crt.o \ coredll_filedlgwce.o \ @@ -7422,6 +7466,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_dpycmn.o \ corelib_dseldlg.o \ corelib_effects.o \ + corelib_evtloopcmn.o \ corelib_fddlgcmn.o \ corelib_fldlgcmn.o \ corelib_fontcmn.o \ @@ -7571,6 +7616,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_dpycmn.o \ corelib_dseldlg.o \ corelib_effects.o \ + corelib_evtloopcmn.o \ corelib_fddlgcmn.o \ corelib_fldlgcmn.o \ corelib_fontcmn.o \ @@ -8034,6 +8080,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 = \ corelib_dirdlg.o \ corelib_display.o \ corelib_dnd.o \ + corelib_evtloop.o \ corelib_filedlg.o \ corelib_font.o \ corelib_fontdlg.o \ @@ -8162,7 +8209,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ corelib_bmpbuttn.o \ corelib_button.o \ corelib_checkbox.o \ - corelib_checklst.o \ corelib_choice.o \ corelib_colordlg.o \ corelib_combobox.o \ @@ -8202,6 +8248,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ corelib_textctrl.o \ corelib_tglbtn.o \ corelib_treectrl.o \ + corelib_checklst.o \ corelib_fdrepdlg.o \ corelib_fontdlg.o @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3) @@ -8238,6 +8285,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3 = \ corelib_dcprint.o \ corelib_dcscreen.o \ corelib_dialog.o \ + corelib_display.o \ corelib_dnd.o \ corelib_evtloop.o \ corelib_filedlg.o \ @@ -8295,7 +8343,6 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 = \ corelib_bmpbuttn.o \ corelib_button.o \ corelib_checkbox.o \ - corelib_checklst.o \ corelib_choice.o \ corelib_colordlg.o \ corelib_combobox.o \ @@ -8338,6 +8385,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 = \ corelib_dirdlgg.o \ corelib_fdrepdlg.o \ corelib_fontdlgg.o \ + corelib_checklst.o \ corelib_choicece.o \ corelib_crt.o \ corelib_filedlgwce.o \ @@ -8636,6 +8684,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_2 = \ advdll_richtextbuffer.o \ advdll_richtextstyles.o \ advdll_richtextxml.o \ + advdll_richtexthtml.o \ $(__ADVANCED_PLATFORM_SRC_OBJECTS_8) \ $(__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2) @COND_WXUNIV_0@__ADVANCED_SRC_OBJECTS_2 = $(COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_2) @@ -8656,6 +8705,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_2 = \ advdll_richtextbuffer.o \ advdll_richtextstyles.o \ advdll_richtextxml.o \ + advdll_richtexthtml.o \ $(__ADVANCED_PLATFORM_SRC_OBJECTS_8) @COND_WXUNIV_1@__ADVANCED_SRC_OBJECTS_2 = $(COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_2) @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 \ @@ -8689,6 +8739,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_3 = \ advlib_richtextbuffer.o \ advlib_richtextstyles.o \ advlib_richtextxml.o \ + advlib_richtexthtml.o \ $(__ADVANCED_PLATFORM_SRC_OBJECTS_9) \ $(__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3) @COND_WXUNIV_0@__ADVANCED_SRC_OBJECTS_3 = $(COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_3) @@ -8709,6 +8760,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 = \ advlib_richtextbuffer.o \ advlib_richtextstyles.o \ advlib_richtextxml.o \ + advlib_richtexthtml.o \ $(__ADVANCED_PLATFORM_SRC_OBJECTS_9) @COND_WXUNIV_1@__ADVANCED_SRC_OBJECTS_3 = $(COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3) @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 \ @@ -9189,6 +9241,7 @@ COND_WITH_PLUGIN_SDL_1___sound_sdl___depname = \ @COND_USE_XRC_1@__wxrc___depname = wxrc @COND_USE_XRC_1@__clean_wxrc___depname = clean-wxrc @COND_USE_XRC_1@__install_wxrc___depname = install-wxrc +@COND_TOOLKIT_MSW@RCDEFS_H = msw/rcdefs.h @COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).0.r @COND_TOOLKIT_COCOA@__cocoa_res_install___depname = cocoa-res-install @COND_SHARED_0@____SHARED = @@ -9355,6 +9408,8 @@ COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX) +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ +@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @@ -9395,7 +9450,12 @@ install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__in $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets (cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets) $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx - (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx) + for f in setup.h $(RCDEFS_H); do \ + if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \ + $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f`; \ + fi; \ + $(INSTALL_DATA) ./lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx//$$f $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f; \ + done $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR) for f in $(ALL_HEADERS); do \ if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \ @@ -9953,7 +10013,7 @@ locale_msw_install: done @COND_TOOLKIT_COCOA@lib/libwx_$(TOOLCHAIN_NAME).0.r: -@COND_TOOLKIT_COCOA@ $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).0.rsrc +@COND_TOOLKIT_COCOA@ $(REZ) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).0.rsrc @COND_TOOLKIT_COCOA@ $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc -useDF >lib/libwx_$(TOOLCHAIN_NAME).0.r @COND_TOOLKIT_COCOA@cocoa-res-install: $(__cocoa_res___depname) @@ -10372,7 +10432,7 @@ wxexpat_xmltok.o: $(srcdir)/src/expat/lib/xmltok.c $(CCC) -c -o $@ $(WXEXPAT_CFLAGS) $(srcdir)/src/expat/lib/xmltok.c monodll_version_rc.o: $(srcdir)/src/msw/version.rc $(MONODLL_ODEP) - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include monodll_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/appbase.cpp @@ -10833,9 +10893,15 @@ monodll_helpctrl.o: $(srcdir)/src/html/helpctrl.cpp $(MONODLL_ODEP) monodll_helpdata.o: $(srcdir)/src/html/helpdata.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/helpdata.cpp +monodll_helpdlg.o: $(srcdir)/src/html/helpdlg.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/helpdlg.cpp + monodll_helpfrm.o: $(srcdir)/src/html/helpfrm.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/helpfrm.cpp +monodll_helpwnd.o: $(srcdir)/src/html/helpwnd.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/helpwnd.cpp + monodll_htmlcell.o: $(srcdir)/src/html/htmlcell.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmlcell.cpp @@ -10950,6 +11016,9 @@ monodll_xh_gauge.o: $(srcdir)/src/xrc/xh_gauge.cpp $(MONODLL_ODEP) monodll_xh_gdctl.o: $(srcdir)/src/xrc/xh_gdctl.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_gdctl.cpp +monodll_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_grid.cpp + monodll_xh_html.o: $(srcdir)/src/xrc/xh_html.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_html.cpp @@ -11874,6 +11943,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/evtloop.cpp +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/mac/carbon/evtloop.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/evtloop.cpp + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/evtloop.mm @@ -12234,6 +12306,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_display.o: $(srcdir)/src/cocoa/display.mm $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/display.mm +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_display.o: $(srcdir)/src/os2/display.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/display.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@monodll_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp @@ -12675,8 +12750,8 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/msw/checklst.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/msw/checklst.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/msw/wince/checklst.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/checklst.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/mac/carbon/checklst.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/checklst.cpp @@ -13485,6 +13560,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_effects.o: $(srcdir)/src/common/effects.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/effects.cpp +@COND_USE_GUI_1@monodll_evtloopcmn.o: $(srcdir)/src/common/evtloopcmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/evtloopcmn.cpp + @COND_USE_GUI_1@monodll_fddlgcmn.o: $(srcdir)/src/common/fddlgcmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fddlgcmn.cpp @@ -13752,6 +13830,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp +@COND_USE_GUI_1@monodll_richtexthtml.o: $(srcdir)/src/richtext/richtexthtml.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtexthtml.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp @@ -14319,9 +14400,15 @@ monolib_helpctrl.o: $(srcdir)/src/html/helpctrl.cpp $(MONOLIB_ODEP) monolib_helpdata.o: $(srcdir)/src/html/helpdata.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/helpdata.cpp +monolib_helpdlg.o: $(srcdir)/src/html/helpdlg.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/helpdlg.cpp + monolib_helpfrm.o: $(srcdir)/src/html/helpfrm.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/helpfrm.cpp +monolib_helpwnd.o: $(srcdir)/src/html/helpwnd.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/helpwnd.cpp + monolib_htmlcell.o: $(srcdir)/src/html/htmlcell.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/htmlcell.cpp @@ -14436,6 +14523,9 @@ monolib_xh_gauge.o: $(srcdir)/src/xrc/xh_gauge.cpp $(MONOLIB_ODEP) monolib_xh_gdctl.o: $(srcdir)/src/xrc/xh_gdctl.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_gdctl.cpp +monolib_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_grid.cpp + monolib_xh_html.o: $(srcdir)/src/xrc/xh_html.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_html.cpp @@ -15360,6 +15450,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/evtloop.cpp +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/mac/carbon/evtloop.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/evtloop.cpp + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/evtloop.mm @@ -15720,6 +15813,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_display.o: $(srcdir)/src/cocoa/display.mm $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/display.mm +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_display.o: $(srcdir)/src/os2/display.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/display.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@monolib_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp @@ -16161,8 +16257,8 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/msw/checklst.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/msw/checklst.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/msw/wince/checklst.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/wince/checklst.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/mac/carbon/checklst.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/checklst.cpp @@ -16971,6 +17067,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_effects.o: $(srcdir)/src/common/effects.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/effects.cpp +@COND_USE_GUI_1@monolib_evtloopcmn.o: $(srcdir)/src/common/evtloopcmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/evtloopcmn.cpp + @COND_USE_GUI_1@monolib_fddlgcmn.o: $(srcdir)/src/common/fddlgcmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fddlgcmn.cpp @@ -17238,6 +17337,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp +@COND_USE_GUI_1@monolib_richtexthtml.o: $(srcdir)/src/richtext/richtexthtml.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtexthtml.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp @@ -17347,7 +17449,7 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp basedll_version_rc.o: $(srcdir)/src/msw/version.rc $(BASEDLL_ODEP) - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include basedll_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/appbase.cpp @@ -18454,7 +18556,7 @@ baselib_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASELIB_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp netdll_version_rc.o: $(srcdir)/src/msw/version.rc $(NETDLL_ODEP) - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include netdll_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(NETDLL_ODEP) $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp @@ -18559,7 +18661,7 @@ netlib_net.o: $(srcdir)/src/msw/wince/net.cpp $(NETLIB_ODEP) @COND_PLATFORM_MACOS_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/gsocket.cpp coredll_version_rc.o: $(srcdir)/src/msw/version.rc $(COREDLL_ODEP) - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/event.cpp @@ -19272,6 +19374,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/evtloop.cpp +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/mac/carbon/evtloop.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/evtloop.cpp + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/evtloop.mm @@ -19632,6 +19737,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_display.o: $(srcdir)/src/cocoa/display.mm $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/display.mm +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_display.o: $(srcdir)/src/os2/display.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/display.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@coredll_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp @@ -20073,8 +20181,8 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_checklst.o: $(srcdir)/src/msw/checklst.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_checklst.o: $(srcdir)/src/msw/checklst.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_checklst.o: $(srcdir)/src/msw/wince/checklst.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/checklst.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_checklst.o: $(srcdir)/src/mac/carbon/checklst.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/checklst.cpp @@ -20853,6 +20961,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_effects.o: $(srcdir)/src/common/effects.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/effects.cpp +@COND_USE_GUI_1@coredll_evtloopcmn.o: $(srcdir)/src/common/evtloopcmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/evtloopcmn.cpp + @COND_USE_GUI_1@coredll_fddlgcmn.o: $(srcdir)/src/common/fddlgcmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fddlgcmn.cpp @@ -21783,6 +21894,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/evtloop.cpp +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/mac/carbon/evtloop.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/evtloop.cpp + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/evtloop.mm @@ -22143,6 +22257,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_display.o: $(srcdir)/src/cocoa/display.mm $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/display.mm +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_display.o: $(srcdir)/src/os2/display.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/display.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@corelib_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp @@ -22584,8 +22701,8 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_checklst.o: $(srcdir)/src/msw/checklst.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_checklst.o: $(srcdir)/src/msw/checklst.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_checklst.o: $(srcdir)/src/msw/wince/checklst.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/checklst.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_checklst.o: $(srcdir)/src/mac/carbon/checklst.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/checklst.cpp @@ -23364,6 +23481,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_effects.o: $(srcdir)/src/common/effects.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/effects.cpp +@COND_USE_GUI_1@corelib_evtloopcmn.o: $(srcdir)/src/common/evtloopcmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/evtloopcmn.cpp + @COND_USE_GUI_1@corelib_fddlgcmn.o: $(srcdir)/src/common/fddlgcmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fddlgcmn.cpp @@ -23584,7 +23704,7 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/vscroll.cpp advdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ADVDLL_ODEP) - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include advdll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVDLL_ODEP) $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound_sdl.cpp @@ -23637,6 +23757,9 @@ advdll_richtextstyles.o: $(srcdir)/src/richtext/richtextstyles.cpp $(ADVDLL_ODEP advdll_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(ADVDLL_ODEP) $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp +advdll_richtexthtml.o: $(srcdir)/src/richtext/richtexthtml.cpp $(ADVDLL_ODEP) + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/richtext/richtexthtml.cpp + @COND_TOOLKIT_MSW@advdll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp @@ -23787,6 +23910,9 @@ advlib_richtextstyles.o: $(srcdir)/src/richtext/richtextstyles.cpp $(ADVLIB_ODEP advlib_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(ADVLIB_ODEP) $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp +advlib_richtexthtml.o: $(srcdir)/src/richtext/richtexthtml.cpp $(ADVLIB_ODEP) + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/richtext/richtexthtml.cpp + @COND_TOOLKIT_MSW@advlib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp @@ -23887,7 +24013,7 @@ advlib_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_WINCE_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp mediadll_version_rc.o: $(srcdir)/src/msw/version.rc $(MEDIADLL_ODEP) - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include mediadll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIADLL_ODEP) $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp @@ -23950,7 +24076,7 @@ medialib_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIALIB_ODEP) @COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp odbcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ODBCDLL_ODEP) - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include odbcdll_db.o: $(srcdir)/src/common/db.cpp $(ODBCDLL_ODEP) $(CXXC) -c -o $@ $(ODBCDLL_CXXFLAGS) $(srcdir)/src/common/db.cpp @@ -23965,7 +24091,7 @@ odbclib_dbtable.o: $(srcdir)/src/common/dbtable.cpp $(ODBCLIB_ODEP) $(CXXC) -c -o $@ $(ODBCLIB_CXXFLAGS) $(srcdir)/src/common/dbtable.cpp dbgriddll_version_rc.o: $(srcdir)/src/msw/version.rc $(DBGRIDDLL_ODEP) - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include dbgriddll_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp $(DBGRIDDLL_ODEP) $(CXXC) -c -o $@ $(DBGRIDDLL_CXXFLAGS) $(srcdir)/src/common/dbgrid.cpp @@ -23974,7 +24100,7 @@ dbgridlib_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp $(DBGRIDLIB_ODEP) $(CXXC) -c -o $@ $(DBGRIDLIB_CXXFLAGS) $(srcdir)/src/common/dbgrid.cpp htmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(HTMLDLL_ODEP) - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include htmldll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(HTMLDLL_ODEP) $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/msw/helpbest.cpp @@ -23985,9 +24111,15 @@ htmldll_helpctrl.o: $(srcdir)/src/html/helpctrl.cpp $(HTMLDLL_ODEP) htmldll_helpdata.o: $(srcdir)/src/html/helpdata.cpp $(HTMLDLL_ODEP) $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/html/helpdata.cpp +htmldll_helpdlg.o: $(srcdir)/src/html/helpdlg.cpp $(HTMLDLL_ODEP) + $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/html/helpdlg.cpp + htmldll_helpfrm.o: $(srcdir)/src/html/helpfrm.cpp $(HTMLDLL_ODEP) $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/html/helpfrm.cpp +htmldll_helpwnd.o: $(srcdir)/src/html/helpwnd.cpp $(HTMLDLL_ODEP) + $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/html/helpwnd.cpp + htmldll_htmlcell.o: $(srcdir)/src/html/htmlcell.cpp $(HTMLDLL_ODEP) $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/html/htmlcell.cpp @@ -24057,9 +24189,15 @@ htmllib_helpctrl.o: $(srcdir)/src/html/helpctrl.cpp $(HTMLLIB_ODEP) htmllib_helpdata.o: $(srcdir)/src/html/helpdata.cpp $(HTMLLIB_ODEP) $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/helpdata.cpp +htmllib_helpdlg.o: $(srcdir)/src/html/helpdlg.cpp $(HTMLLIB_ODEP) + $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/helpdlg.cpp + htmllib_helpfrm.o: $(srcdir)/src/html/helpfrm.cpp $(HTMLLIB_ODEP) $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/helpfrm.cpp +htmllib_helpwnd.o: $(srcdir)/src/html/helpwnd.cpp $(HTMLLIB_ODEP) + $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/helpwnd.cpp + htmllib_htmlcell.o: $(srcdir)/src/html/htmlcell.cpp $(HTMLLIB_ODEP) $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/htmlcell.cpp @@ -24121,7 +24259,7 @@ htmllib_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(HTMLLIB_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp qadll_version_rc.o: $(srcdir)/src/msw/version.rc $(QADLL_ODEP) - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include qadll_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(QADLL_ODEP) $(CXXC) -c -o $@ $(QADLL_CXXFLAGS) $(srcdir)/src/common/debugrpt.cpp @@ -24136,7 +24274,7 @@ qalib_dbgrptg.o: $(srcdir)/src/generic/dbgrptg.cpp $(QALIB_ODEP) $(CXXC) -c -o $@ $(QALIB_CXXFLAGS) $(srcdir)/src/generic/dbgrptg.cpp xmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(XMLDLL_ODEP) - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include xmldll_xml.o: $(srcdir)/src/xml/xml.cpp $(XMLDLL_ODEP) $(CXXC) -c -o $@ $(XMLDLL_CXXFLAGS) $(srcdir)/src/xml/xml.cpp @@ -24151,7 +24289,7 @@ xmllib_xtixml.o: $(srcdir)/src/common/xtixml.cpp $(XMLLIB_ODEP) $(CXXC) -c -o $@ $(XMLLIB_CXXFLAGS) $(srcdir)/src/common/xtixml.cpp xrcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(XRCDLL_ODEP) - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include xrcdll_xh_bmpbt.o: $(srcdir)/src/xrc/xh_bmpbt.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_bmpbt.cpp @@ -24198,6 +24336,9 @@ xrcdll_xh_gauge.o: $(srcdir)/src/xrc/xh_gauge.cpp $(XRCDLL_ODEP) xrcdll_xh_gdctl.o: $(srcdir)/src/xrc/xh_gdctl.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_gdctl.cpp +xrcdll_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(XRCDLL_ODEP) + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_grid.cpp + xrcdll_xh_html.o: $(srcdir)/src/xrc/xh_html.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_html.cpp @@ -24330,6 +24471,9 @@ xrclib_xh_gauge.o: $(srcdir)/src/xrc/xh_gauge.cpp $(XRCLIB_ODEP) xrclib_xh_gdctl.o: $(srcdir)/src/xrc/xh_gdctl.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_gdctl.cpp +xrclib_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(XRCLIB_ODEP) + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_grid.cpp + xrclib_xh_html.o: $(srcdir)/src/xrc/xh_html.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_html.cpp @@ -24418,7 +24562,7 @@ xrclib_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp gldll_version_rc.o: $(srcdir)/src/msw/version.rc $(GLDLL_ODEP) - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include @COND_TOOLKIT_MAC@gldll_glcanvas.o: $(srcdir)/src/mac/carbon/glcanvas.cpp $(GLDLL_ODEP) @COND_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/glcanvas.cpp @@ -24727,7 +24871,7 @@ BASE_DIST: ALL_DIST $(CP_P) $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console $(CP_P) $(SAMPDIR)/console/console.cpp $(DISTDIR)/samples/console $(CP_P) $(SAMPDIR)/console/console.dsp $(DISTDIR)/samples/console - cp -pf $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console + $(CP_P) $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console mkdir $(DISTDIR)/utils mkdir $(DISTDIR)/utils/HelpGen @@ -24743,12 +24887,12 @@ BASE_DIST: ALL_DIST $(CP_P) $(UTILSDIR)/tex2rtf/src/*.h $(DISTDIR)/utils/tex2rtf/src $(CP_P) $(UTILSDIR)/tex2rtf/src/*.in $(DISTDIR)/utils/tex2rtf/src $(CP_P) $(UTILSDIR)/tex2rtf/src/*.cpp $(DISTDIR)/utils/tex2rtf/src - cp -pf $(UTILSDIR)/tex2rtf/src/tex2rtf.ico $(DISTDIR)/utils/tex2rtf/src - cp -pf $(UTILSDIR)/tex2rtf/src/tex2rtf.ini $(DISTDIR)/utils/tex2rtf/src + $(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.ico $(DISTDIR)/utils/tex2rtf/src + $(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.ini $(DISTDIR)/utils/tex2rtf/src $(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.rc $(DISTDIR)/utils/tex2rtf/src $(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.xpm $(DISTDIR)/utils/tex2rtf/src -GTK_DIST: ALL_GUI_DIST +GTK_DIST: UNIV_DIST $(CP_P) $(WXDIR)/wxGTK.spec $(DISTDIR) $(CP_P) $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk $(CP_P) $(GTKDIR)/*.h $(DISTDIR)/src/gtk @@ -24771,14 +24915,8 @@ GTK_DIST: ALL_GUI_DIST case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib - rm -f $(DISTDIR)/contrib/samples/animate/mondrian.ico - cp -pf $(WXDIR)/contrib/samples/animate/mondrian.ico $(DISTDIR)/contrib/samples/animate - rm -f $(DISTDIR)/contrib/samples/fl/bitmaps/*.bmp - cp -pf $(WXDIR)/contrib/samples/fl/bitmaps/*.bmp $(DISTDIR)/contrib/samples/fl/bitmaps - rm -f $(DISTDIR)/contrib/samples/ogl/studio/*.wxr - cp -pf $(WXDIR)/contrib/samples/ogl/studio/*.wxr $(DISTDIR)/contrib/samples/ogl/studio - -X11_DIST: ALL_GUI_DIST UNIV_DIST + +X11_DIST: UNIV_DIST $(CP_P) $(WXDIR)/wxX11.spec $(DISTDIR) $(CP_P) $(INCDIR)/wx/x11/*.h $(DISTDIR)/include/wx/x11 $(CP_P) $(X11DIR)/*.cpp $(DISTDIR)/src/x11 @@ -24846,11 +24984,22 @@ MACX_DIST: ALL_GUI_DIST case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib -# TODO: Distribute some files COCOA_DIST: ALL_GUI_DIST + $(CP_P) $(INCDIR)/wx/cocoa/*.h $(DISTDIR)/include/wx/cocoa $(CP_P) $(COCOADIR)/*.mm $(DISTDIR)/src/cocoa + $(CP_P) $(COCOADIR)/*.cpp $(DISTDIR)/src/cocoa + $(CP_P) $(COCOADIR)/*.r $(DISTDIR)/src/cocoa + mkdir $(DISTDIR)/include/wx/mac/corefoundation + $(CP_P) $(INCDIR)/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation + mkdir $(DISTDIR)/src/mac/corefoundation + $(CP_P) $(MACDIR)/corefoundation/*.cpp $(DISTDIR)/src/mac/corefoundation + mkdir $(DISTDIR)/src/mac/carbon + $(CP_P) $(MACDIR)/carbon/Info.plist.in $(DISTDIR)/src/mac/carbon + $(CP_P) $(MACDIR)/carbon/wxmac.icns $(DISTDIR)/src/mac/carbon + case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac + $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib -MSW_DIST: ALL_GUI_DIST +MSW_DIST: UNIV_DIST $(CP_P) $(WXDIR)/wxWINE.spec $(DISTDIR) mkdir $(DISTDIR)/include/wx/msw/ole mkdir $(DISTDIR)/include/wx/msw/wince @@ -24859,7 +25008,7 @@ MSW_DIST: ALL_GUI_DIST $(CP_P) $(INCDIR)/wx/msw/*.ico $(DISTDIR)/include/wx/msw $(CP_P) $(INCDIR)/wx/msw/*.bmp $(DISTDIR)/include/wx/msw $(CP_P) $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw - $(CP_P) $(INCDIR)/wx/msw/wx.manifest $(DISTDIR)/include/wx/msw + $(CP_P) $(INCDIR)/wx/msw/*.manifest $(DISTDIR)/include/wx/msw $(CP_P) $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole $(CP_P) $(INCDIR)/wx/msw/wince/*.h $(DISTDIR)/include/wx/msw/wince mkdir $(DISTDIR)/src/msw/ole @@ -24868,6 +25017,8 @@ MSW_DIST: ALL_GUI_DIST $(CP_P) $(MSWDIR)/*.c $(DISTDIR)/src/msw $(CP_P) $(MSWDIR)/*.rc $(DISTDIR)/src/msw $(CP_P) $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole + case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac + $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib MSW_ZIP_TEXT_DIST: ALL_GUI_DIST $(CP_P) $(WXDIR)/wxWINE.spec $(DISTDIR) @@ -24876,7 +25027,7 @@ MSW_ZIP_TEXT_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/include/wx/msw/wince $(CP_P) $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw $(CP_P) $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw - $(CP_P) $(INCDIR)/wx/msw/wx.manifest $(DISTDIR)/include/wx/msw + $(CP_P) $(INCDIR)/wx/msw/*.manifest $(DISTDIR)/include/wx/msw $(CP_P) $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole $(CP_P) $(INCDIR)/wx/msw/wince/*.h $(DISTDIR)/include/wx/msw/wince mkdir $(DISTDIR)/src/msw @@ -24922,6 +25073,8 @@ DEMOS_DIST: ALL_GUI_DIST $(CP_P) $(DEMODIR)/bombs/*.cpp $(DISTDIR)/demos/bombs $(CP_P) $(DEMODIR)/bombs/*.h $(DISTDIR)/demos/bombs $(CP_P) $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs + $(CP_P) $(DEMODIR)/bombs/*.ico $(DISTDIR)/demos/bombs + $(CP_P) $(DEMODIR)/bombs/*.rc $(DISTDIR)/demos/bombs $(CP_P) $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/demos/dbbrowse; esac @@ -24934,7 +25087,11 @@ DEMOS_DIST: ALL_GUI_DIST $(CP_P) $(DEMODIR)/forty/*.cpp $(DISTDIR)/demos/forty $(CP_P) $(DEMODIR)/forty/*.xpm $(DISTDIR)/demos/forty $(CP_P) $(DEMODIR)/forty/*.xbm $(DISTDIR)/demos/forty - cp -pf $(DEMODIR)/forty/*.htm $(DISTDIR)/demos/forty + $(CP_P) $(DEMODIR)/forty/*.htm $(DISTDIR)/demos/forty + $(CP_P) $(DEMODIR)/forty/*.bmp $(DISTDIR)/demos/forty + $(CP_P) $(DEMODIR)/forty/*.ico $(DISTDIR)/demos/forty + $(CP_P) $(DEMODIR)/forty/*.rc $(DISTDIR)/demos/forty + $(CP_P) $(DEMODIR)/forty/readme.txt $(DISTDIR)/demos/forty mkdir $(DISTDIR)/demos/life mkdir $(DISTDIR)/demos/life/bitmaps @@ -24944,8 +25101,11 @@ DEMOS_DIST: ALL_GUI_DIST $(CP_P) $(DEMODIR)/life/*.h $(DISTDIR)/demos/life $(CP_P) $(DEMODIR)/life/*.xpm $(DISTDIR)/demos/life $(CP_P) $(DEMODIR)/life/*.inc $(DISTDIR)/demos/life - cp -pf $(DEMODIR)/life/*.lif $(DISTDIR)/demos/life + $(CP_P) $(DEMODIR)/life/*.lif $(DISTDIR)/demos/life + $(CP_P) $(DEMODIR)/life/*.rc $(DISTDIR)/demos/life + $(CP_P) $(DEMODIR)/life/*.ico $(DISTDIR)/demos/life $(CP_P) $(DEMODIR)/life/bitmaps/*.xpm $(DISTDIR)/demos/life/bitmaps + $(CP_P) $(DEMODIR)/life/bitmaps/*.bmp $(DISTDIR)/demos/life/bitmaps mkdir $(DISTDIR)/demos/poem $(CP_P) $(DEMODIR)/poem/Makefile.in $(DISTDIR)/demos/poem @@ -24953,13 +25113,17 @@ DEMOS_DIST: ALL_GUI_DIST $(CP_P) $(DEMODIR)/poem/*.h $(DISTDIR)/demos/poem $(CP_P) $(DEMODIR)/poem/*.cpp $(DISTDIR)/demos/poem $(CP_P) $(DEMODIR)/poem/*.xpm $(DISTDIR)/demos/poem - cp -pf $(DEMODIR)/poem/*.dat $(DISTDIR)/demos/poem - cp -pf $(DEMODIR)/poem/*.txt $(DISTDIR)/demos/poem + $(CP_P) $(DEMODIR)/poem/*.dat $(DISTDIR)/demos/poem + $(CP_P) $(DEMODIR)/poem/*.txt $(DISTDIR)/demos/poem + $(CP_P) $(DEMODIR)/poem/*.rc $(DISTDIR)/demos/poem + $(CP_P) $(DEMODIR)/poem/*.ico $(DISTDIR)/demos/poem mkdir $(DISTDIR)/demos/fractal $(CP_P) $(DEMODIR)/fractal/Makefile.in $(DISTDIR)/demos/fractal $(CP_P) $(DEMODIR)/fractal/makefile.unx $(DISTDIR)/demos/fractal $(CP_P) $(DEMODIR)/fractal/*.cpp $(DISTDIR)/demos/fractal + $(CP_P) $(DEMODIR)/fractal/*.rc $(DISTDIR)/demos/fractal + $(CP_P) $(DEMODIR)/fractal/*.ico $(DISTDIR)/demos/fractal SAMPLES_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/samples @@ -25000,7 +25164,7 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/console/Makefile.in $(DISTDIR)/samples/console $(CP_P) $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console $(CP_P) $(SAMPDIR)/console/*.cpp $(DISTDIR)/samples/console - cp -pf $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console + $(CP_P) $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console mkdir $(DISTDIR)/samples/controls mkdir $(DISTDIR)/samples/controls/icons @@ -25008,7 +25172,7 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/controls/makefile.unx $(DISTDIR)/samples/controls $(CP_P) $(SAMPDIR)/controls/*.cpp $(DISTDIR)/samples/controls $(CP_P) $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls - cp -pf $(SAMPDIR)/controls/*.bmp $(DISTDIR)/samples/controls + $(CP_P) $(SAMPDIR)/controls/*.bmp $(DISTDIR)/samples/controls $(CP_P) $(SAMPDIR)/controls/*.ico $(DISTDIR)/samples/controls $(CP_P) $(SAMPDIR)/controls/*.rc $(DISTDIR)/samples/controls $(CP_P) $(SAMPDIR)/controls/*.mms $(DISTDIR)/samples/controls @@ -25021,12 +25185,16 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/db/*.h $(DISTDIR)/samples/db $(CP_P) $(SAMPDIR)/db/*.xpm $(DISTDIR)/samples/db + mkdir $(DISTDIR)/samples/debugrpt + $(CP_P) $(SAMPDIR)/debugrpt/Makefile.in $(DISTDIR)/samples/debugrpt + $(CP_P) $(SAMPDIR)/debugrpt/*.cpp $(DISTDIR)/samples/debugrpt + mkdir $(DISTDIR)/samples/dialogs $(CP_P) $(SAMPDIR)/dialogs/Makefile.in $(DISTDIR)/samples/dialogs $(CP_P) $(SAMPDIR)/dialogs/makefile.unx $(DISTDIR)/samples/dialogs $(CP_P) $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs $(CP_P) $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs - cp -pf $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs + $(CP_P) $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs $(CP_P) $(SAMPDIR)/dialogs/*.mms $(DISTDIR)/samples/dialogs mkdir $(DISTDIR)/samples/dialup @@ -25034,13 +25202,17 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup $(CP_P) $(SAMPDIR)/dialup/*.cpp $(DISTDIR)/samples/dialup + mkdir $(DISTDIR)/samples/display + $(CP_P) $(SAMPDIR)/display/Makefile.in $(DISTDIR)/samples/display + $(CP_P) $(SAMPDIR)/display/*.cpp $(DISTDIR)/samples/display + mkdir $(DISTDIR)/samples/dnd $(CP_P) $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd $(CP_P) $(SAMPDIR)/dnd/makefile.unx $(DISTDIR)/samples/dnd $(CP_P) $(SAMPDIR)/dnd/*.cpp $(DISTDIR)/samples/dnd $(CP_P) $(SAMPDIR)/dnd/*.xpm $(DISTDIR)/samples/dnd $(CP_P) $(SAMPDIR)/dnd/*.txt $(DISTDIR)/samples/dnd - cp -pf $(SAMPDIR)/dnd/*.png $(DISTDIR)/samples/dnd + $(CP_P) $(SAMPDIR)/dnd/*.png $(DISTDIR)/samples/dnd mkdir $(DISTDIR)/samples/docview $(CP_P) $(SAMPDIR)/docview/Makefile.in $(DISTDIR)/samples/docview @@ -25061,14 +25233,14 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/dragimag/*.cpp $(DISTDIR)/samples/dragimag $(CP_P) $(SAMPDIR)/dragimag/*.h $(DISTDIR)/samples/dragimag $(CP_P) $(SAMPDIR)/dragimag/*.xpm $(DISTDIR)/samples/dragimag - cp -pf $(SAMPDIR)/dragimag/*.png $(DISTDIR)/samples/dragimag + $(CP_P) $(SAMPDIR)/dragimag/*.png $(DISTDIR)/samples/dragimag mkdir $(DISTDIR)/samples/drawing $(CP_P) $(SAMPDIR)/drawing/Makefile.in $(DISTDIR)/samples/drawing $(CP_P) $(SAMPDIR)/drawing/makefile.unx $(DISTDIR)/samples/drawing $(CP_P) $(SAMPDIR)/drawing/*.cpp $(DISTDIR)/samples/drawing $(CP_P) $(SAMPDIR)/drawing/*.xpm $(DISTDIR)/samples/drawing - cp -pf $(SAMPDIR)/drawing/*.bmp $(DISTDIR)/samples/drawing + $(CP_P) $(SAMPDIR)/drawing/*.bmp $(DISTDIR)/samples/drawing mkdir $(DISTDIR)/samples/dynamic $(CP_P) $(SAMPDIR)/dynamic/Makefile.in $(DISTDIR)/samples/dynamic @@ -25081,6 +25253,7 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/erase/makefile.unx $(DISTDIR)/samples/erase $(CP_P) $(SAMPDIR)/erase/*.cpp $(DISTDIR)/samples/erase $(CP_P) $(SAMPDIR)/erase/*.xml $(DISTDIR)/samples/erase + $(CP_P) $(SAMPDIR)/erase/*.xpm $(DISTDIR)/samples/erase mkdir $(DISTDIR)/samples/event $(CP_P) $(SAMPDIR)/event/Makefile.in $(DISTDIR)/samples/event @@ -25111,7 +25284,14 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/help/Makefile.in $(DISTDIR)/samples/help $(CP_P) $(SAMPDIR)/help/makefile.unx $(DISTDIR)/samples/help $(CP_P) $(SAMPDIR)/help/*.cpp $(DISTDIR)/samples/help + $(CP_P) $(SAMPDIR)/help/*.h* $(DISTDIR)/samples/help $(CP_P) $(SAMPDIR)/help/*.xpm $(DISTDIR)/samples/help + $(CP_P) $(SAMPDIR)/help/*.bmp $(DISTDIR)/samples/help + $(CP_P) $(SAMPDIR)/help/*.gif $(DISTDIR)/samples/help + $(CP_P) $(SAMPDIR)/help/cshelp.txt $(DISTDIR)/samples/help + $(CP_P) $(SAMPDIR)/help/*.chm $(DISTDIR)/samples/help + $(CP_P) $(SAMPDIR)/help/*.cnt $(DISTDIR)/samples/help + $(CP_P) $(SAMPDIR)/help/doc.zip $(DISTDIR)/samples/help $(CP_P) $(SAMPDIR)/help/doc/*.* $(DISTDIR)/samples/help/doc mkdir $(DISTDIR)/samples/htlbox @@ -25126,8 +25306,8 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/html/about/Makefile.in $(DISTDIR)/samples/html/about $(CP_P) $(SAMPDIR)/html/about/*.cpp $(DISTDIR)/samples/html/about mkdir $(DISTDIR)/samples/html/about/data - cp -pf $(SAMPDIR)/html/about/data/*.htm $(DISTDIR)/samples/html/about/data - cp -pf $(SAMPDIR)/html/about/data/*.png $(DISTDIR)/samples/html/about/data + $(CP_P) $(SAMPDIR)/html/about/data/*.htm $(DISTDIR)/samples/html/about/data + $(CP_P) $(SAMPDIR)/html/about/data/*.png $(DISTDIR)/samples/html/about/data mkdir $(DISTDIR)/samples/html/help $(CP_P) $(SAMPDIR)/html/help/Makefile.in $(DISTDIR)/samples/html/help $(CP_P) $(SAMPDIR)/html/help/*.cpp $(DISTDIR)/samples/html/help @@ -25136,75 +25316,54 @@ SAMPLES_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/samples/html/helpview $(CP_P) $(SAMPDIR)/html/helpview/Makefile.in $(DISTDIR)/samples/html/helpview $(CP_P) $(SAMPDIR)/html/helpview/*.cpp $(DISTDIR)/samples/html/helpview - cp -pf $(SAMPDIR)/html/helpview/*.zip $(DISTDIR)/samples/html/helpview + $(CP_P) $(SAMPDIR)/html/helpview/*.zip $(DISTDIR)/samples/html/helpview mkdir $(DISTDIR)/samples/html/printing $(CP_P) $(SAMPDIR)/html/printing/Makefile.in $(DISTDIR)/samples/html/printing $(CP_P) $(SAMPDIR)/html/printing/*.cpp $(DISTDIR)/samples/html/printing - cp -pf $(SAMPDIR)/html/printing/*.htm $(DISTDIR)/samples/html/printing + $(CP_P) $(SAMPDIR)/html/printing/*.htm $(DISTDIR)/samples/html/printing + $(CP_P) $(SAMPDIR)/html/printing/*.gif $(DISTDIR)/samples/html/printing + $(CP_P) $(SAMPDIR)/html/printing/*.ico $(DISTDIR)/samples/html/printing mkdir $(DISTDIR)/samples/html/test $(CP_P) $(SAMPDIR)/html/test/Makefile.in $(DISTDIR)/samples/html/test $(CP_P) $(SAMPDIR)/html/test/*.cpp $(DISTDIR)/samples/html/test - cp -pf $(SAMPDIR)/html/test/*.bmp $(DISTDIR)/samples/html/test - cp -pf $(SAMPDIR)/html/test/*.png $(DISTDIR)/samples/html/test - cp -pf $(SAMPDIR)/html/test/*.gif $(DISTDIR)/samples/html/test - cp -pf $(SAMPDIR)/html/test/*.htm $(DISTDIR)/samples/html/test - cp -pf $(SAMPDIR)/html/test/*.html $(DISTDIR)/samples/html/test + $(CP_P) $(SAMPDIR)/html/test/*.bmp $(DISTDIR)/samples/html/test + $(CP_P) $(SAMPDIR)/html/test/*.png $(DISTDIR)/samples/html/test + $(CP_P) $(SAMPDIR)/html/test/*.gif $(DISTDIR)/samples/html/test + $(CP_P) $(SAMPDIR)/html/test/*.htm $(DISTDIR)/samples/html/test + $(CP_P) $(SAMPDIR)/html/test/*.html $(DISTDIR)/samples/html/test mkdir $(DISTDIR)/samples/html/virtual $(CP_P) $(SAMPDIR)/html/virtual/Makefile.in $(DISTDIR)/samples/html/virtual $(CP_P) $(SAMPDIR)/html/virtual/*.cpp $(DISTDIR)/samples/html/virtual - cp -pf $(SAMPDIR)/html/virtual/*.htm $(DISTDIR)/samples/html/virtual + $(CP_P) $(SAMPDIR)/html/virtual/*.htm $(DISTDIR)/samples/html/virtual mkdir $(DISTDIR)/samples/html/widget $(CP_P) $(SAMPDIR)/html/widget/Makefile.in $(DISTDIR)/samples/html/widget $(CP_P) $(SAMPDIR)/html/widget/*.cpp $(DISTDIR)/samples/html/widget - cp -pf $(SAMPDIR)/html/widget/*.htm $(DISTDIR)/samples/html/widget + $(CP_P) $(SAMPDIR)/html/widget/*.htm $(DISTDIR)/samples/html/widget mkdir $(DISTDIR)/samples/html/zip $(CP_P) $(SAMPDIR)/html/zip/Makefile.in $(DISTDIR)/samples/html/zip $(CP_P) $(SAMPDIR)/html/zip/*.cpp $(DISTDIR)/samples/html/zip - cp -pf $(SAMPDIR)/html/zip/*.htm $(DISTDIR)/samples/html/zip - cp -pf $(SAMPDIR)/html/zip/*.zip $(DISTDIR)/samples/html/zip + $(CP_P) $(SAMPDIR)/html/zip/*.htm $(DISTDIR)/samples/html/zip + $(CP_P) $(SAMPDIR)/html/zip/*.zip $(DISTDIR)/samples/html/zip mkdir $(DISTDIR)/samples/image $(CP_P) $(SAMPDIR)/image/Makefile.in $(DISTDIR)/samples/image $(CP_P) $(SAMPDIR)/image/makefile.unx $(DISTDIR)/samples/image $(CP_P) $(SAMPDIR)/image/*.cpp $(DISTDIR)/samples/image $(CP_P) $(SAMPDIR)/image/*.mms $(DISTDIR)/samples/image - cp -pf $(SAMPDIR)/image/horse*.* $(DISTDIR)/samples/image - cp -pf $(SAMPDIR)/image/smile.xbm $(DISTDIR)/samples/image - cp -pf $(SAMPDIR)/image/smile.xpm $(DISTDIR)/samples/image + $(CP_P) $(SAMPDIR)/image/horse*.* $(DISTDIR)/samples/image + $(CP_P) $(SAMPDIR)/image/smile.xbm $(DISTDIR)/samples/image + $(CP_P) $(SAMPDIR)/image/smile.xpm $(DISTDIR)/samples/image mkdir $(DISTDIR)/samples/internat - mkdir $(DISTDIR)/samples/internat/bg - mkdir $(DISTDIR)/samples/internat/cs - mkdir $(DISTDIR)/samples/internat/de - mkdir $(DISTDIR)/samples/internat/fr - mkdir $(DISTDIR)/samples/internat/ja - mkdir $(DISTDIR)/samples/internat/ka - mkdir $(DISTDIR)/samples/internat/pl - mkdir $(DISTDIR)/samples/internat/ru - mkdir $(DISTDIR)/samples/internat/sv $(CP_P) $(SAMPDIR)/internat/Makefile.in $(DISTDIR)/samples/internat $(CP_P) $(SAMPDIR)/internat/makefile.unx $(DISTDIR)/samples/internat $(CP_P) $(SAMPDIR)/internat/*.cpp $(DISTDIR)/samples/internat $(CP_P) $(SAMPDIR)/internat/*.xpm $(DISTDIR)/samples/internat $(CP_P) $(SAMPDIR)/internat/*.txt $(DISTDIR)/samples/internat - cp -pf $(SAMPDIR)/internat/bg/*.mo $(DISTDIR)/samples/internat/bg - cp -pf $(SAMPDIR)/internat/cs/*.mo $(DISTDIR)/samples/internat/cs - cp -pf $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de - cp -pf $(SAMPDIR)/internat/fr/*.mo $(DISTDIR)/samples/internat/fr - cp -pf $(SAMPDIR)/internat/ja/*.mo $(DISTDIR)/samples/internat/ja - cp -pf $(SAMPDIR)/internat/ka/*.mo $(DISTDIR)/samples/internat/ka - cp -pf $(SAMPDIR)/internat/pl/*.mo $(DISTDIR)/samples/internat/pl - cp -pf $(SAMPDIR)/internat/ru/*.mo $(DISTDIR)/samples/internat/ru - cp -pf $(SAMPDIR)/internat/sv/*.mo $(DISTDIR)/samples/internat/sv - cp -pf $(SAMPDIR)/internat/bg/*.po $(DISTDIR)/samples/internat/bg - cp -pf $(SAMPDIR)/internat/cs/*.po $(DISTDIR)/samples/internat/cs - cp -pf $(SAMPDIR)/internat/de/*.po $(DISTDIR)/samples/internat/de - cp -pf $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr - cp -pf $(SAMPDIR)/internat/ja/*.po $(DISTDIR)/samples/internat/ja - cp -pf $(SAMPDIR)/internat/ka/*.po $(DISTDIR)/samples/internat/ka - cp -pf $(SAMPDIR)/internat/pl/*.po $(DISTDIR)/samples/internat/pl - cp -pf $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/ru - cp -pf $(SAMPDIR)/internat/sv/*.po $(DISTDIR)/samples/internat/sv + for f in `(cd $(SAMPDIR); find internat -name '*.[mp]o' -print)`; do \ + mkdir -p $(DISTDIR)/samples/`dirname $$f`; \ + $(CP_P) $(SAMPDIR)/$$f $(DISTDIR)/samples/$$f; \ + done mkdir $(DISTDIR)/samples/ipc $(CP_P) $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc @@ -25218,7 +25377,7 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/joytest/makefile.unx $(DISTDIR)/samples/joytest $(CP_P) $(SAMPDIR)/joytest/*.cpp $(DISTDIR)/samples/joytest $(CP_P) $(SAMPDIR)/joytest/*.h $(DISTDIR)/samples/joytest - cp -pf $(SAMPDIR)/joytest/*.wav $(DISTDIR)/samples/joytest + $(CP_P) $(SAMPDIR)/joytest/*.wav $(DISTDIR)/samples/joytest mkdir $(DISTDIR)/samples/keyboard $(CP_P) $(SAMPDIR)/keyboard/Makefile.in $(DISTDIR)/samples/keyboard @@ -25230,6 +25389,10 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/layout/*.cpp $(DISTDIR)/samples/layout $(CP_P) $(SAMPDIR)/layout/*.h $(DISTDIR)/samples/layout + mkdir $(DISTDIR)/samples/listbox + $(CP_P) $(SAMPDIR)/listbox/Makefile.in $(DISTDIR)/samples/listbox + $(CP_P) $(SAMPDIR)/listbox/*.cpp $(DISTDIR)/samples/listbox + mkdir $(DISTDIR)/samples/listctrl mkdir $(DISTDIR)/samples/listctrl/bitmaps $(CP_P) $(SAMPDIR)/listctrl/Makefile.in $(DISTDIR)/samples/listctrl @@ -25289,7 +25452,7 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/mobile/styles/Makefile.in $(DISTDIR)/samples/mobile/styles $(CP_P) $(SAMPDIR)/mobile/styles/*.cpp $(DISTDIR)/samples/mobile/styles $(CP_P) $(SAMPDIR)/mobile/styles/*.h $(DISTDIR)/samples/mobile/styles - cp -pf $(SAMPDIR)/mobile/styles/*.jpg $(DISTDIR)/samples/mobile/styles + $(CP_P) $(SAMPDIR)/mobile/styles/*.jpg $(DISTDIR)/samples/mobile/styles mkdir $(DISTDIR)/samples/multimon $(CP_P) $(SAMPDIR)/multimon/Makefile.in $(DISTDIR)/samples/multimon @@ -25310,7 +25473,7 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/opengl/penguin/*.cpp $(DISTDIR)/samples/opengl/penguin $(CP_P) $(SAMPDIR)/opengl/penguin/*.c $(DISTDIR)/samples/opengl/penguin $(CP_P) $(SAMPDIR)/opengl/penguin/*.h $(DISTDIR)/samples/opengl/penguin - cp -pf $(SAMPDIR)/opengl/penguin/*.lwo $(DISTDIR)/samples/opengl/penguin + $(CP_P) $(SAMPDIR)/opengl/penguin/*.dxf.gz $(DISTDIR)/samples/opengl/penguin mkdir $(DISTDIR)/samples/opengl/cube $(CP_P) $(SAMPDIR)/opengl/cube/Makefile.in $(DISTDIR)/samples/opengl/cube $(CP_P) $(SAMPDIR)/opengl/cube/makefile.unx $(DISTDIR)/samples/opengl/cube @@ -25321,14 +25484,14 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/opengl/isosurf/makefile.unx $(DISTDIR)/samples/opengl/isosurf $(CP_P) $(SAMPDIR)/opengl/isosurf/*.cpp $(DISTDIR)/samples/opengl/isosurf $(CP_P) $(SAMPDIR)/opengl/isosurf/*.h $(DISTDIR)/samples/opengl/isosurf - cp -pf $(SAMPDIR)/opengl/isosurf/*.gz $(DISTDIR)/samples/opengl/isosurf + $(CP_P) $(SAMPDIR)/opengl/isosurf/*.gz $(DISTDIR)/samples/opengl/isosurf mkdir $(DISTDIR)/samples/png $(CP_P) $(SAMPDIR)/png/Makefile.in $(DISTDIR)/samples/png $(CP_P) $(SAMPDIR)/png/makefile.unx $(DISTDIR)/samples/png $(CP_P) $(SAMPDIR)/png/*.cpp $(DISTDIR)/samples/png $(CP_P) $(SAMPDIR)/png/*.h $(DISTDIR)/samples/png - cp -pf $(SAMPDIR)/png/*.png $(DISTDIR)/samples/png + $(CP_P) $(SAMPDIR)/png/*.png $(DISTDIR)/samples/png mkdir $(DISTDIR)/samples/popup $(CP_P) $(SAMPDIR)/popup/Makefile.in $(DISTDIR)/samples/popup @@ -25341,6 +25504,7 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/printing/*.cpp $(DISTDIR)/samples/printing $(CP_P) $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing $(CP_P) $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing + $(CP_P) $(SAMPDIR)/printing/*.rc $(DISTDIR)/samples/printing mkdir $(DISTDIR)/samples/render $(CP_P) $(SAMPDIR)/render/Makefile.in $(DISTDIR)/samples/render @@ -25351,14 +25515,12 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/rotate/Makefile.in $(DISTDIR)/samples/rotate $(CP_P) $(SAMPDIR)/rotate/makefile.unx $(DISTDIR)/samples/rotate $(CP_P) $(SAMPDIR)/rotate/*.cpp $(DISTDIR)/samples/rotate - cp -pf $(SAMPDIR)/rotate/*.png $(DISTDIR)/samples/rotate + $(CP_P) $(SAMPDIR)/rotate/*.png $(DISTDIR)/samples/rotate mkdir $(DISTDIR)/samples/richedit $(CP_P) $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit $(CP_P) $(SAMPDIR)/richedit/makefile.unx $(DISTDIR)/samples/richedit $(CP_P) $(SAMPDIR)/richedit/*.cpp $(DISTDIR)/samples/richedit - rm $(DISTDIR)/samples/richedit/wxLayout.cpp - cp -pf $(SAMPDIR)/richedit/wxLayout.cpp $(DISTDIR)/samples/richedit $(CP_P) $(SAMPDIR)/richedit/*.h $(DISTDIR)/samples/richedit $(CP_P) $(SAMPDIR)/richedit/*.xpm $(DISTDIR)/samples/richedit $(CP_P) $(SAMPDIR)/richedit/README $(DISTDIR)/samples/richedit @@ -25398,7 +25560,7 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/shaped/Makefile.in $(DISTDIR)/samples/shaped $(CP_P) $(SAMPDIR)/shaped/makefile.unx $(DISTDIR)/samples/shaped $(CP_P) $(SAMPDIR)/shaped/*.cpp $(DISTDIR)/samples/shaped - cp -pf $(SAMPDIR)/shaped/*.png $(DISTDIR)/samples/shaped + $(CP_P) $(SAMPDIR)/shaped/*.png $(DISTDIR)/samples/shaped mkdir $(DISTDIR)/samples/sockets $(CP_P) $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets @@ -25409,13 +25571,14 @@ SAMPLES_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/samples/sound $(CP_P) $(SAMPDIR)/sound/Makefile.in $(DISTDIR)/samples/sound $(CP_P) $(SAMPDIR)/sound/*.cpp $(DISTDIR)/samples/sound - cp -pf $(SAMPDIR)/sound/*.wav $(DISTDIR)/samples/sound + $(CP_P) $(SAMPDIR)/sound/*.wav $(DISTDIR)/samples/sound mkdir $(DISTDIR)/samples/splash $(CP_P) $(SAMPDIR)/splash/Makefile.in $(DISTDIR)/samples/splash $(CP_P) $(SAMPDIR)/splash/*.cpp $(DISTDIR)/samples/splash - cp -pf $(SAMPDIR)/splash/*.png $(DISTDIR)/samples/splash - cp -pf $(SAMPDIR)/splash/*.mpg $(DISTDIR)/samples/splash + $(CP_P) $(SAMPDIR)/splash/*.png $(DISTDIR)/samples/splash + $(CP_P) $(SAMPDIR)/splash/*.mpg $(DISTDIR)/samples/splash + $(CP_P) $(SAMPDIR)/splash/*.xpm $(DISTDIR)/samples/splash mkdir $(DISTDIR)/samples/splitter $(CP_P) $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter @@ -25428,6 +25591,12 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/statbar/*.cpp $(DISTDIR)/samples/statbar $(CP_P) $(SAMPDIR)/statbar/*.xpm $(DISTDIR)/samples/statbar + mkdir $(DISTDIR)/samples/taskbar + $(CP_P) $(SAMPDIR)/taskbar/Makefile.in $(DISTDIR)/samples/taskbar + $(CP_P) $(SAMPDIR)/taskbar/*.cpp $(DISTDIR)/samples/taskbar + $(CP_P) $(SAMPDIR)/taskbar/*.h $(DISTDIR)/samples/taskbar + $(CP_P) $(SAMPDIR)/taskbar/*.xpm $(DISTDIR)/samples/taskbar + mkdir $(DISTDIR)/samples/text $(CP_P) $(SAMPDIR)/text/Makefile.in $(DISTDIR)/samples/text $(CP_P) $(SAMPDIR)/text/makefile.unx $(DISTDIR)/samples/text @@ -25492,10 +25661,10 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/xrc/*.cpp $(DISTDIR)/samples/xrc $(CP_P) $(SAMPDIR)/xrc/*.h $(DISTDIR)/samples/xrc $(CP_P) $(SAMPDIR)/xrc/*.rc $(DISTDIR)/samples/xrc - cp -pf $(SAMPDIR)/xrc/rc/*.xpm $(DISTDIR)/samples/xrc/rc - cp -pf $(SAMPDIR)/xrc/rc/*.xrc $(DISTDIR)/samples/xrc/rc - cp -pf $(SAMPDIR)/xrc/rc/*.gif $(DISTDIR)/samples/xrc/rc - cp -pf $(SAMPDIR)/xrc/rc/*.ico $(DISTDIR)/samples/xrc/rc + $(CP_P) $(SAMPDIR)/xrc/rc/*.xpm $(DISTDIR)/samples/xrc/rc + $(CP_P) $(SAMPDIR)/xrc/rc/*.xrc $(DISTDIR)/samples/xrc/rc + $(CP_P) $(SAMPDIR)/xrc/rc/*.gif $(DISTDIR)/samples/xrc/rc + $(CP_P) $(SAMPDIR)/xrc/rc/*.ico $(DISTDIR)/samples/xrc/rc UTILS_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/utils @@ -25516,7 +25685,7 @@ UTILS_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/utils/configtool/src/bitmaps mkdir $(DISTDIR)/utils/configtool/scripts $(CP_P) $(UTILSDIR)/configtool/*.in $(DISTDIR)/utils/configtool - cp -pf $(UTILSDIR)/configtool/configs/*.wxs $(DISTDIR)/utils/configtool/configs + $(CP_P) $(UTILSDIR)/configtool/configs/*.wxs $(DISTDIR)/utils/configtool/configs $(CP_P) $(UTILSDIR)/configtool/docs/*.txt $(DISTDIR)/utils/configtool/docs $(CP_P) $(UTILSDIR)/configtool/src/*.h $(DISTDIR)/utils/configtool/src $(CP_P) $(UTILSDIR)/configtool/src/*.in $(DISTDIR)/utils/configtool/src @@ -25531,8 +25700,8 @@ UTILS_DIST: ALL_GUI_DIST $(CP_P) $(UTILSDIR)/emulator/src/*.h $(DISTDIR)/utils/emulator/src $(CP_P) $(UTILSDIR)/emulator/src/*.in $(DISTDIR)/utils/emulator/src $(CP_P) $(UTILSDIR)/emulator/src/*.cpp $(DISTDIR)/utils/emulator/src - cp -pf $(UTILSDIR)/emulator/src/*.jpg $(DISTDIR)/utils/emulator/src - cp -pf $(UTILSDIR)/emulator/src/*.wxe $(DISTDIR)/utils/emulator/src + $(CP_P) $(UTILSDIR)/emulator/src/*.jpg $(DISTDIR)/utils/emulator/src + $(CP_P) $(UTILSDIR)/emulator/src/*.wxe $(DISTDIR)/utils/emulator/src $(CP_P) $(UTILSDIR)/emulator/src/*.xpm $(DISTDIR)/utils/emulator/src $(CP_P) $(UTILSDIR)/emulator/docs/*.txt $(DISTDIR)/utils/emulator/docs $(CP_P) $(UTILSDIR)/emulator/docs/*.jpg $(DISTDIR)/utils/emulator/docs @@ -25555,8 +25724,11 @@ UTILS_DIST: ALL_GUI_DIST $(CP_P) $(UTILSDIR)/helpview/Makefile.in $(DISTDIR)/utils/helpview $(CP_P) $(UTILSDIR)/helpview/src/*.h $(DISTDIR)/utils/helpview/src $(CP_P) $(UTILSDIR)/helpview/src/*.cpp $(DISTDIR)/utils/helpview/src + $(CP_P) $(UTILSDIR)/helpview/src/*.rc $(DISTDIR)/utils/helpview/src + $(CP_P) $(UTILSDIR)/helpview/src/*.ico $(DISTDIR)/utils/helpview/src + $(CP_P) $(UTILSDIR)/helpview/src/readme.txt $(DISTDIR)/utils/helpview/src $(CP_P) $(UTILSDIR)/helpview/src/Makefile.in $(DISTDIR)/utils/helpview/src - cp -pf $(UTILSDIR)/helpview/src/test.zip $(DISTDIR)/utils/helpview/src + $(CP_P) $(UTILSDIR)/helpview/src/test.zip $(DISTDIR)/utils/helpview/src $(CP_P) $(UTILSDIR)/helpview/src/bitmaps/*.xpm $(DISTDIR)/utils/helpview/src/bitmaps mkdir $(DISTDIR)/utils/wxrc @@ -25635,7 +25807,7 @@ distdir: @GUIDIST@ @# in other dist targets. find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \ \( -name "makefile.*" -a ! -name "makefile.unx" \) \) \ - -print | xargs rm -rf + -print | egrep -v '/(samples|dbbrowse)/.*\.hh.$$' | xargs rm -rf dist: distdir @cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);