new dependencies tracking code

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index 38523ff8f43dc5a5686b889f2fa0948853096f97..8b70744ebbf983fff1a451cc69ffc747bd706d56 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -924,8 +924,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_TOOLKIT_COCOA@    src/generic/tabg.cpp \
 @COND_TOOLKIT_COCOA@    src/generic/fontdlgg.cpp \
 @COND_TOOLKIT_COCOA@     \
 @COND_TOOLKIT_COCOA@    src/generic/tabg.cpp \
 @COND_TOOLKIT_COCOA@    src/generic/fontdlgg.cpp \
 @COND_TOOLKIT_COCOA@     \

-@COND_TOOLKIT_COCOA@    src/unix/snglinst.cpp \
-@COND_TOOLKIT_COCOA@    src/unix/utilsunx.cpp
+@COND_TOOLKIT_COCOA@    src/unix/snglinst.cpp

 @COND_TOOLKIT_OS2@GUI_SRC = src/os2/accel.cpp \
 @COND_TOOLKIT_OS2@    src/os2/app.cpp \
 @COND_TOOLKIT_OS2@    src/os2/bitmap.cpp \
 @COND_TOOLKIT_OS2@GUI_SRC = src/os2/accel.cpp \
 @COND_TOOLKIT_OS2@    src/os2/app.cpp \
 @COND_TOOLKIT_OS2@    src/os2/bitmap.cpp \


@@ -1017,7 +1016,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_2 = coredll-gsockmot.o coredll-accel1.o coredll-app4.o coredll-bmpbuttn1.o coredll-bmpmotif.o coredll-button1.o coredll-checkbox1.o coredll-checklst1.o coredll-choice1.o coredll-clipbrd4.o coredll-colour4.o coredll-combobox1.o coredll-combobox_native.o coredll-control1.o coredll-cursor4.o coredll-data4.o coredll-dataobj3.o coredll-dc4.o coredll-dcclient4.o coredll-dcmemory4.o coredll-dcscreen4.o coredll-dialog1.o coredll-evtloop4.o coredll-filedlg.o coredll-font4.o coredll-frame1.o coredll-gauge1.o coredll-gdiobj4.o coredll-glcanvas2.o coredll-icon4.o coredll-listbox1.o coredll-main2.o coredll-mdi1.o coredll-menu1.o coredll-menuitem.o coredll-minifram3.o coredll-msgdlg1.o coredll-palette3.o coredll-radiobox1.o coredll-radiobut1.o coredll-scrolbar1.o coredll-settings4.o coredll-slider1.o coredll-spinbutt1.o coredll-statbmp1.o coredll-statbox1.o coredll-stattext1.o coredll-toolbar.o coredll-textctrl1.o coredll-timer3.o coredll-toplevel4.o coredll-utils2.o coredll-window4.o coredll-fdrepdlg.o coredll-listctrl.o coredll-imaglist.o coredll-notebook1.o coredll-fontdlgg.o coredll-colrdlgg.o coredll-statline1.o coredll-tabg.o coredll-dirdlgg.o coredll-prntdlgg.o coredll-statusbr.o
 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_2 = coredll-access.o coredll-accel2.o coredll-bmpbuttn2.o coredll-button2.o coredll-checkbox2.o coredll-checklst2.o coredll-choice2.o coredll-colordlg.o coredll-combobox2.o coredll-control2.o coredll-dialog2.o coredll-dragimag.o coredll-fdrepdlg1.o coredll-filedlg1.o coredll-fontdlg1.o coredll-frame2.o coredll-gauge95.o coredll-imaglist1.o coredll-iniconf.o coredll-listbox2.o coredll-listctrl1.o coredll-mdi2.o coredll-menu2.o coredll-menuitem1.o coredll-metafile.o coredll-msgdlg2.o coredll-nativdlg.o coredll-notebook2.o coredll-ownerdrw.o coredll-penwin.o coredll-printdlg.o coredll-printwin.o coredll-radiobox2.o coredll-radiobut2.o coredll-scrolbar2.o coredll-slider95.o coredll-spinbutt2.o coredll-spinctrl1.o coredll-statbmp2.o coredll-statbox2.o coredll-statbr95.o coredll-statline2.o coredll-stattext2.o coredll-tabctrl.o coredll-tbar95.o coredll-textctrl2.o coredll-tglbtn1.o coredll-treectrl.o coredll-mslu.o
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_2 = coredll-gsocket.o coredll-accel3.o coredll-aga.o coredll-app5.o coredll-bitmap4.o coredll-bmpbuttn3.o coredll-brush4.o coredll-button3.o coredll-checkbox3.o coredll-checklst3.o coredll-choice3.o coredll-clipbrd5.o coredll-colordlg1.o coredll-colour5.o coredll-combobox3.o coredll-control3.o coredll-cursor5.o coredll-data5.o coredll-dataobj4.o coredll-dc5.o coredll-dcclient5.o coredll-dcmemory5.o coredll-dcprint1.o coredll-dcscreen5.o coredll-dialog3.o coredll-dirdlg1.o coredll-dirmac.o coredll-dnd1.o coredll-filedlg2.o coredll-font5.o coredll-fontdlg2.o coredll-fontenum3.o coredll-fontutil3.o coredll-frame3.o coredll-gauge2.o coredll-gdiobj5.o coredll-icon5.o coredll-joystick3.o coredll-listbox3.o coredll-macnotfy.o coredll-mdi3.o coredll-menu3.o coredll-menuitem2.o coredll-metafile1.o coredll-mimetmac.o coredll-minifram4.o coredll-msgdlg3.o coredll-notebmac.o coredll-palette4.o coredll-pen4.o coredll-pnghand.o coredll-printdlg1.o coredll-printmac.o coredll-radiobox3.o coredll-radiobut3.o coredll-region4.o coredll-scrolbar3.o coredll-settings5.o coredll-slider2.o coredll-spinbutt3.o coredll-statbmp3.o coredll-statbox3.o coredll-statbrma.o coredll-statlmac.o coredll-stattext3.o coredll-tabctrl1.o coredll-textctrl3.o coredll-thread.o coredll-timer4.o coredll-toplevel5.o coredll-toolbar1.o coredll-tooltip2.o coredll-uma.o coredll-utils3.o coredll-utilsexc.o coredll-wave2.o coredll-window5.o coredll-MoreFilesX.o coredll-statusbr.o coredll-imaglist.o coredll-listctrl.o coredll-fdrepdlg.o coredll-tabg.o coredll-fontdlgg.o coredll-snglinst.o coredll-utilsunx.o
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_2 = coredll-gsockmot.o coredll-accel1.o coredll-app4.o coredll-bmpbuttn1.o coredll-bmpmotif.o coredll-button1.o coredll-checkbox1.o coredll-checklst1.o coredll-choice1.o coredll-clipbrd4.o coredll-colour4.o coredll-combobox1.o coredll-combobox_native.o coredll-control1.o coredll-cursor4.o coredll-data4.o coredll-dataobj3.o coredll-dc4.o coredll-dcclient4.o coredll-dcmemory4.o coredll-dcscreen4.o coredll-dialog1.o coredll-evtloop4.o coredll-filedlg.o coredll-font4.o coredll-frame1.o coredll-gauge1.o coredll-gdiobj4.o coredll-glcanvas2.o coredll-icon4.o coredll-listbox1.o coredll-main2.o coredll-mdi1.o coredll-menu1.o coredll-menuitem.o coredll-minifram3.o coredll-msgdlg1.o coredll-palette3.o coredll-radiobox1.o coredll-radiobut1.o coredll-scrolbar1.o coredll-settings4.o coredll-slider1.o coredll-spinbutt1.o coredll-statbmp1.o coredll-statbox1.o coredll-stattext1.o coredll-toolbar.o coredll-textctrl1.o coredll-timer3.o coredll-toplevel4.o coredll-utils2.o coredll-window4.o coredll-fdrepdlg.o coredll-listctrl.o coredll-imaglist.o coredll-notebook1.o coredll-fontdlgg.o coredll-colrdlgg.o coredll-statline1.o coredll-tabg.o coredll-dirdlgg.o coredll-prntdlgg.o coredll-statusbr.o
 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_2 = coredll-access.o coredll-accel2.o coredll-bmpbuttn2.o coredll-button2.o coredll-checkbox2.o coredll-checklst2.o coredll-choice2.o coredll-colordlg.o coredll-combobox2.o coredll-control2.o coredll-dialog2.o coredll-dragimag.o coredll-fdrepdlg1.o coredll-filedlg1.o coredll-fontdlg1.o coredll-frame2.o coredll-gauge95.o coredll-imaglist1.o coredll-iniconf.o coredll-listbox2.o coredll-listctrl1.o coredll-mdi2.o coredll-menu2.o coredll-menuitem1.o coredll-metafile.o coredll-msgdlg2.o coredll-nativdlg.o coredll-notebook2.o coredll-ownerdrw.o coredll-penwin.o coredll-printdlg.o coredll-printwin.o coredll-radiobox2.o coredll-radiobut2.o coredll-scrolbar2.o coredll-slider95.o coredll-spinbutt2.o coredll-spinctrl1.o coredll-statbmp2.o coredll-statbox2.o coredll-statbr95.o coredll-statline2.o coredll-stattext2.o coredll-tabctrl.o coredll-tbar95.o coredll-textctrl2.o coredll-tglbtn1.o coredll-treectrl.o coredll-mslu.o
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_2 = coredll-gsocket.o coredll-accel3.o coredll-aga.o coredll-app5.o coredll-bitmap4.o coredll-bmpbuttn3.o coredll-brush4.o coredll-button3.o coredll-checkbox3.o coredll-checklst3.o coredll-choice3.o coredll-clipbrd5.o coredll-colordlg1.o coredll-colour5.o coredll-combobox3.o coredll-control3.o coredll-cursor5.o coredll-data5.o coredll-dataobj4.o coredll-dc5.o coredll-dcclient5.o coredll-dcmemory5.o coredll-dcprint1.o coredll-dcscreen5.o coredll-dialog3.o coredll-dirdlg1.o coredll-dirmac.o coredll-dnd1.o coredll-filedlg2.o coredll-font5.o coredll-fontdlg2.o coredll-fontenum3.o coredll-fontutil3.o coredll-frame3.o coredll-gauge2.o coredll-gdiobj5.o coredll-icon5.o coredll-joystick3.o coredll-listbox3.o coredll-macnotfy.o coredll-mdi3.o coredll-menu3.o coredll-menuitem2.o coredll-metafile1.o coredll-mimetmac.o coredll-minifram4.o coredll-msgdlg3.o coredll-notebmac.o coredll-palette4.o coredll-pen4.o coredll-pnghand.o coredll-printdlg1.o coredll-printmac.o coredll-radiobox3.o coredll-radiobut3.o coredll-region4.o coredll-scrolbar3.o coredll-settings5.o coredll-slider2.o coredll-spinbutt3.o coredll-statbmp3.o coredll-statbox3.o coredll-statbrma.o coredll-statlmac.o coredll-stattext3.o coredll-tabctrl1.o coredll-textctrl3.o coredll-thread.o coredll-timer4.o coredll-toplevel5.o coredll-toolbar1.o coredll-tooltip2.o coredll-uma.o coredll-utils3.o coredll-utilsexc.o coredll-wave2.o coredll-window5.o coredll-MoreFilesX.o coredll-statusbr.o coredll-imaglist.o coredll-listctrl.o coredll-fdrepdlg.o coredll-tabg.o coredll-fontdlgg.o coredll-snglinst.o coredll-utilsunx.o

-@COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_2 = coredll-NSBox.o coredll-NSButton.o coredll-NSControl.o coredll-NSMenu.o coredll-NSPanel.o coredll-NSTextField.o coredll-NSView.o coredll-NSWindow.o coredll-app6.o coredll-bmpbuttn4.o coredll-bitmap5.o coredll-brush5.o coredll-button4.o coredll-checkbox4.o coredll-checklst4.o coredll-choice4.o coredll-colour6.o coredll-control4.o coredll-cursor6.o coredll-data6.o coredll-dc6.o coredll-dcclient6.o coredll-dcmemory6.o coredll-dcscreen6.o coredll-dialog4.o coredll-font6.o coredll-fontutil4.o coredll-frame4.o coredll-gdiobj6.o coredll-icon6.o coredll-listbox4.o coredll-main3.o coredll-menu4.o coredll-menuitem3.o coredll-pen5.o coredll-radiobox4.o coredll-radiobut4.o coredll-region5.o coredll-settings6.o coredll-slider3.o coredll-statbmp4.o coredll-statbox4.o coredll-statline21.o coredll-stattext4.o coredll-textctrl4.o coredll-toplevel6.o coredll-utils4.o coredll-utilsexc1.o coredll-window6.o coredll-statusbr.o coredll-imaglist.o coredll-listctrl.o coredll-fdrepdlg.o coredll-tabg.o coredll-fontdlgg.o coredll-snglinst.o coredll-utilsunx.o
+@COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_2 = coredll-NSBox.o coredll-NSButton.o coredll-NSControl.o coredll-NSMenu.o coredll-NSPanel.o coredll-NSTextField.o coredll-NSView.o coredll-NSWindow.o coredll-app6.o coredll-bmpbuttn4.o coredll-bitmap5.o coredll-brush5.o coredll-button4.o coredll-checkbox4.o coredll-checklst4.o coredll-choice4.o coredll-colour6.o coredll-control4.o coredll-cursor6.o coredll-data6.o coredll-dc6.o coredll-dcclient6.o coredll-dcmemory6.o coredll-dcscreen6.o coredll-dialog4.o coredll-font6.o coredll-fontutil4.o coredll-frame4.o coredll-gdiobj6.o coredll-icon6.o coredll-listbox4.o coredll-main3.o coredll-menu4.o coredll-menuitem3.o coredll-pen5.o coredll-radiobox4.o coredll-radiobut4.o coredll-region5.o coredll-settings6.o coredll-slider3.o coredll-statbmp4.o coredll-statbox4.o coredll-statline21.o coredll-stattext4.o coredll-textctrl4.o coredll-toplevel6.o coredll-utils4.o coredll-utilsexc1.o coredll-window6.o coredll-statusbr.o coredll-imaglist.o coredll-listctrl.o coredll-fdrepdlg.o coredll-tabg.o coredll-fontdlgg.o coredll-snglinst.o

 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_2 = coredll-accel4.o coredll-app7.o coredll-bitmap6.o coredll-bmpbuttn5.o coredll-brush6.o coredll-button5.o coredll-checkbox5.o coredll-checklst5.o coredll-choice5.o coredll-clipbrd6.o coredll-colour7.o coredll-combobox4.o coredll-control5.o coredll-cursor7.o coredll-data7.o coredll-dataobj5.o coredll-dc7.o coredll-dcclient7.o coredll-dcmemory7.o coredll-dcprint2.o coredll-dcscreen7.o coredll-dialog5.o coredll-dnd2.o coredll-filedlg3.o coredll-font7.o coredll-fontdlg3.o coredll-fontenum4.o coredll-fontutil5.o coredll-frame5.o coredll-gauge3.o coredll-gdiimage1.o coredll-gdiobj7.o coredll-helpwin1.o coredll-icon7.o coredll-iniconf1.o coredll-joystick4.o coredll-listbox5.o coredll-main4.o coredll-menu5.o coredll-menuitem4.o coredll-metafile2.o coredll-mimetype.o coredll-msgdlg4.o coredll-nativdlg1.o coredll-notebook3.o coredll-ownerdrw1.o coredll-palette5.o coredll-pen6.o coredll-print.o coredll-radiobox5.o coredll-radiobut5.o coredll-region6.o coredll-scrolbar4.o coredll-settings7.o coredll-slider4.o coredll-spinbutt4.o coredll-spinctrl2.o coredll-statbmp5.o coredll-statbox5.o coredll-statline3.o coredll-stattext5.o coredll-tabctrl2.o coredll-textctrl5.o coredll-timer5.o coredll-thread1.o coredll-toolbar2.o coredll-tooltip3.o coredll-toplevel7.o coredll-wave3.o coredll-window7.o coredll-gsocket1.o coredll-gsockpm.o
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_SHARED_0_MONOLITHIC_1@__install_monolib___depname = install_monolib
 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_2 = coredll-accel4.o coredll-app7.o coredll-bitmap6.o coredll-bmpbuttn5.o coredll-brush6.o coredll-button5.o coredll-checkbox5.o coredll-checklst5.o coredll-choice5.o coredll-clipbrd6.o coredll-colour7.o coredll-combobox4.o coredll-control5.o coredll-cursor7.o coredll-data7.o coredll-dataobj5.o coredll-dc7.o coredll-dcclient7.o coredll-dcmemory7.o coredll-dcprint2.o coredll-dcscreen7.o coredll-dialog5.o coredll-dnd2.o coredll-filedlg3.o coredll-font7.o coredll-fontdlg3.o coredll-fontenum4.o coredll-fontutil5.o coredll-frame5.o coredll-gauge3.o coredll-gdiimage1.o coredll-gdiobj7.o coredll-helpwin1.o coredll-icon7.o coredll-iniconf1.o coredll-joystick4.o coredll-listbox5.o coredll-main4.o coredll-menu5.o coredll-menuitem4.o coredll-metafile2.o coredll-mimetype.o coredll-msgdlg4.o coredll-nativdlg1.o coredll-notebook3.o coredll-ownerdrw1.o coredll-palette5.o coredll-pen6.o coredll-print.o coredll-radiobox5.o coredll-radiobut5.o coredll-region6.o coredll-scrolbar4.o coredll-settings7.o coredll-slider4.o coredll-spinbutt4.o coredll-spinctrl2.o coredll-statbmp5.o coredll-statbox5.o coredll-statline3.o coredll-stattext5.o coredll-tabctrl2.o coredll-textctrl5.o coredll-timer5.o coredll-thread1.o coredll-toolbar2.o coredll-tooltip3.o coredll-toplevel7.o coredll-wave3.o coredll-window7.o coredll-gsocket1.o coredll-gsockpm.o
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_SHARED_0_MONOLITHIC_1@__install_monolib___depname = install_monolib


@@ -1558,14 +1557,14 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_3 = corelib-gsockmot.o corelib-accel1.o corelib-app4.o corelib-bmpbuttn1.o corelib-bmpmotif.o corelib-button1.o corelib-checkbox1.o corelib-checklst1.o corelib-choice1.o corelib-clipbrd4.o corelib-colour4.o corelib-combobox1.o corelib-combobox_native.o corelib-control1.o corelib-cursor4.o corelib-data4.o corelib-dataobj3.o corelib-dc4.o corelib-dcclient4.o corelib-dcmemory4.o corelib-dcscreen4.o corelib-dialog1.o corelib-evtloop4.o corelib-filedlg.o corelib-font4.o corelib-frame1.o corelib-gauge1.o corelib-gdiobj4.o corelib-glcanvas2.o corelib-icon4.o corelib-listbox1.o corelib-main2.o corelib-mdi1.o corelib-menu1.o corelib-menuitem.o corelib-minifram3.o corelib-msgdlg1.o corelib-palette3.o corelib-radiobox1.o corelib-radiobut1.o corelib-scrolbar1.o corelib-settings4.o corelib-slider1.o corelib-spinbutt1.o corelib-statbmp1.o corelib-statbox1.o corelib-stattext1.o corelib-toolbar.o corelib-textctrl1.o corelib-timer3.o corelib-toplevel4.o corelib-utils2.o corelib-window4.o corelib-fdrepdlg.o corelib-listctrl.o corelib-imaglist.o corelib-notebook1.o corelib-fontdlgg.o corelib-colrdlgg.o corelib-statline1.o corelib-tabg.o corelib-dirdlgg.o corelib-prntdlgg.o corelib-statusbr.o
 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_3 = corelib-access.o corelib-accel2.o corelib-bmpbuttn2.o corelib-button2.o corelib-checkbox2.o corelib-checklst2.o corelib-choice2.o corelib-colordlg.o corelib-combobox2.o corelib-control2.o corelib-dialog2.o corelib-dragimag.o corelib-fdrepdlg1.o corelib-filedlg1.o corelib-fontdlg1.o corelib-frame2.o corelib-gauge95.o corelib-imaglist1.o corelib-iniconf.o corelib-listbox2.o corelib-listctrl1.o corelib-mdi2.o corelib-menu2.o corelib-menuitem1.o corelib-metafile.o corelib-msgdlg2.o corelib-nativdlg.o corelib-notebook2.o corelib-ownerdrw.o corelib-penwin.o corelib-printdlg.o corelib-printwin.o corelib-radiobox2.o corelib-radiobut2.o corelib-scrolbar2.o corelib-slider95.o corelib-spinbutt2.o corelib-spinctrl1.o corelib-statbmp2.o corelib-statbox2.o corelib-statbr95.o corelib-statline2.o corelib-stattext2.o corelib-tabctrl.o corelib-tbar95.o corelib-textctrl2.o corelib-tglbtn1.o corelib-treectrl.o corelib-mslu.o
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_3 = corelib-gsocket.o corelib-accel3.o corelib-aga.o corelib-app5.o corelib-bitmap4.o corelib-bmpbuttn3.o corelib-brush4.o corelib-button3.o corelib-checkbox3.o corelib-checklst3.o corelib-choice3.o corelib-clipbrd5.o corelib-colordlg1.o corelib-colour5.o corelib-combobox3.o corelib-control3.o corelib-cursor5.o corelib-data5.o corelib-dataobj4.o corelib-dc5.o corelib-dcclient5.o corelib-dcmemory5.o corelib-dcprint1.o corelib-dcscreen5.o corelib-dialog3.o corelib-dirdlg1.o corelib-dirmac.o corelib-dnd1.o corelib-filedlg2.o corelib-font5.o corelib-fontdlg2.o corelib-fontenum3.o corelib-fontutil3.o corelib-frame3.o corelib-gauge2.o corelib-gdiobj5.o corelib-icon5.o corelib-joystick3.o corelib-listbox3.o corelib-macnotfy.o corelib-mdi3.o corelib-menu3.o corelib-menuitem2.o corelib-metafile1.o corelib-mimetmac.o corelib-minifram4.o corelib-msgdlg3.o corelib-notebmac.o corelib-palette4.o corelib-pen4.o corelib-pnghand.o corelib-printdlg1.o corelib-printmac.o corelib-radiobox3.o corelib-radiobut3.o corelib-region4.o corelib-scrolbar3.o corelib-settings5.o corelib-slider2.o corelib-spinbutt3.o corelib-statbmp3.o corelib-statbox3.o corelib-statbrma.o corelib-statlmac.o corelib-stattext3.o corelib-tabctrl1.o corelib-textctrl3.o corelib-thread.o corelib-timer4.o corelib-toplevel5.o corelib-toolbar1.o corelib-tooltip2.o corelib-uma.o corelib-utils3.o corelib-utilsexc.o corelib-wave2.o corelib-window5.o corelib-MoreFilesX.o corelib-statusbr.o corelib-imaglist.o corelib-listctrl.o corelib-fdrepdlg.o corelib-tabg.o corelib-fontdlgg.o corelib-snglinst.o corelib-utilsunx.o
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_3 = corelib-gsockmot.o corelib-accel1.o corelib-app4.o corelib-bmpbuttn1.o corelib-bmpmotif.o corelib-button1.o corelib-checkbox1.o corelib-checklst1.o corelib-choice1.o corelib-clipbrd4.o corelib-colour4.o corelib-combobox1.o corelib-combobox_native.o corelib-control1.o corelib-cursor4.o corelib-data4.o corelib-dataobj3.o corelib-dc4.o corelib-dcclient4.o corelib-dcmemory4.o corelib-dcscreen4.o corelib-dialog1.o corelib-evtloop4.o corelib-filedlg.o corelib-font4.o corelib-frame1.o corelib-gauge1.o corelib-gdiobj4.o corelib-glcanvas2.o corelib-icon4.o corelib-listbox1.o corelib-main2.o corelib-mdi1.o corelib-menu1.o corelib-menuitem.o corelib-minifram3.o corelib-msgdlg1.o corelib-palette3.o corelib-radiobox1.o corelib-radiobut1.o corelib-scrolbar1.o corelib-settings4.o corelib-slider1.o corelib-spinbutt1.o corelib-statbmp1.o corelib-statbox1.o corelib-stattext1.o corelib-toolbar.o corelib-textctrl1.o corelib-timer3.o corelib-toplevel4.o corelib-utils2.o corelib-window4.o corelib-fdrepdlg.o corelib-listctrl.o corelib-imaglist.o corelib-notebook1.o corelib-fontdlgg.o corelib-colrdlgg.o corelib-statline1.o corelib-tabg.o corelib-dirdlgg.o corelib-prntdlgg.o corelib-statusbr.o
 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_3 = corelib-access.o corelib-accel2.o corelib-bmpbuttn2.o corelib-button2.o corelib-checkbox2.o corelib-checklst2.o corelib-choice2.o corelib-colordlg.o corelib-combobox2.o corelib-control2.o corelib-dialog2.o corelib-dragimag.o corelib-fdrepdlg1.o corelib-filedlg1.o corelib-fontdlg1.o corelib-frame2.o corelib-gauge95.o corelib-imaglist1.o corelib-iniconf.o corelib-listbox2.o corelib-listctrl1.o corelib-mdi2.o corelib-menu2.o corelib-menuitem1.o corelib-metafile.o corelib-msgdlg2.o corelib-nativdlg.o corelib-notebook2.o corelib-ownerdrw.o corelib-penwin.o corelib-printdlg.o corelib-printwin.o corelib-radiobox2.o corelib-radiobut2.o corelib-scrolbar2.o corelib-slider95.o corelib-spinbutt2.o corelib-spinctrl1.o corelib-statbmp2.o corelib-statbox2.o corelib-statbr95.o corelib-statline2.o corelib-stattext2.o corelib-tabctrl.o corelib-tbar95.o corelib-textctrl2.o corelib-tglbtn1.o corelib-treectrl.o corelib-mslu.o
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_3 = corelib-gsocket.o corelib-accel3.o corelib-aga.o corelib-app5.o corelib-bitmap4.o corelib-bmpbuttn3.o corelib-brush4.o corelib-button3.o corelib-checkbox3.o corelib-checklst3.o corelib-choice3.o corelib-clipbrd5.o corelib-colordlg1.o corelib-colour5.o corelib-combobox3.o corelib-control3.o corelib-cursor5.o corelib-data5.o corelib-dataobj4.o corelib-dc5.o corelib-dcclient5.o corelib-dcmemory5.o corelib-dcprint1.o corelib-dcscreen5.o corelib-dialog3.o corelib-dirdlg1.o corelib-dirmac.o corelib-dnd1.o corelib-filedlg2.o corelib-font5.o corelib-fontdlg2.o corelib-fontenum3.o corelib-fontutil3.o corelib-frame3.o corelib-gauge2.o corelib-gdiobj5.o corelib-icon5.o corelib-joystick3.o corelib-listbox3.o corelib-macnotfy.o corelib-mdi3.o corelib-menu3.o corelib-menuitem2.o corelib-metafile1.o corelib-mimetmac.o corelib-minifram4.o corelib-msgdlg3.o corelib-notebmac.o corelib-palette4.o corelib-pen4.o corelib-pnghand.o corelib-printdlg1.o corelib-printmac.o corelib-radiobox3.o corelib-radiobut3.o corelib-region4.o corelib-scrolbar3.o corelib-settings5.o corelib-slider2.o corelib-spinbutt3.o corelib-statbmp3.o corelib-statbox3.o corelib-statbrma.o corelib-statlmac.o corelib-stattext3.o corelib-tabctrl1.o corelib-textctrl3.o corelib-thread.o corelib-timer4.o corelib-toplevel5.o corelib-toolbar1.o corelib-tooltip2.o corelib-uma.o corelib-utils3.o corelib-utilsexc.o corelib-wave2.o corelib-window5.o corelib-MoreFilesX.o corelib-statusbr.o corelib-imaglist.o corelib-listctrl.o corelib-fdrepdlg.o corelib-tabg.o corelib-fontdlgg.o corelib-snglinst.o corelib-utilsunx.o

-@COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_3 = corelib-NSBox.o corelib-NSButton.o corelib-NSControl.o corelib-NSMenu.o corelib-NSPanel.o corelib-NSTextField.o corelib-NSView.o corelib-NSWindow.o corelib-app6.o corelib-bmpbuttn4.o corelib-bitmap5.o corelib-brush5.o corelib-button4.o corelib-checkbox4.o corelib-checklst4.o corelib-choice4.o corelib-colour6.o corelib-control4.o corelib-cursor6.o corelib-data6.o corelib-dc6.o corelib-dcclient6.o corelib-dcmemory6.o corelib-dcscreen6.o corelib-dialog4.o corelib-font6.o corelib-fontutil4.o corelib-frame4.o corelib-gdiobj6.o corelib-icon6.o corelib-listbox4.o corelib-main3.o corelib-menu4.o corelib-menuitem3.o corelib-pen5.o corelib-radiobox4.o corelib-radiobut4.o corelib-region5.o corelib-settings6.o corelib-slider3.o corelib-statbmp4.o corelib-statbox4.o corelib-statline21.o corelib-stattext4.o corelib-textctrl4.o corelib-toplevel6.o corelib-utils4.o corelib-utilsexc1.o corelib-window6.o corelib-statusbr.o corelib-imaglist.o corelib-listctrl.o corelib-fdrepdlg.o corelib-tabg.o corelib-fontdlgg.o corelib-snglinst.o corelib-utilsunx.o
+@COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_3 = corelib-NSBox.o corelib-NSButton.o corelib-NSControl.o corelib-NSMenu.o corelib-NSPanel.o corelib-NSTextField.o corelib-NSView.o corelib-NSWindow.o corelib-app6.o corelib-bmpbuttn4.o corelib-bitmap5.o corelib-brush5.o corelib-button4.o corelib-checkbox4.o corelib-checklst4.o corelib-choice4.o corelib-colour6.o corelib-control4.o corelib-cursor6.o corelib-data6.o corelib-dc6.o corelib-dcclient6.o corelib-dcmemory6.o corelib-dcscreen6.o corelib-dialog4.o corelib-font6.o corelib-fontutil4.o corelib-frame4.o corelib-gdiobj6.o corelib-icon6.o corelib-listbox4.o corelib-main3.o corelib-menu4.o corelib-menuitem3.o corelib-pen5.o corelib-radiobox4.o corelib-radiobut4.o corelib-region5.o corelib-settings6.o corelib-slider3.o corelib-statbmp4.o corelib-statbox4.o corelib-statline21.o corelib-stattext4.o corelib-textctrl4.o corelib-toplevel6.o corelib-utils4.o corelib-utilsexc1.o corelib-window6.o corelib-statusbr.o corelib-imaglist.o corelib-listctrl.o corelib-fdrepdlg.o corelib-tabg.o corelib-fontdlgg.o corelib-snglinst.o

 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_3 = corelib-accel4.o corelib-app7.o corelib-bitmap6.o corelib-bmpbuttn5.o corelib-brush6.o corelib-button5.o corelib-checkbox5.o corelib-checklst5.o corelib-choice5.o corelib-clipbrd6.o corelib-colour7.o corelib-combobox4.o corelib-control5.o corelib-cursor7.o corelib-data7.o corelib-dataobj5.o corelib-dc7.o corelib-dcclient7.o corelib-dcmemory7.o corelib-dcprint2.o corelib-dcscreen7.o corelib-dialog5.o corelib-dnd2.o corelib-filedlg3.o corelib-font7.o corelib-fontdlg3.o corelib-fontenum4.o corelib-fontutil5.o corelib-frame5.o corelib-gauge3.o corelib-gdiimage1.o corelib-gdiobj7.o corelib-helpwin1.o corelib-icon7.o corelib-iniconf1.o corelib-joystick4.o corelib-listbox5.o corelib-main4.o corelib-menu5.o corelib-menuitem4.o corelib-metafile2.o corelib-mimetype.o corelib-msgdlg4.o corelib-nativdlg1.o corelib-notebook3.o corelib-ownerdrw1.o corelib-palette5.o corelib-pen6.o corelib-print.o corelib-radiobox5.o corelib-radiobut5.o corelib-region6.o corelib-scrolbar4.o corelib-settings7.o corelib-slider4.o corelib-spinbutt4.o corelib-spinctrl2.o corelib-statbmp5.o corelib-statbox5.o corelib-statline3.o corelib-stattext5.o corelib-tabctrl2.o corelib-textctrl5.o corelib-timer5.o corelib-thread1.o corelib-toolbar2.o corelib-tooltip3.o corelib-toplevel7.o corelib-wave3.o corelib-window7.o corelib-gsocket1.o corelib-gsockpm.o
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_LIBR = $(top_builddir)lib/libwxjpeg.a
 @COND_TOOLKIT_GTK@__GUI_SRC_OBJECTS_1 = monolib-imaglist.o monolib-colrdlgg.o monolib-listctrl.o monolib-filedlgg.o monolib-dirdlgg.o monolib-prntdlgg.o monolib-accel.o monolib-msgdlgg.o monolib-fdrepdlg.o monolib-tabg.o monolib-statusbr.o monolib-bmpbuttn.o monolib-button.o monolib-checkbox.o monolib-checklst.o monolib-choice.o monolib-combobox.o monolib-control.o monolib-dialog.o monolib-fontdlg.o monolib-frame.o monolib-gauge.o monolib-joystick2.o monolib-listbox.o monolib-mdi.o monolib-menu.o monolib-minifram2.o monolib-msgdlg.o monolib-notebook.o monolib-radiobox.o monolib-radiobut.o monolib-scrolbar.o monolib-scrolwin.o monolib-slider.o monolib-spinbutt.o monolib-spinctrl.o monolib-statbmp.o monolib-statbox.o monolib-statline.o monolib-stattext.o monolib-tbargtk.o monolib-textctrl.o monolib-tglbtn.o monolib-utilsres.o monolib-wave1.o
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_1 = monolib-gsockmot.o monolib-accel1.o monolib-app4.o monolib-bmpbuttn1.o monolib-bmpmotif.o monolib-button1.o monolib-checkbox1.o monolib-checklst1.o monolib-choice1.o monolib-clipbrd4.o monolib-colour4.o monolib-combobox1.o monolib-combobox_native.o monolib-control1.o monolib-cursor4.o monolib-data4.o monolib-dataobj3.o monolib-dc4.o monolib-dcclient4.o monolib-dcmemory4.o monolib-dcscreen4.o monolib-dialog1.o monolib-evtloop4.o monolib-filedlg.o monolib-font4.o monolib-frame1.o monolib-gauge1.o monolib-gdiobj4.o monolib-glcanvas2.o monolib-icon4.o monolib-listbox1.o monolib-main3.o monolib-mdi1.o monolib-menu1.o monolib-menuitem.o monolib-minifram3.o monolib-msgdlg1.o monolib-palette3.o monolib-radiobox1.o monolib-radiobut1.o monolib-scrolbar1.o monolib-settings4.o monolib-slider1.o monolib-spinbutt1.o monolib-statbmp1.o monolib-statbox1.o monolib-stattext1.o monolib-toolbar.o monolib-textctrl1.o monolib-timer3.o monolib-toplevel4.o monolib-utils3.o monolib-window4.o monolib-fdrepdlg.o monolib-listctrl.o monolib-imaglist.o monolib-notebook1.o monolib-fontdlgg.o monolib-colrdlgg.o monolib-statline1.o monolib-tabg.o monolib-dirdlgg.o monolib-prntdlgg.o monolib-statusbr.o
 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_1 = monolib-access.o monolib-accel2.o monolib-bmpbuttn2.o monolib-button2.o monolib-checkbox2.o monolib-checklst2.o monolib-choice2.o monolib-colordlg.o monolib-combobox2.o monolib-control2.o monolib-dialog2.o monolib-dragimag.o monolib-fdrepdlg1.o monolib-filedlg1.o monolib-fontdlg1.o monolib-frame2.o monolib-gauge95.o monolib-imaglist1.o monolib-iniconf.o monolib-listbox2.o monolib-listctrl1.o monolib-mdi2.o monolib-menu2.o monolib-menuitem1.o monolib-metafile.o monolib-msgdlg2.o monolib-nativdlg.o monolib-notebook2.o monolib-ownerdrw.o monolib-penwin.o monolib-printdlg.o monolib-printwin.o monolib-radiobox2.o monolib-radiobut2.o monolib-scrolbar2.o monolib-slider95.o monolib-spinbutt2.o monolib-spinctrl1.o monolib-statbmp2.o monolib-statbox2.o monolib-statbr95.o monolib-statline2.o monolib-stattext2.o monolib-tabctrl.o monolib-tbar95.o monolib-textctrl2.o monolib-tglbtn1.o monolib-treectrl.o monolib-mslu.o
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_1 = monolib-gsocket2.o monolib-accel3.o monolib-aga.o monolib-app5.o monolib-bitmap4.o monolib-bmpbuttn3.o monolib-brush4.o monolib-button3.o monolib-checkbox3.o monolib-checklst3.o monolib-choice3.o monolib-clipbrd5.o monolib-colordlg1.o monolib-colour5.o monolib-combobox3.o monolib-control3.o monolib-cursor5.o monolib-data5.o monolib-dataobj4.o monolib-dc5.o monolib-dcclient5.o monolib-dcmemory5.o monolib-dcprint1.o monolib-dcscreen5.o monolib-dialog3.o monolib-dirdlg1.o monolib-dirmac.o monolib-dnd1.o monolib-filedlg2.o monolib-font5.o monolib-fontdlg2.o monolib-fontenum3.o monolib-fontutil3.o monolib-frame3.o monolib-gauge2.o monolib-gdiobj5.o monolib-icon5.o monolib-joystick3.o monolib-listbox3.o monolib-macnotfy.o monolib-mdi3.o monolib-menu3.o monolib-menuitem2.o monolib-metafile1.o monolib-mimetmac.o monolib-minifram4.o monolib-msgdlg3.o monolib-notebmac.o monolib-palette4.o monolib-pen4.o monolib-pnghand.o monolib-printdlg1.o monolib-printmac.o monolib-radiobox3.o monolib-radiobut3.o monolib-region4.o monolib-scrolbar3.o monolib-settings5.o monolib-slider2.o monolib-spinbutt3.o monolib-statbmp3.o monolib-statbox3.o monolib-statbrma.o monolib-statlmac.o monolib-stattext3.o monolib-tabctrl1.o monolib-textctrl3.o monolib-thread1.o monolib-timer4.o monolib-toplevel5.o monolib-toolbar1.o monolib-tooltip2.o monolib-uma.o monolib-utils4.o monolib-utilsexc1.o monolib-wave2.o monolib-window5.o monolib-MoreFilesX.o monolib-statusbr.o monolib-imaglist.o monolib-listctrl.o monolib-fdrepdlg.o monolib-tabg.o monolib-fontdlgg.o monolib-snglinst.o monolib-utilsunx.o
 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_3 = corelib-accel4.o corelib-app7.o corelib-bitmap6.o corelib-bmpbuttn5.o corelib-brush6.o corelib-button5.o corelib-checkbox5.o corelib-checklst5.o corelib-choice5.o corelib-clipbrd6.o corelib-colour7.o corelib-combobox4.o corelib-control5.o corelib-cursor7.o corelib-data7.o corelib-dataobj5.o corelib-dc7.o corelib-dcclient7.o corelib-dcmemory7.o corelib-dcprint2.o corelib-dcscreen7.o corelib-dialog5.o corelib-dnd2.o corelib-filedlg3.o corelib-font7.o corelib-fontdlg3.o corelib-fontenum4.o corelib-fontutil5.o corelib-frame5.o corelib-gauge3.o corelib-gdiimage1.o corelib-gdiobj7.o corelib-helpwin1.o corelib-icon7.o corelib-iniconf1.o corelib-joystick4.o corelib-listbox5.o corelib-main4.o corelib-menu5.o corelib-menuitem4.o corelib-metafile2.o corelib-mimetype.o corelib-msgdlg4.o corelib-nativdlg1.o corelib-notebook3.o corelib-ownerdrw1.o corelib-palette5.o corelib-pen6.o corelib-print.o corelib-radiobox5.o corelib-radiobut5.o corelib-region6.o corelib-scrolbar4.o corelib-settings7.o corelib-slider4.o corelib-spinbutt4.o corelib-spinctrl2.o corelib-statbmp5.o corelib-statbox5.o corelib-statline3.o corelib-stattext5.o corelib-tabctrl2.o corelib-textctrl5.o corelib-timer5.o corelib-thread1.o corelib-toolbar2.o corelib-tooltip3.o corelib-toplevel7.o corelib-wave3.o corelib-window7.o corelib-gsocket1.o corelib-gsockpm.o
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_LIBR = $(top_builddir)lib/libwxjpeg.a
 @COND_TOOLKIT_GTK@__GUI_SRC_OBJECTS_1 = monolib-imaglist.o monolib-colrdlgg.o monolib-listctrl.o monolib-filedlgg.o monolib-dirdlgg.o monolib-prntdlgg.o monolib-accel.o monolib-msgdlgg.o monolib-fdrepdlg.o monolib-tabg.o monolib-statusbr.o monolib-bmpbuttn.o monolib-button.o monolib-checkbox.o monolib-checklst.o monolib-choice.o monolib-combobox.o monolib-control.o monolib-dialog.o monolib-fontdlg.o monolib-frame.o monolib-gauge.o monolib-joystick2.o monolib-listbox.o monolib-mdi.o monolib-menu.o monolib-minifram2.o monolib-msgdlg.o monolib-notebook.o monolib-radiobox.o monolib-radiobut.o monolib-scrolbar.o monolib-scrolwin.o monolib-slider.o monolib-spinbutt.o monolib-spinctrl.o monolib-statbmp.o monolib-statbox.o monolib-statline.o monolib-stattext.o monolib-tbargtk.o monolib-textctrl.o monolib-tglbtn.o monolib-utilsres.o monolib-wave1.o
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_1 = monolib-gsockmot.o monolib-accel1.o monolib-app4.o monolib-bmpbuttn1.o monolib-bmpmotif.o monolib-button1.o monolib-checkbox1.o monolib-checklst1.o monolib-choice1.o monolib-clipbrd4.o monolib-colour4.o monolib-combobox1.o monolib-combobox_native.o monolib-control1.o monolib-cursor4.o monolib-data4.o monolib-dataobj3.o monolib-dc4.o monolib-dcclient4.o monolib-dcmemory4.o monolib-dcscreen4.o monolib-dialog1.o monolib-evtloop4.o monolib-filedlg.o monolib-font4.o monolib-frame1.o monolib-gauge1.o monolib-gdiobj4.o monolib-glcanvas2.o monolib-icon4.o monolib-listbox1.o monolib-main3.o monolib-mdi1.o monolib-menu1.o monolib-menuitem.o monolib-minifram3.o monolib-msgdlg1.o monolib-palette3.o monolib-radiobox1.o monolib-radiobut1.o monolib-scrolbar1.o monolib-settings4.o monolib-slider1.o monolib-spinbutt1.o monolib-statbmp1.o monolib-statbox1.o monolib-stattext1.o monolib-toolbar.o monolib-textctrl1.o monolib-timer3.o monolib-toplevel4.o monolib-utils3.o monolib-window4.o monolib-fdrepdlg.o monolib-listctrl.o monolib-imaglist.o monolib-notebook1.o monolib-fontdlgg.o monolib-colrdlgg.o monolib-statline1.o monolib-tabg.o monolib-dirdlgg.o monolib-prntdlgg.o monolib-statusbr.o
 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_1 = monolib-access.o monolib-accel2.o monolib-bmpbuttn2.o monolib-button2.o monolib-checkbox2.o monolib-checklst2.o monolib-choice2.o monolib-colordlg.o monolib-combobox2.o monolib-control2.o monolib-dialog2.o monolib-dragimag.o monolib-fdrepdlg1.o monolib-filedlg1.o monolib-fontdlg1.o monolib-frame2.o monolib-gauge95.o monolib-imaglist1.o monolib-iniconf.o monolib-listbox2.o monolib-listctrl1.o monolib-mdi2.o monolib-menu2.o monolib-menuitem1.o monolib-metafile.o monolib-msgdlg2.o monolib-nativdlg.o monolib-notebook2.o monolib-ownerdrw.o monolib-penwin.o monolib-printdlg.o monolib-printwin.o monolib-radiobox2.o monolib-radiobut2.o monolib-scrolbar2.o monolib-slider95.o monolib-spinbutt2.o monolib-spinctrl1.o monolib-statbmp2.o monolib-statbox2.o monolib-statbr95.o monolib-statline2.o monolib-stattext2.o monolib-tabctrl.o monolib-tbar95.o monolib-textctrl2.o monolib-tglbtn1.o monolib-treectrl.o monolib-mslu.o
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_1 = monolib-gsocket2.o monolib-accel3.o monolib-aga.o monolib-app5.o monolib-bitmap4.o monolib-bmpbuttn3.o monolib-brush4.o monolib-button3.o monolib-checkbox3.o monolib-checklst3.o monolib-choice3.o monolib-clipbrd5.o monolib-colordlg1.o monolib-colour5.o monolib-combobox3.o monolib-control3.o monolib-cursor5.o monolib-data5.o monolib-dataobj4.o monolib-dc5.o monolib-dcclient5.o monolib-dcmemory5.o monolib-dcprint1.o monolib-dcscreen5.o monolib-dialog3.o monolib-dirdlg1.o monolib-dirmac.o monolib-dnd1.o monolib-filedlg2.o monolib-font5.o monolib-fontdlg2.o monolib-fontenum3.o monolib-fontutil3.o monolib-frame3.o monolib-gauge2.o monolib-gdiobj5.o monolib-icon5.o monolib-joystick3.o monolib-listbox3.o monolib-macnotfy.o monolib-mdi3.o monolib-menu3.o monolib-menuitem2.o monolib-metafile1.o monolib-mimetmac.o monolib-minifram4.o monolib-msgdlg3.o monolib-notebmac.o monolib-palette4.o monolib-pen4.o monolib-pnghand.o monolib-printdlg1.o monolib-printmac.o monolib-radiobox3.o monolib-radiobut3.o monolib-region4.o monolib-scrolbar3.o monolib-settings5.o monolib-slider2.o monolib-spinbutt3.o monolib-statbmp3.o monolib-statbox3.o monolib-statbrma.o monolib-statlmac.o monolib-stattext3.o monolib-tabctrl1.o monolib-textctrl3.o monolib-thread1.o monolib-timer4.o monolib-toplevel5.o monolib-toolbar1.o monolib-tooltip2.o monolib-uma.o monolib-utils4.o monolib-utilsexc1.o monolib-wave2.o monolib-window5.o monolib-MoreFilesX.o monolib-statusbr.o monolib-imaglist.o monolib-listctrl.o monolib-fdrepdlg.o monolib-tabg.o monolib-fontdlgg.o monolib-snglinst.o monolib-utilsunx.o

-@COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_1 = monolib-NSBox.o monolib-NSButton.o monolib-NSControl.o monolib-NSMenu.o monolib-NSPanel.o monolib-NSTextField.o monolib-NSView.o monolib-NSWindow.o monolib-app6.o monolib-bmpbuttn4.o monolib-bitmap5.o monolib-brush5.o monolib-button4.o monolib-checkbox4.o monolib-checklst4.o monolib-choice4.o monolib-colour6.o monolib-control4.o monolib-cursor6.o monolib-data6.o monolib-dc6.o monolib-dcclient6.o monolib-dcmemory6.o monolib-dcscreen6.o monolib-dialog4.o monolib-font6.o monolib-fontutil4.o monolib-frame4.o monolib-gdiobj6.o monolib-icon6.o monolib-listbox4.o monolib-main4.o monolib-menu4.o monolib-menuitem3.o monolib-pen5.o monolib-radiobox4.o monolib-radiobut4.o monolib-region5.o monolib-settings6.o monolib-slider3.o monolib-statbmp4.o monolib-statbox4.o monolib-statline21.o monolib-stattext4.o monolib-textctrl4.o monolib-toplevel6.o monolib-utils5.o monolib-utilsexc2.o monolib-window6.o monolib-statusbr.o monolib-imaglist.o monolib-listctrl.o monolib-fdrepdlg.o monolib-tabg.o monolib-fontdlgg.o monolib-snglinst.o monolib-utilsunx.o
+@COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_1 = monolib-NSBox.o monolib-NSButton.o monolib-NSControl.o monolib-NSMenu.o monolib-NSPanel.o monolib-NSTextField.o monolib-NSView.o monolib-NSWindow.o monolib-app6.o monolib-bmpbuttn4.o monolib-bitmap5.o monolib-brush5.o monolib-button4.o monolib-checkbox4.o monolib-checklst4.o monolib-choice4.o monolib-colour6.o monolib-control4.o monolib-cursor6.o monolib-data6.o monolib-dc6.o monolib-dcclient6.o monolib-dcmemory6.o monolib-dcscreen6.o monolib-dialog4.o monolib-font6.o monolib-fontutil4.o monolib-frame4.o monolib-gdiobj6.o monolib-icon6.o monolib-listbox4.o monolib-main4.o monolib-menu4.o monolib-menuitem3.o monolib-pen5.o monolib-radiobox4.o monolib-radiobut4.o monolib-region5.o monolib-settings6.o monolib-slider3.o monolib-statbmp4.o monolib-statbox4.o monolib-statline21.o monolib-stattext4.o monolib-textctrl4.o monolib-toplevel6.o monolib-utils5.o monolib-utilsexc2.o monolib-window6.o monolib-statusbr.o monolib-imaglist.o monolib-listctrl.o monolib-fdrepdlg.o monolib-tabg.o monolib-fontdlgg.o monolib-snglinst.o

 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_1 = monolib-accel4.o monolib-app7.o monolib-bitmap6.o monolib-bmpbuttn5.o monolib-brush6.o monolib-button5.o monolib-checkbox5.o monolib-checklst5.o monolib-choice5.o monolib-clipbrd6.o monolib-colour7.o monolib-combobox4.o monolib-control5.o monolib-cursor7.o monolib-data7.o monolib-dataobj5.o monolib-dc7.o monolib-dcclient7.o monolib-dcmemory7.o monolib-dcprint2.o monolib-dcscreen7.o monolib-dialog5.o monolib-dnd2.o monolib-filedlg3.o monolib-font7.o monolib-fontdlg3.o monolib-fontenum4.o monolib-fontutil5.o monolib-frame5.o monolib-gauge3.o monolib-gdiimage1.o monolib-gdiobj7.o monolib-helpwin1.o monolib-icon7.o monolib-iniconf1.o monolib-joystick4.o monolib-listbox5.o monolib-main5.o monolib-menu5.o monolib-menuitem4.o monolib-metafile2.o monolib-mimetype2.o monolib-msgdlg4.o monolib-nativdlg1.o monolib-notebook3.o monolib-ownerdrw1.o monolib-palette5.o monolib-pen6.o monolib-print.o monolib-radiobox5.o monolib-radiobut5.o monolib-region6.o monolib-scrolbar4.o monolib-settings7.o monolib-slider4.o monolib-spinbutt4.o monolib-spinctrl2.o monolib-statbmp5.o monolib-statbox5.o monolib-statline3.o monolib-stattext5.o monolib-tabctrl2.o monolib-textctrl5.o monolib-timer5.o monolib-thread2.o monolib-toolbar2.o monolib-tooltip3.o monolib-toplevel7.o monolib-wave3.o monolib-window7.o monolib-gsocket3.o monolib-gsockpm.o
 @COND_PLATFORM_WIN32_1@DLLIMPEXT = .a
 @COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX)
 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_1 = monolib-accel4.o monolib-app7.o monolib-bitmap6.o monolib-bmpbuttn5.o monolib-brush6.o monolib-button5.o monolib-checkbox5.o monolib-checklst5.o monolib-choice5.o monolib-clipbrd6.o monolib-colour7.o monolib-combobox4.o monolib-control5.o monolib-cursor7.o monolib-data7.o monolib-dataobj5.o monolib-dc7.o monolib-dcclient7.o monolib-dcmemory7.o monolib-dcprint2.o monolib-dcscreen7.o monolib-dialog5.o monolib-dnd2.o monolib-filedlg3.o monolib-font7.o monolib-fontdlg3.o monolib-fontenum4.o monolib-fontutil5.o monolib-frame5.o monolib-gauge3.o monolib-gdiimage1.o monolib-gdiobj7.o monolib-helpwin1.o monolib-icon7.o monolib-iniconf1.o monolib-joystick4.o monolib-listbox5.o monolib-main5.o monolib-menu5.o monolib-menuitem4.o monolib-metafile2.o monolib-mimetype2.o monolib-msgdlg4.o monolib-nativdlg1.o monolib-notebook3.o monolib-ownerdrw1.o monolib-palette5.o monolib-pen6.o monolib-print.o monolib-radiobox5.o monolib-radiobut5.o monolib-region6.o monolib-scrolbar4.o monolib-settings7.o monolib-slider4.o monolib-spinbutt4.o monolib-spinctrl2.o monolib-statbmp5.o monolib-statbox5.o monolib-statline3.o monolib-stattext5.o monolib-tabctrl2.o monolib-textctrl5.o monolib-timer5.o monolib-thread2.o monolib-toolbar2.o monolib-tooltip3.o monolib-toplevel7.o monolib-wave3.o monolib-window7.o monolib-gsocket3.o monolib-gsockpm.o
 @COND_PLATFORM_WIN32_1@DLLIMPEXT = .a
 @COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX)


@@ -1583,7 +1582,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS = gsockmot.o monodll-accel.o monodll-app3.o monodll-bmpbuttn.o bmpmotif.o monodll-button.o monodll-checkbox.o monodll-checklst.o monodll-choice.o monodll-clipbrd3.o monodll-colour3.o monodll-combobox.o combobox_native.o monodll-control.o monodll-cursor3.o monodll-data3.o monodll-dataobj2.o monodll-dc3.o monodll-dcclient3.o monodll-dcmemory3.o monodll-dcscreen3.o monodll-dialog.o monodll-evtloop3.o filedlg.o monodll-font3.o monodll-frame.o monodll-gauge.o monodll-gdiobj3.o monodll-glcanvas1.o monodll-icon3.o monodll-listbox.o monodll-main2.o monodll-mdi.o monodll-menu.o menuitem.o monodll-minifram2.o monodll-msgdlg.o monodll-palette2.o monodll-radiobox.o monodll-radiobut.o monodll-scrolbar.o monodll-settings3.o monodll-slider.o monodll-spinbutt.o monodll-statbmp.o monodll-statbox.o monodll-stattext.o toolbar.o monodll-textctrl.o monodll-timer2.o monodll-toplevel3.o monodll-utils2.o monodll-window3.o fdrepdlg.o listctrl.o imaglist.o monodll-notebook.o fontdlgg.o colrdlgg.o monodll-statline.o tabg.o dirdlgg.o prntdlgg.o statusbr.o
 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS = access.o monodll-accel1.o monodll-bmpbuttn1.o monodll-button1.o monodll-checkbox1.o monodll-checklst1.o monodll-choice1.o colordlg.o monodll-combobox1.o monodll-control1.o monodll-dialog1.o dragimag.o monodll-fdrepdlg.o monodll-filedlg.o monodll-fontdlg.o monodll-frame1.o gauge95.o monodll-imaglist.o iniconf.o monodll-listbox1.o monodll-listctrl.o monodll-mdi1.o monodll-menu1.o monodll-menuitem.o metafile.o monodll-msgdlg1.o nativdlg.o monodll-notebook1.o ownerdrw.o penwin.o printdlg.o printwin.o monodll-radiobox1.o monodll-radiobut1.o monodll-scrolbar1.o slider95.o monodll-spinbutt1.o monodll-spinctrl.o monodll-statbmp1.o monodll-statbox1.o statbr95.o monodll-statline1.o monodll-stattext1.o tabctrl.o tbar95.o monodll-textctrl1.o monodll-tglbtn.o treectrl.o mslu.o
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS = monodll-gsocket1.o monodll-accel2.o aga.o monodll-app4.o monodll-bitmap3.o monodll-bmpbuttn2.o monodll-brush3.o monodll-button2.o monodll-checkbox2.o monodll-checklst2.o monodll-choice2.o monodll-clipbrd4.o monodll-colordlg.o monodll-colour4.o monodll-combobox2.o monodll-control2.o monodll-cursor4.o monodll-data4.o monodll-dataobj3.o monodll-dc4.o monodll-dcclient4.o monodll-dcmemory4.o monodll-dcprint.o monodll-dcscreen4.o monodll-dialog2.o monodll-dirdlg.o dirmac.o monodll-dnd.o monodll-filedlg1.o monodll-font4.o monodll-fontdlg1.o monodll-fontenum2.o monodll-fontutil2.o monodll-frame2.o monodll-gauge1.o monodll-gdiobj4.o monodll-icon4.o monodll-joystick2.o monodll-listbox2.o macnotfy.o monodll-mdi2.o monodll-menu2.o monodll-menuitem1.o monodll-metafile.o mimetmac.o monodll-minifram3.o monodll-msgdlg2.o notebmac.o monodll-palette3.o monodll-pen3.o pnghand.o monodll-printdlg.o printmac.o monodll-radiobox2.o monodll-radiobut2.o monodll-region3.o monodll-scrolbar2.o monodll-settings4.o monodll-slider1.o monodll-spinbutt2.o monodll-statbmp2.o monodll-statbox2.o statbrma.o statlmac.o monodll-stattext2.o monodll-tabctrl.o monodll-textctrl2.o monodll-thread.o monodll-timer3.o monodll-toplevel4.o monodll-toolbar.o monodll-tooltip1.o uma.o monodll-utils3.o monodll-utilsexc.o monodll-wave1.o monodll-window4.o MoreFilesX.o statusbr.o imaglist.o listctrl.o fdrepdlg.o tabg.o fontdlgg.o snglinst.o utilsunx.o
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS = gsockmot.o monodll-accel.o monodll-app3.o monodll-bmpbuttn.o bmpmotif.o monodll-button.o monodll-checkbox.o monodll-checklst.o monodll-choice.o monodll-clipbrd3.o monodll-colour3.o monodll-combobox.o combobox_native.o monodll-control.o monodll-cursor3.o monodll-data3.o monodll-dataobj2.o monodll-dc3.o monodll-dcclient3.o monodll-dcmemory3.o monodll-dcscreen3.o monodll-dialog.o monodll-evtloop3.o filedlg.o monodll-font3.o monodll-frame.o monodll-gauge.o monodll-gdiobj3.o monodll-glcanvas1.o monodll-icon3.o monodll-listbox.o monodll-main2.o monodll-mdi.o monodll-menu.o menuitem.o monodll-minifram2.o monodll-msgdlg.o monodll-palette2.o monodll-radiobox.o monodll-radiobut.o monodll-scrolbar.o monodll-settings3.o monodll-slider.o monodll-spinbutt.o monodll-statbmp.o monodll-statbox.o monodll-stattext.o toolbar.o monodll-textctrl.o monodll-timer2.o monodll-toplevel3.o monodll-utils2.o monodll-window3.o fdrepdlg.o listctrl.o imaglist.o monodll-notebook.o fontdlgg.o colrdlgg.o monodll-statline.o tabg.o dirdlgg.o prntdlgg.o statusbr.o
 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS = access.o monodll-accel1.o monodll-bmpbuttn1.o monodll-button1.o monodll-checkbox1.o monodll-checklst1.o monodll-choice1.o colordlg.o monodll-combobox1.o monodll-control1.o monodll-dialog1.o dragimag.o monodll-fdrepdlg.o monodll-filedlg.o monodll-fontdlg.o monodll-frame1.o gauge95.o monodll-imaglist.o iniconf.o monodll-listbox1.o monodll-listctrl.o monodll-mdi1.o monodll-menu1.o monodll-menuitem.o metafile.o monodll-msgdlg1.o nativdlg.o monodll-notebook1.o ownerdrw.o penwin.o printdlg.o printwin.o monodll-radiobox1.o monodll-radiobut1.o monodll-scrolbar1.o slider95.o monodll-spinbutt1.o monodll-spinctrl.o monodll-statbmp1.o monodll-statbox1.o statbr95.o monodll-statline1.o monodll-stattext1.o tabctrl.o tbar95.o monodll-textctrl1.o monodll-tglbtn.o treectrl.o mslu.o
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS = monodll-gsocket1.o monodll-accel2.o aga.o monodll-app4.o monodll-bitmap3.o monodll-bmpbuttn2.o monodll-brush3.o monodll-button2.o monodll-checkbox2.o monodll-checklst2.o monodll-choice2.o monodll-clipbrd4.o monodll-colordlg.o monodll-colour4.o monodll-combobox2.o monodll-control2.o monodll-cursor4.o monodll-data4.o monodll-dataobj3.o monodll-dc4.o monodll-dcclient4.o monodll-dcmemory4.o monodll-dcprint.o monodll-dcscreen4.o monodll-dialog2.o monodll-dirdlg.o dirmac.o monodll-dnd.o monodll-filedlg1.o monodll-font4.o monodll-fontdlg1.o monodll-fontenum2.o monodll-fontutil2.o monodll-frame2.o monodll-gauge1.o monodll-gdiobj4.o monodll-icon4.o monodll-joystick2.o monodll-listbox2.o macnotfy.o monodll-mdi2.o monodll-menu2.o monodll-menuitem1.o monodll-metafile.o mimetmac.o monodll-minifram3.o monodll-msgdlg2.o notebmac.o monodll-palette3.o monodll-pen3.o pnghand.o monodll-printdlg.o printmac.o monodll-radiobox2.o monodll-radiobut2.o monodll-region3.o monodll-scrolbar2.o monodll-settings4.o monodll-slider1.o monodll-spinbutt2.o monodll-statbmp2.o monodll-statbox2.o statbrma.o statlmac.o monodll-stattext2.o monodll-tabctrl.o monodll-textctrl2.o monodll-thread.o monodll-timer3.o monodll-toplevel4.o monodll-toolbar.o monodll-tooltip1.o uma.o monodll-utils3.o monodll-utilsexc.o monodll-wave1.o monodll-window4.o MoreFilesX.o statusbr.o imaglist.o listctrl.o fdrepdlg.o tabg.o fontdlgg.o snglinst.o utilsunx.o

-@COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS = NSBox.o NSButton.o NSControl.o NSMenu.o NSPanel.o NSTextField.o NSView.o NSWindow.o monodll-app5.o monodll-bmpbuttn3.o monodll-bitmap4.o monodll-brush4.o monodll-button3.o monodll-checkbox3.o monodll-checklst3.o monodll-choice3.o monodll-colour5.o monodll-control3.o monodll-cursor5.o monodll-data5.o monodll-dc5.o monodll-dcclient5.o monodll-dcmemory5.o monodll-dcscreen5.o monodll-dialog3.o monodll-font5.o monodll-fontutil3.o monodll-frame3.o monodll-gdiobj5.o monodll-icon5.o monodll-listbox3.o monodll-main3.o monodll-menu3.o monodll-menuitem2.o monodll-pen4.o monodll-radiobox3.o monodll-radiobut3.o monodll-region4.o monodll-settings5.o monodll-slider2.o monodll-statbmp3.o monodll-statbox3.o statline2.o monodll-stattext3.o monodll-textctrl3.o monodll-toplevel5.o monodll-utils4.o monodll-utilsexc1.o monodll-window5.o statusbr.o imaglist.o listctrl.o fdrepdlg.o tabg.o fontdlgg.o snglinst.o utilsunx.o
+@COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS = NSBox.o NSButton.o NSControl.o NSMenu.o NSPanel.o NSTextField.o NSView.o NSWindow.o monodll-app5.o monodll-bmpbuttn3.o monodll-bitmap4.o monodll-brush4.o monodll-button3.o monodll-checkbox3.o monodll-checklst3.o monodll-choice3.o monodll-colour5.o monodll-control3.o monodll-cursor5.o monodll-data5.o monodll-dc5.o monodll-dcclient5.o monodll-dcmemory5.o monodll-dcscreen5.o monodll-dialog3.o monodll-font5.o monodll-fontutil3.o monodll-frame3.o monodll-gdiobj5.o monodll-icon5.o monodll-listbox3.o monodll-main3.o monodll-menu3.o monodll-menuitem2.o monodll-pen4.o monodll-radiobox3.o monodll-radiobut3.o monodll-region4.o monodll-settings5.o monodll-slider2.o monodll-statbmp3.o monodll-statbox3.o statline2.o monodll-stattext3.o monodll-textctrl3.o monodll-toplevel5.o monodll-utils4.o monodll-utilsexc1.o monodll-window5.o statusbr.o imaglist.o listctrl.o fdrepdlg.o tabg.o fontdlgg.o snglinst.o

 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS = monodll-accel3.o monodll-app6.o monodll-bitmap5.o monodll-bmpbuttn4.o monodll-brush5.o monodll-button4.o monodll-checkbox4.o monodll-checklst4.o monodll-choice4.o monodll-clipbrd5.o monodll-colour6.o monodll-combobox3.o monodll-control4.o monodll-cursor6.o monodll-data6.o monodll-dataobj4.o monodll-dc6.o monodll-dcclient6.o monodll-dcmemory6.o monodll-dcprint1.o monodll-dcscreen6.o monodll-dialog4.o monodll-dnd1.o monodll-filedlg2.o monodll-font6.o monodll-fontdlg2.o monodll-fontenum3.o monodll-fontutil4.o monodll-frame4.o monodll-gauge2.o monodll-gdiimage.o monodll-gdiobj6.o monodll-helpwin.o monodll-icon6.o monodll-iniconf.o monodll-joystick3.o monodll-listbox4.o monodll-main4.o monodll-menu4.o monodll-menuitem3.o monodll-metafile1.o monodll-mimetype1.o monodll-msgdlg3.o monodll-nativdlg.o monodll-notebook2.o monodll-ownerdrw.o monodll-palette4.o monodll-pen5.o print.o monodll-radiobox4.o monodll-radiobut4.o monodll-region5.o monodll-scrolbar3.o monodll-settings6.o monodll-slider3.o monodll-spinbutt3.o monodll-spinctrl1.o monodll-statbmp4.o monodll-statbox4.o monodll-statline2.o monodll-stattext4.o monodll-tabctrl1.o monodll-textctrl4.o monodll-timer4.o monodll-thread1.o monodll-toolbar1.o monodll-tooltip2.o monodll-toplevel6.o monodll-wave2.o monodll-window6.o monodll-gsocket2.o gsockpm.o
 @COND_PLATFORM_MACOSX_1@__htmldll___macinstnamecmd = -install_name $(libdir)/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)-2.5$(__htmldll___targetsuf2)
 @COND_SHARED_0_MONOLITHIC_0@__install_baselib___depname = install_baselib
 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS = monodll-accel3.o monodll-app6.o monodll-bitmap5.o monodll-bmpbuttn4.o monodll-brush5.o monodll-button4.o monodll-checkbox4.o monodll-checklst4.o monodll-choice4.o monodll-clipbrd5.o monodll-colour6.o monodll-combobox3.o monodll-control4.o monodll-cursor6.o monodll-data6.o monodll-dataobj4.o monodll-dc6.o monodll-dcclient6.o monodll-dcmemory6.o monodll-dcprint1.o monodll-dcscreen6.o monodll-dialog4.o monodll-dnd1.o monodll-filedlg2.o monodll-font6.o monodll-fontdlg2.o monodll-fontenum3.o monodll-fontutil4.o monodll-frame4.o monodll-gauge2.o monodll-gdiimage.o monodll-gdiobj6.o monodll-helpwin.o monodll-icon6.o monodll-iniconf.o monodll-joystick3.o monodll-listbox4.o monodll-main4.o monodll-menu4.o monodll-menuitem3.o monodll-metafile1.o monodll-mimetype1.o monodll-msgdlg3.o monodll-nativdlg.o monodll-notebook2.o monodll-ownerdrw.o monodll-palette4.o monodll-pen5.o print.o monodll-radiobox4.o monodll-radiobut4.o monodll-region5.o monodll-scrolbar3.o monodll-settings6.o monodll-slider3.o monodll-spinbutt3.o monodll-spinctrl1.o monodll-statbmp4.o monodll-statbox4.o monodll-statline2.o monodll-stattext4.o monodll-tabctrl1.o monodll-textctrl4.o monodll-timer4.o monodll-thread1.o monodll-toolbar1.o monodll-tooltip2.o monodll-toplevel6.o monodll-wave2.o monodll-window6.o monodll-gsocket2.o gsockpm.o
 @COND_PLATFORM_MACOSX_1@__htmldll___macinstnamecmd = -install_name $(libdir)/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)-2.5$(__htmldll___targetsuf2)
 @COND_SHARED_0_MONOLITHIC_0@__install_baselib___depname = install_baselib

diff --git a/contrib/src/gizmos/Makefile.in b/contrib/src/gizmos/Makefile.in
index 6fb1b583310cf55d2698aa4dd6f26e6be0c2b5ea..488017e15296bce0e56accd4fe77efd800d0d1ad 100644 (file)
--- a/contrib/src/gizmos/Makefile.in
+++ b/contrib/src/gizmos/Makefile.in
@@ -1,26 +1,215 @@
-# $Id$
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================

 
 

-top_srcdir = @top_srcdir@/..
-top_builddir = ../../..
-libsrc_dir = contrib/src/gizmos

 
 

-TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_gizmos-@WX_RELEASE@
+@MAKE_SET@

 
 

-LIBVERSION_CURRENT=@WX_CURRENT@
-LIBVERSION_REVISION=@WX_REVISION@
-LIBVERSION_AGE=@WX_AGE@
+CPPFLAGS = @CPPFLAGS@
+INSTALL_DIR = @INSTALL_DIR@
+DEREZ = @DEREZ@
+wxUSE_ZLIB = @wxUSE_ZLIB@
+MONOLITHIC = @MONOLITHIC@
+SONAME_FLAG = @SONAME_FLAG@
+CXXFLAGS = @CXXFLAGS@
+prefix = @prefix@
+INSTALL = @INSTALL@
+EXEEXT = @EXEEXT@
+RESCOMP = @RESCOMP@
+PLATFORM_MAC = @PLATFORM_MAC@
+USE_SOVERSION = @USE_SOVERSION@
+SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+wxUSE_LIBPNG = @wxUSE_LIBPNG@
+wxUSE_LIBTIFF = @wxUSE_LIBTIFF@
+exec_prefix = @exec_prefix@
+libdir = @libdir@
+TOOLKIT = @TOOLKIT@
+EXTRALIBS = @EXTRALIBS@
+CC = @CC@
+datadir = @datadir@
+PLATFORM_MSDOS = @PLATFORM_MSDOS@
+SETFILE = @SETFILE@
+UNICODE = @UNICODE@
+STRIP = @STRIP@
+USE_SOVERSOLARIS = @USE_SOVERSOLARIS@
+srcdir = @srcdir@
+wxUSE_ODBC = @wxUSE_ODBC@
+wxUSE_REGEX = @wxUSE_REGEX@
+bindir = @bindir@
+PIC_FLAG = @PIC_FLAG@
+USE_SOSYMLINKS = @USE_SOSYMLINKS@
+wxUSE_LIBJPEG = @wxUSE_LIBJPEG@
+INSTALL_DATA = @INSTALL_DATA@
+USE_GUI = @USE_GUI@
+PLATFORM_UNIX = @PLATFORM_UNIX@
+RANLIB = @RANLIB@
+SO_SUFFIX = @SO_SUFFIX@
+top_srcdir = @top_srcdir@
+AR = @AR@
+BUILD = @BUILD@
+PLATFORM_WIN32 = @PLATFORM_WIN32@
+USE_MACVERSION = @USE_MACVERSION@
+PLATFORM_MACOSX = @PLATFORM_MACOSX@
+DEPS_TRACKING = @DEPS_TRACKING@
+TOOLKIT_VERSION = @TOOLKIT_VERSION@
+WXUNIV = @WXUNIV@
+TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
+CXX = @CXX@
+SHARED_LD_CXX = @SHARED_LD_CXX@
+includedir = @includedir@
+LN_S = @LN_S@
+CFLAGS = @CFLAGS@
+DLLPREFIX = @DLLPREFIX@
+SHARED = @SHARED@
+USE_SOVERLINUX = @USE_SOVERLINUX@
+top_builddir = @top_builddir@
+SHARED_LD_CC = @SHARED_LD_CC@

 
 

+### Conditionally set variables: ###

 
 

-HEADER_PATH=$(top_srcdir)/contrib/include/wx
-HEADER_SUBDIR=gizmos
+@COND_USE_SOVERLINUX_1@__gizmosdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf2)
+@COND_USE_SOVERSOLARIS_1@__gizmosdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf3)
+@COND_UNICODE_1@WXUNICODEFLAG = u
+@COND_BUILD_DEBUG@WXDEBUGFLAG = d
+@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib
+@COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_inst_cmd = rm -f libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf2); \
+@COND_USE_SOSYMLINKS_1@                $(LN_S) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf3) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf2); \
+@COND_USE_SOSYMLINKS_1@                $(LN_S) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf2) libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_0@CXXC = $(CXX)
+@COND_SHARED_1@__install_gizmosdll___depname = install_gizmosdll
+@COND_USE_SOVERSION_1_PLATFORM_MACOSX_0@__gizmosdll___targetsuf3 = .$(SO_SUFFIX).0.0.0
+@COND_USE_SOVERSION_1_PLATFORM_MACOSX_1@__gizmosdll___targetsuf3 = .0.0.0.$(SO_SUFFIX)
+@COND_USE_SOVERSION_1_PLATFORM_MACOSX_0@__gizmosdll___targetsuf2 = .$(SO_SUFFIX).0
+@COND_USE_SOVERSION_1_PLATFORM_MACOSX_1@__gizmosdll___targetsuf2 = .0.$(SO_SUFFIX)
+@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
+@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc
+@COND_PLATFORM_WIN32_1@__gizmosdll___importlib = -Wl,--out-implib,libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT)
+@COND_PLATFORM_WIN32_1@__gizmosdll___importlib = -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT)
+@COND_WXUNIV_1@WXUNIVNAME = univ
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
+@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
+@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
+@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
+@COND_SHARED_0@__gizmoslib___depname = $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5.a
+@COND_SHARED_1@__gizmosdll___depname = $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf3)
+@COND_PLATFORM_MACOSX_1@__gizmosdll___macver = -compatibility_version 2.5 -current_version 2.5.0
+@COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_cmd = rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf2); \
+@COND_USE_SOSYMLINKS_1@                $(LN_S) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf3) $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf2); \
+@COND_USE_SOSYMLINKS_1@                $(LN_S) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf2) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)
+@COND_DEPS_TRACKING_0@CCC = $(CC)
+@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
+@COND_SHARED_0@__install_gizmoslib___depname = install_gizmoslib
+@COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
+@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a
+@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX)
+@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__
+@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
+@COND_PLATFORM_MACOSX_1@__gizmosdll___macinstnamecmd = -install_name $(libdir)/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf2)
+@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = -D__WXUNIVERSAL__
+@COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5
+@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
+@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff
+@COND_USE_GUI_0@PORTNAME = base
+@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex
+@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex
+@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff
+@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng

 
 

-HEADERS=multicell.h splittree.h editlbox.h dynamicsash.h ledctrl.h statpict.h
+### Targets: ###

 
 

-OBJECTS=multicell.o splittree.o editlbox.o dynamicsash.o ledctrl.o statpict.o
-DEPFILES=$(OBJECTS:.o=.d)
+all: $(__gizmosdll___depname) $(__gizmoslib___depname)

 
 

-APPEXTRADEFS=-I$(top_srcdir)/contrib/include
+install-strip: install
+       $(STRIP) $(libdir)/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf3)

 
 

-include $(top_builddir)/src/makelib.env
+$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5.a: gizmoslib-dynamicsash.o gizmoslib-editlbox.o gizmoslib-ledctrl.o gizmoslib-multicell.o gizmoslib-splittree.o gizmoslib-statpict.o
+       rm -f $@
+       $(AR) rcu $@  gizmoslib-dynamicsash.o gizmoslib-editlbox.o gizmoslib-ledctrl.o gizmoslib-multicell.o gizmoslib-splittree.o gizmoslib-statpict.o
+       $(RANLIB) $@

 
 

--include $(DEPFILES)
+gizmoslib-editlbox.o: $(srcdir)/editlbox.cpp
+       $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include $(CXXFLAGS) $<
+
+distclean: clean
+       rm -f configure config.cache config.log config.status
+       rm -f bk-deps shared-ld-sh
+
+install_gizmosdll: 
+       $(INSTALL_DIR) $(libdir)
+       $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) $(libdir)
+       $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf3) $(libdir)
+       (cd $(libdir) ; $(__gizmosdll___so_symlinks_inst_cmd))
+
+gizmoslib-ledctrl.o: $(srcdir)/ledctrl.cpp
+       $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include $(CXXFLAGS) $<
+
+editlbox.o: $(srcdir)/editlbox.cpp
+       $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG) $<
+
+$(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf3): dynamicsash.o editlbox.o ledctrl.o multicell.o splittree.o statpict.o
+       $(SHARED_LD_CXX) $@  dynamicsash.o editlbox.o ledctrl.o multicell.o splittree.o statpict.o  $(__gizmosdll___importlib) -L$(top_builddir)lib $(__gizmosdll___importlib) $(__gizmosdll___macinstnamecmd) $(__gizmosdll___soname_flags) $(__gizmosdll___macver) $(__WXLIB_MONO_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__WXLIB_CORE_p)
+       $(__gizmosdll___so_symlinks_cmd)
+
+gizmoslib-splittree.o: $(srcdir)/splittree.cpp
+       $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include $(CXXFLAGS) $<
+
+install: all $(__install_gizmosdll___depname) $(__install_gizmoslib___depname)
+       $(INSTALL_DIR) $(includedir)
+       for f in wx/gizmos/dynamicsash.h wx/gizmos/editlbox.h wx/gizmos/ledctrl.h wx/gizmos/multicell.h wx/gizmos/splittree.h wx/gizmos/statpict.h; do \
+       if test ! -d $(includedir)/`dirname $$f` ; then \
+       $(INSTALL_DIR) $(includedir)/`dirname $$f`; \
+       fi; \
+       $(INSTALL_DATA) $(srcdir)/../../include//$$f $(includedir)/$$f; \
+       done
+
+ledctrl.o: $(srcdir)/ledctrl.cpp
+       $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG) $<
+
+gizmoslib-multicell.o: $(srcdir)/multicell.cpp
+       $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include $(CXXFLAGS) $<
+
+dynamicsash.o: $(srcdir)/dynamicsash.cpp
+       $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG) $<
+
+multicell.o: $(srcdir)/multicell.cpp
+       $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG) $<
+
+clean: 
+       rm -f ./*.o ./.deps/*
+       rm -f $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf3) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT)
+       rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf2)
+       rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5.a
+
+statpict.o: $(srcdir)/statpict.cpp
+       $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG) $<
+
+gizmoslib-statpict.o: $(srcdir)/statpict.cpp
+       $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include $(CXXFLAGS) $<
+
+gizmoslib-dynamicsash.o: $(srcdir)/dynamicsash.cpp
+       $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include $(CXXFLAGS) $<
+
+splittree.o: $(srcdir)/splittree.cpp
+       $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG) $<
+
+install_gizmoslib: 
+       $(INSTALL_DIR) $(libdir)
+       $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5.a $(libdir)
+
+uninstall: 
+
+
+# Include dependency info, if present:
+@IF_GNU_MAKE@-include .deps/*.d
+
+.PHONY: all

diff --git a/contrib/src/xrc/Makefile.in b/contrib/src/xrc/Makefile.in
index eeb8347abd1030eac510de8bc8f90164de750625..19d1a54952fb23022df449e2614a3a656a28c91e 100644 (file)
--- a/contrib/src/xrc/Makefile.in
+++ b/contrib/src/xrc/Makefile.in
@@ -76,7 +76,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_USE_SOVERSION_1_PLATFORM_MACOSX_0@__xrcdll___targetsuf2 = .$(SO_SUFFIX).0
 @COND_USE_SOVERSION_1_PLATFORM_MACOSX_1@__xrcdll___targetsuf2 = .0.$(SO_SUFFIX)
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_USE_SOVERSION_1_PLATFORM_MACOSX_0@__xrcdll___targetsuf2 = .$(SO_SUFFIX).0
 @COND_USE_SOVERSION_1_PLATFORM_MACOSX_1@__xrcdll___targetsuf2 = .0.$(SO_SUFFIX)


@@ -98,7 +98,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_USE_SOVERLINUX_1@__xrcdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2)
 @COND_USE_SOVERSOLARIS_1@__xrcdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3)
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_USE_SOVERLINUX_1@__xrcdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2)
 @COND_USE_SOVERSOLARIS_1@__xrcdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3)
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_PLATFORM_MACOSX_1@__xrcdll___macver = -compatibility_version 2.5 -current_version 2.5.0
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_PLATFORM_MACOSX_1@__xrcdll___macver = -compatibility_version 2.5 -current_version 2.5.0
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5


@@ -400,7 +400,7 @@ xrclib-xh_dlg.o: $(srcdir)/xh_dlg.cpp
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
 
 clean: 
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a
        rm -f $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a

diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in
index 8094f79ba3765c6ba4503af0c3aa5d3e02c4e51e..32a5c048a0ed76a513214f353f07a715d02efdd4 100644 (file)
--- a/samples/access/Makefile.in
+++ b/samples/access/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc


@@ -88,7 +88,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_MAC_1@__accesstest___mac_setfilecmd = $(SETFILE) -a C accesstest$(EXEEXT)
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_WIN32_1@__accesstest___win32rc = accesstest_rc.o
 @COND_PLATFORM_MAC_1@__accesstest___mac_setfilecmd = $(SETFILE) -a C accesstest$(EXEEXT)
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_WIN32_1@__accesstest___win32rc = accesstest_rc.o

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -117,7 +117,7 @@ all: accesstest$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f accesstest$(EXEEXT)
 
 install: all
        rm -f accesstest$(EXEEXT)
 
 install: all

diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in
index 8671a00c188958b0baecf3ea97db7db7a35ff336..59ef6d35e77e1461c37001e3ffc36cd58d412aad 100644 (file)
--- a/samples/artprov/Makefile.in
+++ b/samples/artprov/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_PLATFORM_MAC_1@__arttest___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_PLATFORM_MAC_1@__arttest___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_MAC_1@__arttest___mac_setfilecmd = $(SETFILE) -a C arttest$(EXEEXT)
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_MAC_1@__arttest___mac_setfilecmd = $(SETFILE) -a C arttest$(EXEEXT)
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -122,7 +122,7 @@ arttest$(EXEEXT): arttest.o artbrows.o $(__arttest___win32rc)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f arttest$(EXEEXT)
 
 install: all
        rm -f arttest$(EXEEXT)
 
 install: all

diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in
index 648c42a498ea41027cf2e24f9a0a6469bc5e5bff..4e233d931169cdf17dee9e9cac2be9e616726adf 100644 (file)
--- a/samples/calendar/Makefile.in
+++ b/samples/calendar/Makefile.in
@@ -75,7 +75,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_PLATFORM_MAC_1@__calendar___mac_setfilecmd = $(SETFILE) -a C calendar$(EXEEXT)
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_PLATFORM_MAC_1@__calendar___mac_setfilecmd = $(SETFILE) -a C calendar$(EXEEXT)
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_PLATFORM_MAC_1@__calendar___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_PLATFORM_MAC_1@__calendar___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -120,7 +120,7 @@ calendar_rc.o: $(srcdir)/calendar.rc
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f calendar$(EXEEXT)
 
 install: all
        rm -f calendar$(EXEEXT)
 
 install: all

diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in
index a773c33cca08d1ec10e45545bdcdd8259fb4f59c..637dd6e171a666faf0d7fc1a2e9446a6fdf305b8 100644 (file)
--- a/samples/caret/Makefile.in
+++ b/samples/caret/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -87,7 +87,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_MAC_1@__caret___mac_setfilecmd = $(SETFILE) -a C caret$(EXEEXT)
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_MAC_1@__caret___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_PLATFORM_MAC_1@__caret___mac_setfilecmd = $(SETFILE) -a C caret$(EXEEXT)
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_MAC_1@__caret___mac_rezcmd = $(__MACOSX_RESOURCES_p)

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -122,7 +122,7 @@ caret$(EXEEXT): caret.o $(__caret___win32rc)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f caret$(EXEEXT)
 
 install: all
        rm -f caret$(EXEEXT)
 
 install: all

diff --git a/samples/checklst/Makefile.in b/samples/checklst/Makefile.in
index 6b3a21ee2d532898fc2362672ebb7c2b2ffce300..1518533faadca33a787d09ec19fcafd30d392ddc 100644 (file)
--- a/samples/checklst/Makefile.in
+++ b/samples/checklst/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_PLATFORM_MAC_1@__checklst___mac_setfilecmd = $(SETFILE) -a C checklst$(EXEEXT)
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_PLATFORM_MAC_1@__checklst___mac_setfilecmd = $(SETFILE) -a C checklst$(EXEEXT)

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_PLATFORM_WIN32_1@__checklst___win32rc = checklst_rc.o
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_PLATFORM_WIN32_1@__checklst___win32rc = checklst_rc.o


@@ -88,7 +88,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -117,7 +117,7 @@ all: checklst$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f checklst$(EXEEXT)
 
 install: all
        rm -f checklst$(EXEEXT)
 
 install: all

diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in
index 3ba66a1ffeff8f6c5ec7d1f8140292fe4f7c2d56..d671c0d427c7cb95330a9dfd13ac290dae0f8b5f 100644 (file)
--- a/samples/config/Makefile.in
+++ b/samples/config/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_MAC_1@__conftest___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_MAC_1@__conftest___mac_rezcmd = $(__MACOSX_RESOURCES_p)

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -117,7 +117,7 @@ all: conftest$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f conftest$(EXEEXT)
 
 install: all
        rm -f conftest$(EXEEXT)
 
 install: all

diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in
index 953a2f1dd081450f047fa66197735625caa02042..6fd4108effee54cfa934f397a1803817fdfe812b 100644 (file)
--- a/samples/console/Makefile.in
+++ b/samples/console/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -84,7 +84,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -123,7 +123,7 @@ console$(EXEEXT): console.o
        $(__console___mac_setfilecmd)
 
 clean: 
        $(__console___mac_setfilecmd)
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f console$(EXEEXT)
        rm -f ./testdata.fc
 
        rm -f console$(EXEEXT)
        rm -f ./testdata.fc
 

diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in
index 4be335cbe4ed1088fb2c744200403b2753527564..8bee58b1f19128414170a59b011cc1ed47efe8b0 100644 (file)
--- a/samples/controls/Makefile.in
+++ b/samples/controls/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -117,7 +117,7 @@ all: controls$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f controls$(EXEEXT)
 
 install: all
        rm -f controls$(EXEEXT)
 
 install: all

diff --git a/samples/db/Makefile.in b/samples/db/Makefile.in
index fbd7f019e2eca07dec76fb7da84e56408be63a0e..08ddeede78038e294c869bc5141dac836e6fe9b8 100644 (file)
--- a/samples/db/Makefile.in
+++ b/samples/db/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_MAC_1@__dbtest___mac_setfilecmd = $(SETFILE) -a C dbtest$(EXEEXT)
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_MAC_1@__dbtest___mac_setfilecmd = $(SETFILE) -a C dbtest$(EXEEXT)
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -120,7 +120,7 @@ listdb.o: $(srcdir)/listdb.cpp
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $<
 
 clean: 
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $<
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f dbtest$(EXEEXT)
 
 install: all
        rm -f dbtest$(EXEEXT)
 
 install: all

diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in
index d34ef7fb5c38813eac6941198a0f4b9d6faed6ef..9aeca5557ff019915d56dac224626cca9d44c14b 100644 (file)
--- a/samples/dialogs/Makefile.in
+++ b/samples/dialogs/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_MAC_1@__dialogs___mac_setfilecmd = $(SETFILE) -a C dialogs$(EXEEXT)
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_MAC_1@__dialogs___mac_setfilecmd = $(SETFILE) -a C dialogs$(EXEEXT)
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -125,7 +125,7 @@ dialogs$(EXEEXT): dialogs.o $(__dialogs___win32rc)
        $(__dialogs___mac_setfilecmd)
 
 clean: 
        $(__dialogs___mac_setfilecmd)
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f dialogs$(EXEEXT)
        rm -f ./tips.txt
 
        rm -f dialogs$(EXEEXT)
        rm -f ./tips.txt
 

diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in
index d1416b98379f044ec746fd3a07055b4ebea371f2..f1669666644fc7089434195bd44db5d46257e1a9 100644 (file)
--- a/samples/dialup/Makefile.in
+++ b/samples/dialup/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_PLATFORM_MAC_1@__nettest___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_PLATFORM_MAC_1@__nettest___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_MAC_1@__nettest___mac_setfilecmd = $(SETFILE) -a C nettest$(EXEEXT)
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_MAC_1@__nettest___mac_setfilecmd = $(SETFILE) -a C nettest$(EXEEXT)

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -120,7 +120,7 @@ nettest_rc.o: $(srcdir)/nettest.rc
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f nettest$(EXEEXT)
 
 install: all
        rm -f nettest$(EXEEXT)
 
 install: all

diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in
index 5548de3eadc081c9545b7d24fd567b90f280bd4d..2519acf56f8f69d80d4ad54d8dd4189e7bc6332e 100644 (file)
--- a/samples/display/Makefile.in
+++ b/samples/display/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_PLATFORM_MAC_1@__display___mac_setfilecmd = $(SETFILE) -a C display$(EXEEXT)
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_PLATFORM_MAC_1@__display___mac_setfilecmd = $(SETFILE) -a C display$(EXEEXT)


@@ -116,7 +116,7 @@ all: display$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f display$(EXEEXT)
 
 install: all
        rm -f display$(EXEEXT)
 
 install: all

diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in
index cae361b4ea1c26809ac7f616a04002cf99a79438..d656b228879331538070f78de8a2d8da8902c6a5 100644 (file)
--- a/samples/dnd/Makefile.in
+++ b/samples/dnd/Makefile.in
@@ -75,7 +75,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_PLATFORM_WIN32_1@__dnd___win32rc = dnd_rc.o
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_PLATFORM_WIN32_1@__dnd___win32rc = dnd_rc.o
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -87,7 +87,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_MAC_1@__dnd___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_MAC_1@__dnd___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -127,7 +127,7 @@ dnd$(EXEEXT): dnd.o $(__dnd___win32rc)
        $(__dnd___mac_setfilecmd)
 
 clean: 
        $(__dnd___mac_setfilecmd)
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f dnd$(EXEEXT)
        rm -f ./julian.png ./dnd.wxr
 
        rm -f dnd$(EXEEXT)
        rm -f ./julian.png ./dnd.wxr
 

diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in
index ee3cf18ed65ad12d437038dee9874a944eac2e58..82726e24f4f35c279481828ebfbfb8514cebb7dd 100644 (file)
--- a/samples/docview/Makefile.in
+++ b/samples/docview/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -87,7 +87,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_MAC_1@__docview___mac_setfilecmd = $(SETFILE) -a C docview$(EXEEXT)
 @COND_PLATFORM_WIN32_1@__docview___win32rc = docview_rc.o
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_MAC_1@__docview___mac_setfilecmd = $(SETFILE) -a C docview$(EXEEXT)
 @COND_PLATFORM_WIN32_1@__docview___win32rc = docview_rc.o

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -133,7 +133,7 @@ docview.o: $(srcdir)/docview.cpp
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $<
 
 clean: 
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $<
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f docview$(EXEEXT)
 
 doc.o: $(srcdir)/doc.cpp
        rm -f docview$(EXEEXT)
 
 doc.o: $(srcdir)/doc.cpp

diff --git a/samples/docvwmdi/Makefile.in b/samples/docvwmdi/Makefile.in
index ee3cf18ed65ad12d437038dee9874a944eac2e58..82726e24f4f35c279481828ebfbfb8514cebb7dd 100644 (file)
--- a/samples/docvwmdi/Makefile.in
+++ b/samples/docvwmdi/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -87,7 +87,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_MAC_1@__docview___mac_setfilecmd = $(SETFILE) -a C docview$(EXEEXT)
 @COND_PLATFORM_WIN32_1@__docview___win32rc = docview_rc.o
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_MAC_1@__docview___mac_setfilecmd = $(SETFILE) -a C docview$(EXEEXT)
 @COND_PLATFORM_WIN32_1@__docview___win32rc = docview_rc.o

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -133,7 +133,7 @@ docview.o: $(srcdir)/docview.cpp
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $<
 
 clean: 
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $<
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f docview$(EXEEXT)
 
 doc.o: $(srcdir)/doc.cpp
        rm -f docview$(EXEEXT)
 
 doc.o: $(srcdir)/doc.cpp

diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in
index 43f97e3f8c4e8d59582005dbde770622f4a96e78..7139378c1b434c5acb62c44ded8bb8a37f11468e 100644 (file)
--- a/samples/dragimag/Makefile.in
+++ b/samples/dragimag/Makefile.in
@@ -75,7 +75,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_MAC_1@__dragimag___mac_setfilecmd = $(SETFILE) -a C dragimag$(EXEEXT)
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_PLATFORM_MAC_1@__dragimag___mac_setfilecmd = $(SETFILE) -a C dragimag$(EXEEXT)
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -87,7 +87,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_WIN32_1@__dragimag___win32rc = dragimag_rc.o
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_WIN32_1@__dragimag___win32rc = dragimag_rc.o

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -122,7 +122,7 @@ dragimag$(EXEEXT): dragimag.o $(__dragimag___win32rc)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f dragimag$(EXEEXT)
        rm -f ./backgrnd.png ./shape01.png ./shape02.png ./shape03.png
 
        rm -f dragimag$(EXEEXT)
        rm -f ./backgrnd.png ./shape01.png ./shape02.png ./shape03.png
 

diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in
index 7ec91631283c211b2b57ddc91d1202dc46d545d8..c7cbc4fc1845726a8f180b2dc5a9b7e440a2ee33 100644 (file)
--- a/samples/drawing/Makefile.in
+++ b/samples/drawing/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_PLATFORM_MAC_1@__drawing___mac_setfilecmd = $(SETFILE) -a C drawing$(EXEEXT)
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_PLATFORM_MAC_1@__drawing___mac_setfilecmd = $(SETFILE) -a C drawing$(EXEEXT)

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -105,7 +105,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o drawing$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o drawing$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex
 @COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex
 @COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex


@@ -117,7 +117,7 @@ all: drawing$(EXEEXT) data
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f drawing$(EXEEXT)
        rm -f ./pat4.bmp ./pat35.bmp ./pat36.bmp ./image.bmp ./mask.bmp
 
        rm -f drawing$(EXEEXT)
        rm -f ./pat4.bmp ./pat35.bmp ./pat36.bmp ./image.bmp ./mask.bmp
 

diff --git a/samples/dynamic/Makefile.in b/samples/dynamic/Makefile.in
index 4453d7f169b824a031b855084a516cdde9524a47..9098ceb38b9314b28256ff04afb94a61625e022a 100644 (file)
--- a/samples/dynamic/Makefile.in
+++ b/samples/dynamic/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_PLATFORM_MAC_1@__dynamic___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_PLATFORM_MAC_1@__dynamic___mac_rezcmd = $(__MACOSX_RESOURCES_p)

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -117,7 +117,7 @@ all: dynamic$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f dynamic$(EXEEXT)
 
 install: all
        rm -f dynamic$(EXEEXT)
 
 install: all

diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in
index f9e0f21d45d85ec47dd92880d8b8c88a221b7a17..acdb0c5997989d4c9d9f952e783ea94d75435a48 100644 (file)
--- a/samples/erase/Makefile.in
+++ b/samples/erase/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_PLATFORM_MAC_1@__erase___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_PLATFORM_MAC_1@__erase___mac_rezcmd = $(__MACOSX_RESOURCES_p)


@@ -122,7 +122,7 @@ erase$(EXEEXT): erase.o $(__erase___win32rc)
        $(__erase___mac_setfilecmd)
 
 clean: 
        $(__erase___mac_setfilecmd)
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f erase$(EXEEXT)
 
 install: all
        rm -f erase$(EXEEXT)
 
 install: all

diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in
index 2463b3d912a6001f9cef40150b3e0379c7863856..9c270be3950235291e5a780e18f83078086181c5 100644 (file)
--- a/samples/event/Makefile.in
+++ b/samples/event/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_PLATFORM_MAC_1@__event___mac_setfilecmd = $(SETFILE) -a C event$(EXEEXT)
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_PLATFORM_MAC_1@__event___mac_setfilecmd = $(SETFILE) -a C event$(EXEEXT)


@@ -105,7 +105,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o event$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o event$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex
 @COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex
 @COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex


@@ -117,7 +117,7 @@ all: event$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f event$(EXEEXT)
 
 install: all
        rm -f event$(EXEEXT)
 
 install: all

diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in
index 51a7702d36c3cbe8403a2b800974e1c90f11235e..a36cdd609a92af5a54b0cbe7a7dc993f69d78afb 100644 (file)
--- a/samples/exec/Makefile.in
+++ b/samples/exec/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_PLATFORM_MAC_1@__exec___mac_setfilecmd = $(SETFILE) -a C exec$(EXEEXT)
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_PLATFORM_MAC_1@__exec___mac_setfilecmd = $(SETFILE) -a C exec$(EXEEXT)
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -87,7 +87,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_WIN32_1@__exec___win32rc = exec_rc.o
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_WIN32_1@__exec___win32rc = exec_rc.o
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -120,7 +120,7 @@ exec_rc.o: $(srcdir)/exec.rc
        $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir)
 
 clean: 
        $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir)
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f exec$(EXEEXT)
 
 install: all
        rm -f exec$(EXEEXT)
 
 install: all

diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in
index a0f5671b1c250d06deb504e6ea5a9213218fb2a0..1b48d73cc7158128f6d7c8e30148273c0872de53 100644 (file)
--- a/samples/font/Makefile.in
+++ b/samples/font/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__


@@ -87,7 +87,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_WIN32_1@__font___win32rc = font_rc.o
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_WIN32_1@__font___win32rc = font_rc.o

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -120,7 +120,7 @@ font.o: $(srcdir)/font.cpp
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f font$(EXEEXT)
 
 install: all
        rm -f font$(EXEEXT)
 
 install: all

diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in
index 40f4e7e1ac88fb77533d59ee9a535872d69b0ce7..00cc3e7017d0e21ad74c28884f0410a4fa6d109a 100644 (file)
--- a/samples/grid/Makefile.in
+++ b/samples/grid/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_PLATFORM_MAC_1@__grid___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_PLATFORM_MAC_1@__grid___mac_rezcmd = $(__MACOSX_RESOURCES_p)

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -125,7 +125,7 @@ grid$(EXEEXT): grid.o $(__grid___win32rc)
        $(__grid___mac_setfilecmd)
 
 clean: 
        $(__grid___mac_setfilecmd)
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f grid$(EXEEXT)
 
 install: all
        rm -f grid$(EXEEXT)
 
 install: all

diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in
index 8be159b3d6b7ee16bfddbde51d284a7c20368b69..d1b12edcca386ebe42b3ac171b4d897d0597e7e8 100644 (file)
--- a/samples/help/Makefile.in
+++ b/samples/help/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -85,7 +85,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -117,7 +117,7 @@ all: help$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f help$(EXEEXT)
 
 install: all
        rm -f help$(EXEEXT)
 
 install: all

diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in
index 10e5ecbb640e927fc396e4fa8eeca7e872cac12d..3f304f70bc6e8bfa69391f6ca1a401146736149c 100644 (file)
--- a/samples/htlbox/Makefile.in
+++ b/samples/htlbox/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_PLATFORM_WIN32_1@__htlbox___win32rc = htlbox_rc.o
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_PLATFORM_WIN32_1@__htlbox___win32rc = htlbox_rc.o


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -117,7 +117,7 @@ all: htlbox$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f htlbox$(EXEEXT)
 
 install: all
        rm -f htlbox$(EXEEXT)
 
 install: all

diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in
index 9441bd9a1ec3bb5be81740c991d1cd2bf4f7c91e..c158c090f2595337fea0504e8a035267d0fe6189 100644 (file)
--- a/samples/image/Makefile.in
+++ b/samples/image/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_PLATFORM_WIN32_1@__image___win32rc = image_rc.o
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_PLATFORM_WIN32_1@__image___win32rc = image_rc.o
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -85,7 +85,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5


@@ -117,7 +117,7 @@ all: image$(EXEEXT) data
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f image$(EXEEXT)
        rm -f ./horse.png ./horse.jpg ./horse.bmp ./horse.gif ./horse.pcx ./horse.pnm ./horse.tif ./horse.xpm ./horse.cur ./horse.ico ./horse3.ani ./smile.xbm
 
        rm -f image$(EXEEXT)
        rm -f ./horse.png ./horse.jpg ./horse.bmp ./horse.gif ./horse.pcx ./horse.pnm ./horse.tif ./horse.xpm ./horse.cur ./horse.ico ./horse3.ani ./smile.xbm
 

diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in
index cdec01e6966d7b212a5ced834c22d36620f9bc7f..e526327d0ef4370c0dc2ea5b2ddb23c9074b1d38 100644 (file)
--- a/samples/internat/Makefile.in
+++ b/samples/internat/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -85,7 +85,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -120,7 +120,7 @@ internat.o: $(srcdir)/internat.cpp
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f internat$(EXEEXT)
 
 install: all
        rm -f internat$(EXEEXT)
 
 install: all

diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in
index 4388a1f712f76b461fc3010fcdfbcdf2ad23821b..a21616ad6159bf311f5536135b0221e7c326c4ab 100644 (file)
--- a/samples/ipc/Makefile.in
+++ b/samples/ipc/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUNIV_1@WXUNIVNAME = univ


@@ -87,7 +87,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_MAC_1@__ipc___mac_setfilecmd = $(SETFILE) -a C ipc$(EXEEXT)
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_MAC_1@__ipc___mac_setfilecmd = $(SETFILE) -a C ipc$(EXEEXT)
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -117,7 +117,7 @@ all: ipc$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f ipc$(EXEEXT)
 
 install: all
        rm -f ipc$(EXEEXT)
 
 install: all

diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in
index c48566196da8c15c721c223abfaafe99050f4e61..f82898857261425b7a6277214207485e25521b47 100644 (file)
--- a/samples/joytest/Makefile.in
+++ b/samples/joytest/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_MAC_1@__joytest___mac_setfilecmd = $(SETFILE) -a C joytest$(EXEEXT)
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_MAC_1@__joytest___mac_setfilecmd = $(SETFILE) -a C joytest$(EXEEXT)

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_PLATFORM_WIN32_1@__joytest___win32rc = joytest_rc.o
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_PLATFORM_WIN32_1@__joytest___win32rc = joytest_rc.o


@@ -117,7 +117,7 @@ all: joytest$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f joytest$(EXEEXT)
 
 install: all
        rm -f joytest$(EXEEXT)
 
 install: all

diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in
index b6d040da6f7b8e6308ccde7fd1cd2c6f5936019b..8f4b4bc826cac3d9c66fd6196c3b668c1dcdf866 100644 (file)
--- a/samples/keyboard/Makefile.in
+++ b/samples/keyboard/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -85,7 +85,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -117,7 +117,7 @@ all: keyboard$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f keyboard$(EXEEXT)
 
 install: all
        rm -f keyboard$(EXEEXT)
 
 install: all

diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in
index bc31b38ce49ec573c3c5c8324cfd048d4c9d398e..1f065fd141007b8a1ae48fe8eec87f1c16f7390d 100644 (file)
--- a/samples/layout/Makefile.in
+++ b/samples/layout/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -87,7 +87,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -127,7 +127,7 @@ layout_rc.o: $(srcdir)/layout.rc
        $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir)
 
 clean: 
        $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir)
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f layout$(EXEEXT)
 
 distclean: clean
        rm -f layout$(EXEEXT)
 
 distclean: clean

diff --git a/samples/listbox/Makefile.in b/samples/listbox/Makefile.in
index cf205c46286cf2eadabb5acd306d17a1ddeaa9e3..4e24f5bc428b408b0097d8e7e642a9ce4b64b64e 100644 (file)
--- a/samples/listbox/Makefile.in
+++ b/samples/listbox/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_PLATFORM_MAC_1@__listbox___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_PLATFORM_MAC_1@__listbox___mac_rezcmd = $(__MACOSX_RESOURCES_p)


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -117,7 +117,7 @@ all: listbox$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f listbox$(EXEEXT)
 
 install: all
        rm -f listbox$(EXEEXT)
 
 install: all

diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in
index e4ebfbddc98deec1a36fa431a0ff64a14fd8ca96..f8127866711619c89cb9eaaba8fc6ecb6cd412c9 100644 (file)
--- a/samples/listctrl/Makefile.in
+++ b/samples/listctrl/Makefile.in
@@ -75,7 +75,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@__listctrl___win32rc = listctrl_rc.o
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_PLATFORM_WIN32_1@__listctrl___win32rc = listctrl_rc.o
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__


@@ -87,7 +87,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -122,7 +122,7 @@ listctrl$(EXEEXT): listctrl.o $(__listctrl___win32rc)
        $(__listctrl___mac_setfilecmd)
 
 clean: 
        $(__listctrl___mac_setfilecmd)
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f listctrl$(EXEEXT)
 
 install: all
        rm -f listctrl$(EXEEXT)
 
 install: all

diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in
index a4be6fc21cf1458ff515d456f3929143cf7ea5ce..fb054be2ffac9b067869539f669b81212fbba559 100644 (file)
--- a/samples/mdi/Makefile.in
+++ b/samples/mdi/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -88,7 +88,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_WIN32_1@__mdi___win32rc = mdi_rc.o
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_WIN32_1@__mdi___win32rc = mdi_rc.o
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -125,7 +125,7 @@ mdi$(EXEEXT): mdi.o $(__mdi___win32rc)
        $(__mdi___mac_setfilecmd)
 
 clean: 
        $(__mdi___mac_setfilecmd)
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f mdi$(EXEEXT)
 
 install: all
        rm -f mdi$(EXEEXT)
 
 install: all

diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in
index 86e8fb6f0e650728698ea4f8ed6a6b4b9fc40a89..f2bc63951801954773811e3c5ec843fb0a63bfba 100644 (file)
--- a/samples/memcheck/Makefile.in
+++ b/samples/memcheck/Makefile.in
@@ -75,7 +75,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_MAC_1@__memcheck___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_PLATFORM_MAC_1@__memcheck___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_PLATFORM_MAC_1@__memcheck___mac_setfilecmd = $(SETFILE) -a C memcheck$(EXEEXT)
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_PLATFORM_MAC_1@__memcheck___mac_setfilecmd = $(SETFILE) -a C memcheck$(EXEEXT)
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -127,7 +127,7 @@ memcheck$(EXEEXT): memcheck.o $(__memcheck___win32rc)
        $(__memcheck___mac_setfilecmd)
 
 clean: 
        $(__memcheck___mac_setfilecmd)
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f memcheck$(EXEEXT)
 
 distclean: clean
        rm -f memcheck$(EXEEXT)
 
 distclean: clean

diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in
index 62c40f9f4c72fca1b75d02348f3514ec1d557ca9..c1b43f7f8bbff1b8ab49f88bb00650a40e5acbd3 100644 (file)
--- a/samples/menu/Makefile.in
+++ b/samples/menu/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -88,7 +88,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_MAC_1@__menu___mac_setfilecmd = $(SETFILE) -a C menu$(EXEEXT)
 @COND_PLATFORM_MAC_1@__menu___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_PLATFORM_WIN32_1@__menu___win32rc = menu_rc.o
 @COND_PLATFORM_MAC_1@__menu___mac_setfilecmd = $(SETFILE) -a C menu$(EXEEXT)
 @COND_PLATFORM_MAC_1@__menu___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_PLATFORM_WIN32_1@__menu___win32rc = menu_rc.o

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -117,7 +117,7 @@ all: menu$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f menu$(EXEEXT)
 
 install: all
        rm -f menu$(EXEEXT)
 
 install: all

diff --git a/samples/mfc/Makefile.in b/samples/mfc/Makefile.in
index 4987839c4532a1d0ab3309c9613ff5f6dabee6c3..95ab2a3c4079d65684c97d1f495727ca09939440 100644 (file)
--- a/samples/mfc/Makefile.in
+++ b/samples/mfc/Makefile.in
@@ -75,7 +75,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_PLATFORM_MAC_1@__mfc___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_PLATFORM_MAC_1@__mfc___mac_rezcmd = $(__MACOSX_RESOURCES_p)


@@ -87,7 +87,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -125,7 +125,7 @@ mfc$(EXEEXT): mfc.o $(__mfc___win32rc)
        $(__mfc___mac_setfilecmd)
 
 clean: 
        $(__mfc___mac_setfilecmd)
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f mfc$(EXEEXT)
 
 install: all
        rm -f mfc$(EXEEXT)
 
 install: all

diff --git a/samples/minifram/Makefile.in b/samples/minifram/Makefile.in
index 7cf07fc0dc2cb45c469cf87b46972ec662628670..c079d7deee026f228cf4db9ecc2e3e535f55047a 100644 (file)
--- a/samples/minifram/Makefile.in
+++ b/samples/minifram/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -88,7 +88,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_MAC_1@__minifram___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_PLATFORM_WIN32_1@__minifram___win32rc = minifram_rc.o
 @COND_PLATFORM_MAC_1@__minifram___mac_setfilecmd = $(SETFILE) -a C minifram$(EXEEXT)
 @COND_PLATFORM_MAC_1@__minifram___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_PLATFORM_WIN32_1@__minifram___win32rc = minifram_rc.o
 @COND_PLATFORM_MAC_1@__minifram___mac_setfilecmd = $(SETFILE) -a C minifram$(EXEEXT)

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -120,7 +120,7 @@ minifram.o: $(srcdir)/minifram.cpp
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f minifram$(EXEEXT)
 
 install: all
        rm -f minifram$(EXEEXT)
 
 install: all

diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in
index 64e17e1f4e0e5fa110c21d5455de6e83d206dcd9..225a134a0ca330b25c40c6162128b272260ab587 100644 (file)
--- a/samples/minimal/Makefile.in
+++ b/samples/minimal/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -87,7 +87,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_MAC_1@__minimal___mac_setfilecmd = $(SETFILE) -a C minimal$(EXEEXT)
 @COND_PLATFORM_WIN32_1@__minimal___win32rc = minimal_rc.o
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_MAC_1@__minimal___mac_setfilecmd = $(SETFILE) -a C minimal$(EXEEXT)
 @COND_PLATFORM_WIN32_1@__minimal___win32rc = minimal_rc.o

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -116,7 +116,7 @@ all: minimal$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f minimal$(EXEEXT)
 
 install: all
        rm -f minimal$(EXEEXT)
 
 install: all

diff --git a/samples/mobile/Makefile.in b/samples/mobile/Makefile.in
index 2362152fe365750ca0c6ddd7196888f6cc057f54..ff248b1e8c844781346b68d7cd6f7a662c5086d4 100644 (file)
--- a/samples/mobile/Makefile.in
+++ b/samples/mobile/Makefile.in
@@ -86,14 +86,14 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_WIN32_1@__mobile___win32rc = mobile_rc.o
 @COND_PLATFORM_MAC_1@__mobile___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_WIN32_1@__mobile___win32rc = mobile_rc.o
 @COND_PLATFORM_MAC_1@__mobile___mac_rezcmd = $(__MACOSX_RESOURCES_p)

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_PLATFORM_WIN32_1@DLLIMPEXT = .a
 @COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX)
 @COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_PLATFORM_WIN32_1@DLLIMPEXT = .a
 @COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX)
 @COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
 @COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
 @COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff


@@ -117,7 +117,7 @@ all: mobile$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f mobile$(EXEEXT)
 
 install: all
        rm -f mobile$(EXEEXT)
 
 install: all

diff --git a/samples/multimon/Makefile.in b/samples/multimon/Makefile.in
index e6c5ea8240da7498d091c601b193c6294370ffad..a55a73274df22625f4760e0b7a35e37885a98214 100644 (file)
--- a/samples/multimon/Makefile.in
+++ b/samples/multimon/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc


@@ -87,7 +87,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_WIN32_1@__multimon___win32rc = multimon_rc.o
 @COND_PLATFORM_MAC_1@__multimon___mac_setfilecmd = $(SETFILE) -a C multimon$(EXEEXT)
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_WIN32_1@__multimon___win32rc = multimon_rc.o
 @COND_PLATFORM_MAC_1@__multimon___mac_setfilecmd = $(SETFILE) -a C multimon$(EXEEXT)

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -122,7 +122,7 @@ multimon$(EXEEXT): multimon.o $(__multimon___win32rc)
        $(__multimon___mac_setfilecmd)
 
 clean: 
        $(__multimon___mac_setfilecmd)
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f multimon$(EXEEXT)
 
 install: all
        rm -f multimon$(EXEEXT)
 
 install: all

diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in
index 87aafe8e22b58ab7fdda1ddc2bfaf929b4b095b2..f3786dd73e6322742f3265a0205454b5f87b4560 100644 (file)
--- a/samples/nativdlg/Makefile.in
+++ b/samples/nativdlg/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -122,7 +122,7 @@ nativdlg$(EXEEXT): nativdlg.o $(__nativdlg___win32rc)
        $(__nativdlg___mac_setfilecmd)
 
 clean: 
        $(__nativdlg___mac_setfilecmd)
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f nativdlg$(EXEEXT)
 
 install: all
        rm -f nativdlg$(EXEEXT)
 
 install: all

diff --git a/samples/newgrid/Makefile.in b/samples/newgrid/Makefile.in
index e2d0812cb3e8a8dff4bfabf9c4ecba05cf5529fd..c1d8d237d8ceeb79c66ceb2092248c450f60dfde 100644 (file)
--- a/samples/newgrid/Makefile.in
+++ b/samples/newgrid/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_MAC_1@__newgrid___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_MAC_1@__newgrid___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -117,7 +117,7 @@ all: newgrid$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f newgrid$(EXEEXT)
 
 install: all
        rm -f newgrid$(EXEEXT)
 
 install: all

diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in
index 5fefb1fbfb5f50495a5e5a84f7afa0c9d4ec7955..37739bad4b1d466411f8ee9a338f07a0914e4ae5 100644 (file)
--- a/samples/notebook/Makefile.in
+++ b/samples/notebook/Makefile.in
@@ -75,7 +75,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -87,7 +87,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -122,7 +122,7 @@ notebook$(EXEEXT): notebook.o $(__notebook___win32rc)
        $(__notebook___mac_setfilecmd)
 
 clean: 
        $(__notebook___mac_setfilecmd)
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f notebook$(EXEEXT)
 
 install: all
        rm -f notebook$(EXEEXT)
 
 install: all

diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in
index dad9c9e3889d7dabae3b78def7679b37190872b5..e9f328213b4a01cd4934278889c98a2cdd9d46cf 100644 (file)
--- a/samples/oleauto/Makefile.in
+++ b/samples/oleauto/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -87,7 +87,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_PLATFORM_MAC_1@__oleauto___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_PLATFORM_MAC_1@__oleauto___mac_rezcmd = $(__MACOSX_RESOURCES_p)


@@ -117,7 +117,7 @@ all: oleauto$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f oleauto$(EXEEXT)
 
 install: all
        rm -f oleauto$(EXEEXT)
 
 install: all

diff --git a/samples/opengl/Makefile.in b/samples/opengl/Makefile.in
index a428167d9d724efd999bb1442378e06dcce548c9..a0f5f4e65eabdf09d642d0c0fc43dd4ed954ee6b 100644 (file)
--- a/samples/opengl/Makefile.in
+++ b/samples/opengl/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_PLATFORM_WIN32_1@__opengl___win32rc = opengl_rc.o
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_PLATFORM_WIN32_1@__opengl___win32rc = opengl_rc.o

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -87,7 +87,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_MAC_1@__opengl___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_MAC_1@__opengl___mac_rezcmd = $(__MACOSX_RESOURCES_p)

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -123,7 +123,7 @@ opengl_rc.o: $(srcdir)/opengl.rc
        $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir)
 
 clean: 
        $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir)
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f opengl$(EXEEXT)
 
 install: all
        rm -f opengl$(EXEEXT)
 
 install: all

diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in
index a235b56a3043ebda3bdab665a5251365b6cd75b1..b738a998591a9c600d89a1293368132a3593383d 100644 (file)
--- a/samples/ownerdrw/Makefile.in
+++ b/samples/ownerdrw/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -117,7 +117,7 @@ all: ownerdrw$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f ownerdrw$(EXEEXT)
 
 install: all
        rm -f ownerdrw$(EXEEXT)
 
 install: all

diff --git a/samples/png/Makefile.in b/samples/png/Makefile.in
index 53016bfca01060cb0d4402d9bc9a7ce31c896697..c84b33cffb18308eafd75ad7a561dafad3da4aaa 100644 (file)
--- a/samples/png/Makefile.in
+++ b/samples/png/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_PLATFORM_WIN32_1@__png___win32rc = png_rc.o
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_PLATFORM_WIN32_1@__png___win32rc = png_rc.o

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -117,7 +117,7 @@ all: png$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f png$(EXEEXT)
 
 install: all
        rm -f png$(EXEEXT)
 
 install: all

diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in
index b55aad051c51eade0833f88a6c86e77789b5f95f..1c862a9c5b40be62672bfee49a81ad003bf6d197 100644 (file)
--- a/samples/printing/Makefile.in
+++ b/samples/printing/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc


@@ -87,7 +87,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_WIN32_1@__printing___win32rc = printing_rc.o
 @COND_PLATFORM_MAC_1@__printing___mac_setfilecmd = $(SETFILE) -a C printing$(EXEEXT)
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_WIN32_1@__printing___win32rc = printing_rc.o
 @COND_PLATFORM_MAC_1@__printing___mac_setfilecmd = $(SETFILE) -a C printing$(EXEEXT)

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -122,7 +122,7 @@ printing$(EXEEXT): printing.o $(__printing___win32rc)
        $(__printing___mac_setfilecmd)
 
 clean: 
        $(__printing___mac_setfilecmd)
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f printing$(EXEEXT)
 
 install: all
        rm -f printing$(EXEEXT)
 
 install: all

diff --git a/samples/propsize/Makefile.in b/samples/propsize/Makefile.in
index f654086a6241128e580a804ff28a347dbfa0a8e3..84ab41743370fb987ff5530191d9ac34ccbf8a5d 100644 (file)
--- a/samples/propsize/Makefile.in
+++ b/samples/propsize/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_PLATFORM_WIN32_1@__propsize___win32rc = propsize_rc.o
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_PLATFORM_WIN32_1@__propsize___win32rc = propsize_rc.o


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_PLATFORM_MAC_1@__propsize___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_PLATFORM_MAC_1@__propsize___mac_rezcmd = $(__MACOSX_RESOURCES_p)


@@ -117,7 +117,7 @@ all: propsize$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f propsize$(EXEEXT)
 
 install: all
        rm -f propsize$(EXEEXT)
 
 install: all

diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in
index d41b2bfddaeb83cadf704d301109f0a9c7b25542..8dcd1863d93e267ea3e1abb27c6bbffb39b3c557 100644 (file)
--- a/samples/regtest/Makefile.in
+++ b/samples/regtest/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_MAC_1@__regtest___mac_setfilecmd = $(SETFILE) -a C regtest$(EXEEXT)
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_MAC_1@__regtest___mac_setfilecmd = $(SETFILE) -a C regtest$(EXEEXT)

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -117,7 +117,7 @@ all: regtest$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f regtest$(EXEEXT)
 
 install: all
        rm -f regtest$(EXEEXT)
 
 install: all

diff --git a/samples/richedit/Makefile.in b/samples/richedit/Makefile.in
index 4e582cd87530b664eac8a69589dbaa874cbafbc9..fb0c6305e05527d2a67e8c11086042eced2b7d29 100644 (file)
--- a/samples/richedit/Makefile.in
+++ b/samples/richedit/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -87,7 +87,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_MAC_1@__richedit___mac_setfilecmd = $(SETFILE) -a C richedit$(EXEEXT)
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_MAC_1@__richedit___mac_setfilecmd = $(SETFILE) -a C richedit$(EXEEXT)

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -130,7 +130,7 @@ richedit.o: $(srcdir)/richedit.cpp
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $<
 
 clean: 
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $<
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f richedit$(EXEEXT)
 
 distclean: clean
        rm -f richedit$(EXEEXT)
 
 distclean: clean

diff --git a/samples/rotate/Makefile.in b/samples/rotate/Makefile.in
index b39e045ac20386f1272ef70da8180c7599e06125..0b948d5c07a7ab2dcc7ff9f15fb4e4c0545bd777 100644 (file)
--- a/samples/rotate/Makefile.in
+++ b/samples/rotate/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -85,7 +85,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_PLATFORM_MAC_1@__rotate___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_PLATFORM_MAC_1@__rotate___mac_rezcmd = $(__MACOSX_RESOURCES_p)


@@ -125,7 +125,7 @@ rotate.o: $(srcdir)/rotate.cpp
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $<
 
 clean: 
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $<
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f rotate$(EXEEXT)
 
 install: all
        rm -f rotate$(EXEEXT)
 
 install: all

diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in
index f59f256485ffad9481bb5666fc560fbc848f51bb..306c2f3b6adc9752c7e83a819cc43959d599a10f 100644 (file)
--- a/samples/sashtest/Makefile.in
+++ b/samples/sashtest/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_PLATFORM_WIN32_1@__sashtest___win32rc = sashtest_rc.o
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_PLATFORM_WIN32_1@__sashtest___win32rc = sashtest_rc.o


@@ -117,7 +117,7 @@ all: sashtest$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f sashtest$(EXEEXT)
 
 install: all
        rm -f sashtest$(EXEEXT)
 
 install: all

diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in
index 94d06e879545ababa9f6833bf0238dcc4a2f8785..5c659f8e110fb5f759347257e6c12a3f8c7c91c3 100644 (file)
--- a/samples/scroll/Makefile.in
+++ b/samples/scroll/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -85,7 +85,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_PLATFORM_WIN32_1@__scroll___win32rc = scroll_rc.o
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_PLATFORM_WIN32_1@__scroll___win32rc = scroll_rc.o


@@ -117,7 +117,7 @@ all: scroll$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f scroll$(EXEEXT)
 
 install: all
        rm -f scroll$(EXEEXT)
 
 install: all

diff --git a/samples/scrollsub/Makefile.in b/samples/scrollsub/Makefile.in
index 3ffdfce77f9a73ead66c5f02379a877f7eda88ee..dee01b52b8d04c123739ecea5f84d9bd8e65fc42 100644 (file)
--- a/samples/scrollsub/Makefile.in
+++ b/samples/scrollsub/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_PLATFORM_WIN32_1@__scrollsub___win32rc = scrollsub_rc.o
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_PLATFORM_WIN32_1@__scrollsub___win32rc = scrollsub_rc.o


@@ -87,7 +87,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -117,7 +117,7 @@ all: scrollsub$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f scrollsub$(EXEEXT)
 
 install: all
        rm -f scrollsub$(EXEEXT)
 
 install: all

diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in
index 9760001ffc894b39863d5de4119db3d462baab8c..495df45348d8d0a4fd33996212d1cd63ce992525 100644 (file)
--- a/samples/shaped/Makefile.in
+++ b/samples/shaped/Makefile.in
@@ -75,7 +75,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -87,7 +87,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_MAC_1@__shaped___mac_setfilecmd = $(SETFILE) -a C shaped$(EXEEXT)
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_MAC_1@__shaped___mac_setfilecmd = $(SETFILE) -a C shaped$(EXEEXT)

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -123,7 +123,7 @@ shaped_rc.o: $(srcdir)/shaped.rc
        $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir)
 
 clean: 
        $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir)
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f shaped$(EXEEXT)
 
 install: all
        rm -f shaped$(EXEEXT)
 
 install: all

diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in
index 74cb4ddb9474c5e0b284832a64622e7759248d8c..3ade40f22df4437fecba6331f44cabdc067817ce 100644 (file)
--- a/samples/sockets/Makefile.in
+++ b/samples/sockets/Makefile.in
@@ -75,7 +75,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -117,7 +117,7 @@ all: sockets$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f sockets$(EXEEXT)
 
 install: all
        rm -f sockets$(EXEEXT)
 
 install: all

diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in
index 8510e2e9c50d91195103dea35889dee49d5214d3..3404f09eb12b96dc6bab7256415f52f677d2ef14 100644 (file)
--- a/samples/splitter/Makefile.in
+++ b/samples/splitter/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -117,7 +117,7 @@ all: splitter$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f splitter$(EXEEXT)
 
 install: all
        rm -f splitter$(EXEEXT)
 
 install: all

diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in
index a161175971fdd5494c6d492ab15c308474de90a3..705fcdcff82ad0f9cd8b65669e3f5d71a6ba0221 100644 (file)
--- a/samples/statbar/Makefile.in
+++ b/samples/statbar/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -87,7 +87,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_MAC_1@__statbar___mac_setfilecmd = $(SETFILE) -a C statbar$(EXEEXT)
 @COND_PLATFORM_WIN32_1@__statbar___win32rc = statbar_rc.o
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_MAC_1@__statbar___mac_setfilecmd = $(SETFILE) -a C statbar$(EXEEXT)
 @COND_PLATFORM_WIN32_1@__statbar___win32rc = statbar_rc.o

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -120,7 +120,7 @@ statbar_rc.o: $(srcdir)/statbar.rc
        $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir)
 
 clean: 
        $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir)
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f statbar$(EXEEXT)
 
 install: all
        rm -f statbar$(EXEEXT)
 
 install: all

diff --git a/samples/tab/Makefile.in b/samples/tab/Makefile.in
index 8d5ded52df6946c065eefdf7b53acbbc79024bbe..698c94afb7c4e76006d61bdc687a0113a43891cf 100644 (file)
--- a/samples/tab/Makefile.in
+++ b/samples/tab/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_PLATFORM_WIN32_1@__tab___win32rc = tab_rc.o
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_PLATFORM_WIN32_1@__tab___win32rc = tab_rc.o
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -85,7 +85,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -120,7 +120,7 @@ tab_rc.o: $(srcdir)/tab.rc
        $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir)
 
 clean: 
        $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir)
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f tab$(EXEEXT)
 
 install: all
        rm -f tab$(EXEEXT)
 
 install: all

diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in
index 74fe8f378f95213544ecdd0a05e34ea34e30d4e9..c4cb7757125f95e9821b2fe767d03b697dce74e3 100644 (file)
--- a/samples/taskbar/Makefile.in
+++ b/samples/taskbar/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -117,7 +117,7 @@ all: taskbar$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f taskbar$(EXEEXT)
 
 install: all
        rm -f taskbar$(EXEEXT)
 
 install: all

diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in
index e76c041ba61a4b494e77f06f6556d2fd73d7b84b..7b0421d7cff1bb85af81c84d90fb13f6bfab15b9 100644 (file)
--- a/samples/text/Makefile.in
+++ b/samples/text/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -117,7 +117,7 @@ all: text$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f text$(EXEEXT)
 
 install: all
        rm -f text$(EXEEXT)
 
 install: all

diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in
index 00b3dd26d148aa27b8c70064f637745865928646..cf252fcf12fbcf29faddeec439f32b71d5aa23d9 100644 (file)
--- a/samples/thread/Makefile.in
+++ b/samples/thread/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_PLATFORM_MAC_1@__thread___mac_setfilecmd = $(SETFILE) -a C thread$(EXEEXT)
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_PLATFORM_MAC_1@__thread___mac_setfilecmd = $(SETFILE) -a C thread$(EXEEXT)


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_PLATFORM_MAC_1@__thread___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_PLATFORM_MAC_1@__thread___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -117,7 +117,7 @@ all: thread$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f thread$(EXEEXT)
 
 install: all
        rm -f thread$(EXEEXT)
 
 install: all

diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in
index eb591054218184f509ca5f88f5edb251c60a7d64..53ff3565269ec0201c0ab3542679ad21f83ada3a 100644 (file)
--- a/samples/toolbar/Makefile.in
+++ b/samples/toolbar/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__


@@ -87,7 +87,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_WIN32_1@__toolbar___win32rc = toolbar_rc.o
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_WIN32_1@__toolbar___win32rc = toolbar_rc.o

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5


@@ -117,7 +117,7 @@ all: toolbar$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f toolbar$(EXEEXT)
 
 install: all
        rm -f toolbar$(EXEEXT)
 
 install: all

diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in
index fa792cc0a0e432ade519bcd0266cca1bb7e729bf..3846052e2f82e1b18bd21b9ada2ac733dbf5b429 100644 (file)
--- a/samples/treectrl/Makefile.in
+++ b/samples/treectrl/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -85,7 +85,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -122,7 +122,7 @@ treectrl$(EXEEXT): treectrl.o $(__treectrl___win32rc)
        $(__treectrl___mac_setfilecmd)
 
 clean: 
        $(__treectrl___mac_setfilecmd)
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f treectrl$(EXEEXT)
 
 install: all
        rm -f treectrl$(EXEEXT)
 
 install: all

diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in
index da5c2a0617416ab0988782e4dc34b41e29f985aa..7cb2ad47e6254b7343870fbe4b50b10ddd11d0da 100644 (file)
--- a/samples/typetest/Makefile.in
+++ b/samples/typetest/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -120,7 +120,7 @@ typetest.o: $(srcdir)/typetest.cpp
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $<
 
 clean: 
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $<
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f typetest$(EXEEXT)
 
 install: all
        rm -f typetest$(EXEEXT)
 
 install: all

diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in
index ce5db7a50398f26225f72a8a8d6788079b9332d8..7230c19427c1882830b8ffb55fe4429a10757eaf 100644 (file)
--- a/samples/validate/Makefile.in
+++ b/samples/validate/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -85,7 +85,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -120,7 +120,7 @@ validate_rc.o: $(srcdir)/validate.rc
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f validate$(EXEEXT)
 
 install: all
        rm -f validate$(EXEEXT)
 
 install: all

diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in
index e351507bb04f1098ca4517df5073c88cfdbc89e3..26e2d0f43fe7c9ca5aade90adee1562d91573a62 100644 (file)
--- a/samples/vscroll/Makefile.in
+++ b/samples/vscroll/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_PLATFORM_WIN32_1@__vscroll___win32rc = vscroll_rc.o
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_PLATFORM_WIN32_1@__vscroll___win32rc = vscroll_rc.o
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_MAC_1@__vscroll___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_MAC_1@__vscroll___mac_rezcmd = $(__MACOSX_RESOURCES_p)

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -117,7 +117,7 @@ all: vscroll$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f vscroll$(EXEEXT)
 
 install: all
        rm -f vscroll$(EXEEXT)
 
 install: all

diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in
index fba3953305ffd1e4dd19993ecef4a26859d6152b..df5554a91135f0d8a39f3ff97658535c5b323919 100644 (file)
--- a/samples/widgets/Makefile.in
+++ b/samples/widgets/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -87,7 +87,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_MAC_1@__widgets___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_MAC_1@__widgets___mac_rezcmd = $(__MACOSX_RESOURCES_p)

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -117,7 +117,7 @@ all: widgets$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f widgets$(EXEEXT)
 
 install: all
        rm -f widgets$(EXEEXT)
 
 install: all

diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in
index 6cd24e33aebc5ea3590d6cd8252434883c2bee4e..a90a9a12ea1f1ba98a9683003c313a7e018f8349 100644 (file)
--- a/samples/wizard/Makefile.in
+++ b/samples/wizard/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -86,7 +86,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -117,7 +117,7 @@ all: wizard$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f wizard$(EXEEXT)
 
 install: all
        rm -f wizard$(EXEEXT)
 
 install: all

diff --git a/samples/wxtest/Makefile.in b/samples/wxtest/Makefile.in
index 3eee0736cd1c316ebdcdf62204d7ada3653f9897..ab755362433a0054f86ed706d39dcaf5b8ece6ef 100644 (file)
--- a/samples/wxtest/Makefile.in
+++ b/samples/wxtest/Makefile.in
@@ -74,7 +74,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_PLATFORM_MAC_1@__wxtest___mac_setfilecmd = $(SETFILE) -a C wxtest$(EXEEXT)
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_PLATFORM_MAC_1@__wxtest___mac_setfilecmd = $(SETFILE) -a C wxtest$(EXEEXT)
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng


@@ -87,7 +87,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_WIN32_1@__wxtest___win32rc = wxtest_rc.o
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_WIN32_1@__wxtest___win32rc = wxtest_rc.o
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5


@@ -123,7 +123,7 @@ wxtest_rc.o: $(srcdir)/wxtest.rc
        $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir)
 
 clean: 
        $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir)
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f wxtest$(EXEEXT)
 
 install: all
        rm -f wxtest$(EXEEXT)
 
 install: all

diff --git a/src/xrc/Makefile.in b/src/xrc/Makefile.in
index eeb8347abd1030eac510de8bc8f90164de750625..19d1a54952fb23022df449e2614a3a656a28c91e 100644 (file)
--- a/src/xrc/Makefile.in
+++ b/src/xrc/Makefile.in
@@ -76,7 +76,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__

-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)

 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_USE_SOVERSION_1_PLATFORM_MACOSX_0@__xrcdll___targetsuf2 = .$(SO_SUFFIX).0
 @COND_USE_SOVERSION_1_PLATFORM_MACOSX_1@__xrcdll___targetsuf2 = .0.$(SO_SUFFIX)
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_USE_SOVERSION_1_PLATFORM_MACOSX_0@__xrcdll___targetsuf2 = .$(SO_SUFFIX).0
 @COND_USE_SOVERSION_1_PLATFORM_MACOSX_1@__xrcdll___targetsuf2 = .0.$(SO_SUFFIX)


@@ -98,7 +98,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_USE_SOVERLINUX_1@__xrcdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2)
 @COND_USE_SOVERSOLARIS_1@__xrcdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3)
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_USE_SOVERLINUX_1@__xrcdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2)
 @COND_USE_SOVERSOLARIS_1@__xrcdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3)
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_PLATFORM_MACOSX_1@__xrcdll___macver = -compatibility_version 2.5 -current_version 2.5.0
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_PLATFORM_MACOSX_1@__xrcdll___macver = -compatibility_version 2.5 -current_version 2.5.0
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5


@@ -400,7 +400,7 @@ xrclib-xh_dlg.o: $(srcdir)/xh_dlg.cpp
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
 
 clean: 
        $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
 
 clean: 

-       rm -f ./*.o
+       rm -f ./*.o ./.deps/*

        rm -f $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a
        rm -f $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a