X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dbeb8eacae2401b0b6fd72455435f269c85f2365..3956d02ab62d0a03025d0122d2982b7a7a58f098:/build/bakefiles/make_dist.mk diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk index ca84a4ca3c..a1206e03c1 100644 --- a/build/bakefiles/make_dist.mk +++ b/build/bakefiles/make_dist.mk @@ -5,7 +5,7 @@ ############################# Dirs ################################# -WXDIR = @abs_top_srcdir@ +WXDIR = $(top_srcdir) # Subordinate library possibilities @@ -14,6 +14,7 @@ GENDIR = $(WXDIR)/src/generic COMMDIR = $(WXDIR)/src/common HTMLDIR = $(WXDIR)/src/html RICHTEXTDIR = $(WXDIR)/src/richtext +AUIDIR = $(WXDIR)/src/aui UNIXDIR = $(WXDIR)/src/unix PNGDIR = $(WXDIR)/src/png JPEGDIR = $(WXDIR)/src/jpeg @@ -22,6 +23,7 @@ ZLIBDIR = $(WXDIR)/src/zlib REGEXDIR = $(WXDIR)/src/regex EXPATDIR = $(WXDIR)/src/expat GTKDIR = $(WXDIR)/src/gtk +GTK1DIR = $(WXDIR)/src/gtk1 X11DIR = $(WXDIR)/src/x11 X11INC = $(WXDIR)/include/wx/x11 MGLDIR = $(WXDIR)/src/mgl @@ -63,8 +65,8 @@ DISTDIR=./_dist_dir/$(DISTDIRNAME) ########################## Tools ############################### -CP_PR = @LNDIR@ -CP_P = $(LN_S) -f +CP_PR = cp -pR +CP_P = cp -p ########################## make dist rules ############################### @@ -77,6 +79,7 @@ ALL_DIST: distrib_clean $(CP_P) $(WXDIR)/configure $(DISTDIR) $(CP_P) $(WXDIR)/autoconf_inc.m4 $(DISTDIR) $(CP_P) $(WXDIR)/wxwin.m4 $(DISTDIR) + $(CP_P) $(WXDIR)/acinclude.m4 $(DISTDIR) $(CP_P) $(WXDIR)/aclocal.m4 $(DISTDIR) $(CP_P) $(WXDIR)/config.sub $(DISTDIR) $(CP_P) $(WXDIR)/config.guess $(DISTDIR) @@ -114,7 +117,6 @@ ALL_DIST: distrib_clean $(CP_P) $(REGEXDIR)/*.c $(DISTDIR)/src/regex $(CP_P) $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex $(CP_P) $(REGEXDIR)/README $(DISTDIR)/src/regex - case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/src/expat; esac $(CP_PR) $(EXPATDIR) $(DISTDIR)/src/expat #(cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`) mkdir $(DISTDIR)/src/iodbc @@ -156,6 +158,7 @@ ALL_GUI_DIST: ALL_DIST mkdir $(DISTDIR)/include/wx/generic mkdir $(DISTDIR)/include/wx/html mkdir $(DISTDIR)/include/wx/richtext + mkdir $(DISTDIR)/include/wx/aui mkdir $(DISTDIR)/include/wx/protocol mkdir $(DISTDIR)/include/wx/unix mkdir $(DISTDIR)/include/wx/xml @@ -165,6 +168,7 @@ ALL_GUI_DIST: ALL_DIST $(CP_P) $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic $(CP_P) $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html $(CP_P) $(INCDIR)/wx/richtext/*.h $(DISTDIR)/include/wx/richtext + $(CP_P) $(INCDIR)/wx/aui/*.h $(DISTDIR)/include/wx/aui $(CP_P) $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix $(CP_P) $(INCDIR)/wx/xml/*.h $(DISTDIR)/include/wx/xml $(CP_P) $(INCDIR)/wx/xrc/*.h $(DISTDIR)/include/wx/xrc @@ -178,6 +182,7 @@ ALL_GUI_DIST: ALL_DIST mkdir $(DISTDIR)/src/generic mkdir $(DISTDIR)/src/html mkdir $(DISTDIR)/src/richtext + mkdir $(DISTDIR)/src/aui mkdir $(DISTDIR)/src/$(TOOLKITDIR) mkdir $(DISTDIR)/src/png mkdir $(DISTDIR)/src/jpeg @@ -195,6 +200,7 @@ ALL_GUI_DIST: ALL_DIST $(CP_P) $(GENDIR)/*.mms $(DISTDIR)/src/generic $(CP_P) $(HTMLDIR)/*.cpp $(DISTDIR)/src/html $(CP_P) $(RICHTEXTDIR)/*.cpp $(DISTDIR)/src/richtext + $(CP_P) $(AUIDIR)/*.cpp $(DISTDIR)/src/aui $(CP_P) $(PNGDIR)/*.h $(DISTDIR)/src/png $(CP_P) $(PNGDIR)/*.c $(DISTDIR)/src/png $(CP_P) $(PNGDIR)/README $(DISTDIR)/src/png @@ -221,6 +227,7 @@ BASE_DIST: ALL_DIST mkdir $(DISTDIR)/include/wx/msw mkdir $(DISTDIR)/include/wx/html mkdir $(DISTDIR)/include/wx/richtext + mkdir $(DISTDIR)/include/wx/aui mkdir $(DISTDIR)/include/wx/mac mkdir $(DISTDIR)/include/wx/mac/carbon mkdir $(DISTDIR)/include/wx/mac/corefoundation @@ -253,7 +260,7 @@ BASE_DIST: ALL_DIST $(CP_P) $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console $(CP_P) $(SAMPDIR)/console/console.cpp $(DISTDIR)/samples/console $(CP_P) $(SAMPDIR)/console/console.dsp $(DISTDIR)/samples/console - cp -pf $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console + $(CP_P) $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console mkdir $(DISTDIR)/utils mkdir $(DISTDIR)/utils/HelpGen @@ -269,12 +276,12 @@ BASE_DIST: ALL_DIST $(CP_P) $(UTILSDIR)/tex2rtf/src/*.h $(DISTDIR)/utils/tex2rtf/src $(CP_P) $(UTILSDIR)/tex2rtf/src/*.in $(DISTDIR)/utils/tex2rtf/src $(CP_P) $(UTILSDIR)/tex2rtf/src/*.cpp $(DISTDIR)/utils/tex2rtf/src - cp -pf $(UTILSDIR)/tex2rtf/src/tex2rtf.ico $(DISTDIR)/utils/tex2rtf/src - cp -pf $(UTILSDIR)/tex2rtf/src/tex2rtf.ini $(DISTDIR)/utils/tex2rtf/src + $(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.ico $(DISTDIR)/utils/tex2rtf/src + $(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.ini $(DISTDIR)/utils/tex2rtf/src $(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.rc $(DISTDIR)/utils/tex2rtf/src $(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.xpm $(DISTDIR)/utils/tex2rtf/src -GTK_DIST: ALL_GUI_DIST +GTK_DIST: UNIV_DIST $(CP_P) $(WXDIR)/wxGTK.spec $(DISTDIR) $(CP_P) $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk $(CP_P) $(GTKDIR)/*.h $(DISTDIR)/src/gtk @@ -282,6 +289,14 @@ GTK_DIST: ALL_GUI_DIST $(CP_P) $(GTKDIR)/*.c $(DISTDIR)/src/gtk $(CP_P) $(GTKDIR)/*.xbm $(DISTDIR)/src/gtk $(CP_P) $(GTKDIR)/*.mms $(DISTDIR)/src/gtk + mkdir $(DISTDIR)/include/wx/gtk1 + $(CP_P) $(INCDIR)/wx/gtk1/*.h $(DISTDIR)/include/wx/gtk1 + mkdir $(DISTDIR)/src/gtk1 + $(CP_P) $(GTK1DIR)/*.h $(DISTDIR)/src/gtk1 + $(CP_P) $(GTK1DIR)/*.cpp $(DISTDIR)/src/gtk1 + $(CP_P) $(GTK1DIR)/*.c $(DISTDIR)/src/gtk1 + $(CP_P) $(GTK1DIR)/*.xbm $(DISTDIR)/src/gtk1 + $(CP_P) $(GTK1DIR)/*.mms $(DISTDIR)/src/gtk1 mkdir $(DISTDIR)/include/wx/gtk/gnome mkdir $(DISTDIR)/src/gtk/gnome @@ -295,16 +310,9 @@ GTK_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/include/wx/mac/corefoundation $(CP_P) $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation - case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib - rm -f $(DISTDIR)/contrib/samples/animate/mondrian.ico - cp -pf $(WXDIR)/contrib/samples/animate/mondrian.ico $(DISTDIR)/contrib/samples/animate - rm -f $(DISTDIR)/contrib/samples/fl/bitmaps/*.bmp - cp -pf $(WXDIR)/contrib/samples/fl/bitmaps/*.bmp $(DISTDIR)/contrib/samples/fl/bitmaps - rm -f $(DISTDIR)/contrib/samples/ogl/studio/*.wxr - cp -pf $(WXDIR)/contrib/samples/ogl/studio/*.wxr $(DISTDIR)/contrib/samples/ogl/studio - -X11_DIST: ALL_GUI_DIST UNIV_DIST + +X11_DIST: UNIV_DIST $(CP_P) $(WXDIR)/wxX11.spec $(DISTDIR) $(CP_P) $(INCDIR)/wx/x11/*.h $(DISTDIR)/include/wx/x11 $(CP_P) $(X11DIR)/*.cpp $(DISTDIR)/src/x11 @@ -316,7 +324,6 @@ X11_DIST: ALL_GUI_DIST UNIV_DIST mkdir $(DISTDIR)/include/wx/mac mkdir $(DISTDIR)/include/wx/mac/corefoundation $(CP_P) $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation - case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib MOTIF_DIST: ALL_GUI_DIST @@ -336,7 +343,6 @@ MOTIF_DIST: ALL_GUI_DIST $(CP_P) $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \ $(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \ $(DISTDIR)/include/wx/x11 - case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib MACX_DIST: ALL_GUI_DIST @@ -369,14 +375,23 @@ MACX_DIST: ALL_GUI_DIST $(CP_P) $(MACDIR)/carbon/morefilex/*.h $(DISTDIR)/src/mac/carbon/morefilex $(CP_P) $(MACDIR)/carbon/morefilex/*.c $(DISTDIR)/src/mac/carbon/morefilex $(CP_P) $(MACDIR)/carbon/morefilex/*.cpp $(DISTDIR)/src/mac/carbon/morefilex - case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib -# TODO: Distribute some files COCOA_DIST: ALL_GUI_DIST + $(CP_P) $(INCDIR)/wx/cocoa/*.h $(DISTDIR)/include/wx/cocoa $(CP_P) $(COCOADIR)/*.mm $(DISTDIR)/src/cocoa + $(CP_P) $(COCOADIR)/*.cpp $(DISTDIR)/src/cocoa + $(CP_P) $(COCOADIR)/*.r $(DISTDIR)/src/cocoa + mkdir $(DISTDIR)/include/wx/mac/corefoundation + $(CP_P) $(INCDIR)/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation + mkdir $(DISTDIR)/src/mac/corefoundation + $(CP_P) $(MACDIR)/corefoundation/*.cpp $(DISTDIR)/src/mac/corefoundation + mkdir $(DISTDIR)/src/mac/carbon + $(CP_P) $(MACDIR)/carbon/Info.plist.in $(DISTDIR)/src/mac/carbon + $(CP_P) $(MACDIR)/carbon/wxmac.icns $(DISTDIR)/src/mac/carbon + $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib -MSW_DIST: ALL_GUI_DIST +MSW_DIST: UNIV_DIST $(CP_P) $(WXDIR)/wxWINE.spec $(DISTDIR) mkdir $(DISTDIR)/include/wx/msw/ole mkdir $(DISTDIR)/include/wx/msw/wince @@ -385,7 +400,7 @@ MSW_DIST: ALL_GUI_DIST $(CP_P) $(INCDIR)/wx/msw/*.ico $(DISTDIR)/include/wx/msw $(CP_P) $(INCDIR)/wx/msw/*.bmp $(DISTDIR)/include/wx/msw $(CP_P) $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw - $(CP_P) $(INCDIR)/wx/msw/wx.manifest $(DISTDIR)/include/wx/msw + $(CP_P) $(INCDIR)/wx/msw/*.manifest $(DISTDIR)/include/wx/msw $(CP_P) $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole $(CP_P) $(INCDIR)/wx/msw/wince/*.h $(DISTDIR)/include/wx/msw/wince mkdir $(DISTDIR)/src/msw/ole @@ -394,6 +409,7 @@ MSW_DIST: ALL_GUI_DIST $(CP_P) $(MSWDIR)/*.c $(DISTDIR)/src/msw $(CP_P) $(MSWDIR)/*.rc $(DISTDIR)/src/msw $(CP_P) $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole + $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib MSW_ZIP_TEXT_DIST: ALL_GUI_DIST $(CP_P) $(WXDIR)/wxWINE.spec $(DISTDIR) @@ -402,7 +418,7 @@ MSW_ZIP_TEXT_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/include/wx/msw/wince $(CP_P) $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw $(CP_P) $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw - $(CP_P) $(INCDIR)/wx/msw/wx.manifest $(DISTDIR)/include/wx/msw + $(CP_P) $(INCDIR)/wx/msw/*.manifest $(DISTDIR)/include/wx/msw $(CP_P) $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole $(CP_P) $(INCDIR)/wx/msw/wince/*.h $(DISTDIR)/include/wx/msw/wince mkdir $(DISTDIR)/src/msw @@ -414,7 +430,6 @@ MSW_ZIP_TEXT_DIST: ALL_GUI_DIST $(CP_P) $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince $(CP_P) $(SRCDIR)/*.??? $(DISTDIR)/src $(CP_P) $(SRCDIR)/*.?? $(DISTDIR)/src - case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib UNIV_DIST: ALL_GUI_DIST @@ -435,7 +450,6 @@ MGL_DIST: UNIV_DIST $(CP_P) $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl mkdir $(DISTDIR)/src/msdos $(CP_P) $(SRCDIR)/msdos/*.cpp $(DISTDIR)/src/msdos - case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib DEMOS_DIST: ALL_GUI_DIST @@ -448,9 +462,10 @@ DEMOS_DIST: ALL_GUI_DIST $(CP_P) $(DEMODIR)/bombs/*.cpp $(DISTDIR)/demos/bombs $(CP_P) $(DEMODIR)/bombs/*.h $(DISTDIR)/demos/bombs $(CP_P) $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs + $(CP_P) $(DEMODIR)/bombs/*.ico $(DISTDIR)/demos/bombs + $(CP_P) $(DEMODIR)/bombs/*.rc $(DISTDIR)/demos/bombs $(CP_P) $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs - case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/demos/dbbrowse; esac $(CP_PR) $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse mkdir $(DISTDIR)/demos/forty @@ -459,8 +474,10 @@ DEMOS_DIST: ALL_GUI_DIST $(CP_P) $(DEMODIR)/forty/*.h $(DISTDIR)/demos/forty $(CP_P) $(DEMODIR)/forty/*.cpp $(DISTDIR)/demos/forty $(CP_P) $(DEMODIR)/forty/*.xpm $(DISTDIR)/demos/forty - $(CP_P) $(DEMODIR)/forty/*.xbm $(DISTDIR)/demos/forty - cp -pf $(DEMODIR)/forty/*.htm $(DISTDIR)/demos/forty + $(CP_P) $(DEMODIR)/forty/*.htm $(DISTDIR)/demos/forty + $(CP_P) $(DEMODIR)/forty/*.ico $(DISTDIR)/demos/forty + $(CP_P) $(DEMODIR)/forty/*.rc $(DISTDIR)/demos/forty + $(CP_P) $(DEMODIR)/forty/readme.txt $(DISTDIR)/demos/forty mkdir $(DISTDIR)/demos/life mkdir $(DISTDIR)/demos/life/bitmaps @@ -470,8 +487,11 @@ DEMOS_DIST: ALL_GUI_DIST $(CP_P) $(DEMODIR)/life/*.h $(DISTDIR)/demos/life $(CP_P) $(DEMODIR)/life/*.xpm $(DISTDIR)/demos/life $(CP_P) $(DEMODIR)/life/*.inc $(DISTDIR)/demos/life - cp -pf $(DEMODIR)/life/*.lif $(DISTDIR)/demos/life + $(CP_P) $(DEMODIR)/life/*.lif $(DISTDIR)/demos/life + $(CP_P) $(DEMODIR)/life/*.rc $(DISTDIR)/demos/life + $(CP_P) $(DEMODIR)/life/*.ico $(DISTDIR)/demos/life $(CP_P) $(DEMODIR)/life/bitmaps/*.xpm $(DISTDIR)/demos/life/bitmaps + $(CP_P) $(DEMODIR)/life/bitmaps/*.bmp $(DISTDIR)/demos/life/bitmaps mkdir $(DISTDIR)/demos/poem $(CP_P) $(DEMODIR)/poem/Makefile.in $(DISTDIR)/demos/poem @@ -479,13 +499,17 @@ DEMOS_DIST: ALL_GUI_DIST $(CP_P) $(DEMODIR)/poem/*.h $(DISTDIR)/demos/poem $(CP_P) $(DEMODIR)/poem/*.cpp $(DISTDIR)/demos/poem $(CP_P) $(DEMODIR)/poem/*.xpm $(DISTDIR)/demos/poem - cp -pf $(DEMODIR)/poem/*.dat $(DISTDIR)/demos/poem - cp -pf $(DEMODIR)/poem/*.txt $(DISTDIR)/demos/poem + $(CP_P) $(DEMODIR)/poem/*.dat $(DISTDIR)/demos/poem + $(CP_P) $(DEMODIR)/poem/*.txt $(DISTDIR)/demos/poem + $(CP_P) $(DEMODIR)/poem/*.rc $(DISTDIR)/demos/poem + $(CP_P) $(DEMODIR)/poem/*.ico $(DISTDIR)/demos/poem mkdir $(DISTDIR)/demos/fractal $(CP_P) $(DEMODIR)/fractal/Makefile.in $(DISTDIR)/demos/fractal $(CP_P) $(DEMODIR)/fractal/makefile.unx $(DISTDIR)/demos/fractal $(CP_P) $(DEMODIR)/fractal/*.cpp $(DISTDIR)/demos/fractal + $(CP_P) $(DEMODIR)/fractal/*.rc $(DISTDIR)/demos/fractal + $(CP_P) $(DEMODIR)/fractal/*.ico $(DISTDIR)/demos/fractal SAMPLES_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/samples @@ -526,7 +550,7 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/console/Makefile.in $(DISTDIR)/samples/console $(CP_P) $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console $(CP_P) $(SAMPDIR)/console/*.cpp $(DISTDIR)/samples/console - cp -pf $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console + $(CP_P) $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console mkdir $(DISTDIR)/samples/controls mkdir $(DISTDIR)/samples/controls/icons @@ -534,7 +558,7 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/controls/makefile.unx $(DISTDIR)/samples/controls $(CP_P) $(SAMPDIR)/controls/*.cpp $(DISTDIR)/samples/controls $(CP_P) $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls - cp -pf $(SAMPDIR)/controls/*.bmp $(DISTDIR)/samples/controls + $(CP_P) $(SAMPDIR)/controls/*.bmp $(DISTDIR)/samples/controls $(CP_P) $(SAMPDIR)/controls/*.ico $(DISTDIR)/samples/controls $(CP_P) $(SAMPDIR)/controls/*.rc $(DISTDIR)/samples/controls $(CP_P) $(SAMPDIR)/controls/*.mms $(DISTDIR)/samples/controls @@ -547,12 +571,16 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/db/*.h $(DISTDIR)/samples/db $(CP_P) $(SAMPDIR)/db/*.xpm $(DISTDIR)/samples/db + mkdir $(DISTDIR)/samples/debugrpt + $(CP_P) $(SAMPDIR)/debugrpt/Makefile.in $(DISTDIR)/samples/debugrpt + $(CP_P) $(SAMPDIR)/debugrpt/*.cpp $(DISTDIR)/samples/debugrpt + mkdir $(DISTDIR)/samples/dialogs $(CP_P) $(SAMPDIR)/dialogs/Makefile.in $(DISTDIR)/samples/dialogs $(CP_P) $(SAMPDIR)/dialogs/makefile.unx $(DISTDIR)/samples/dialogs $(CP_P) $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs $(CP_P) $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs - cp -pf $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs + $(CP_P) $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs $(CP_P) $(SAMPDIR)/dialogs/*.mms $(DISTDIR)/samples/dialogs mkdir $(DISTDIR)/samples/dialup @@ -560,13 +588,17 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup $(CP_P) $(SAMPDIR)/dialup/*.cpp $(DISTDIR)/samples/dialup + mkdir $(DISTDIR)/samples/display + $(CP_P) $(SAMPDIR)/display/Makefile.in $(DISTDIR)/samples/display + $(CP_P) $(SAMPDIR)/display/*.cpp $(DISTDIR)/samples/display + mkdir $(DISTDIR)/samples/dnd $(CP_P) $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd $(CP_P) $(SAMPDIR)/dnd/makefile.unx $(DISTDIR)/samples/dnd $(CP_P) $(SAMPDIR)/dnd/*.cpp $(DISTDIR)/samples/dnd $(CP_P) $(SAMPDIR)/dnd/*.xpm $(DISTDIR)/samples/dnd $(CP_P) $(SAMPDIR)/dnd/*.txt $(DISTDIR)/samples/dnd - cp -pf $(SAMPDIR)/dnd/*.png $(DISTDIR)/samples/dnd + $(CP_P) $(SAMPDIR)/dnd/*.png $(DISTDIR)/samples/dnd mkdir $(DISTDIR)/samples/docview $(CP_P) $(SAMPDIR)/docview/Makefile.in $(DISTDIR)/samples/docview @@ -587,14 +619,14 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/dragimag/*.cpp $(DISTDIR)/samples/dragimag $(CP_P) $(SAMPDIR)/dragimag/*.h $(DISTDIR)/samples/dragimag $(CP_P) $(SAMPDIR)/dragimag/*.xpm $(DISTDIR)/samples/dragimag - cp -pf $(SAMPDIR)/dragimag/*.png $(DISTDIR)/samples/dragimag + $(CP_P) $(SAMPDIR)/dragimag/*.png $(DISTDIR)/samples/dragimag mkdir $(DISTDIR)/samples/drawing $(CP_P) $(SAMPDIR)/drawing/Makefile.in $(DISTDIR)/samples/drawing $(CP_P) $(SAMPDIR)/drawing/makefile.unx $(DISTDIR)/samples/drawing $(CP_P) $(SAMPDIR)/drawing/*.cpp $(DISTDIR)/samples/drawing $(CP_P) $(SAMPDIR)/drawing/*.xpm $(DISTDIR)/samples/drawing - cp -pf $(SAMPDIR)/drawing/*.bmp $(DISTDIR)/samples/drawing + $(CP_P) $(SAMPDIR)/drawing/*.bmp $(DISTDIR)/samples/drawing mkdir $(DISTDIR)/samples/dynamic $(CP_P) $(SAMPDIR)/dynamic/Makefile.in $(DISTDIR)/samples/dynamic @@ -607,6 +639,7 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/erase/makefile.unx $(DISTDIR)/samples/erase $(CP_P) $(SAMPDIR)/erase/*.cpp $(DISTDIR)/samples/erase $(CP_P) $(SAMPDIR)/erase/*.xml $(DISTDIR)/samples/erase + $(CP_P) $(SAMPDIR)/erase/*.xpm $(DISTDIR)/samples/erase mkdir $(DISTDIR)/samples/event $(CP_P) $(SAMPDIR)/event/Makefile.in $(DISTDIR)/samples/event @@ -637,7 +670,14 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/help/Makefile.in $(DISTDIR)/samples/help $(CP_P) $(SAMPDIR)/help/makefile.unx $(DISTDIR)/samples/help $(CP_P) $(SAMPDIR)/help/*.cpp $(DISTDIR)/samples/help + $(CP_P) $(SAMPDIR)/help/*.h* $(DISTDIR)/samples/help $(CP_P) $(SAMPDIR)/help/*.xpm $(DISTDIR)/samples/help + $(CP_P) $(SAMPDIR)/help/*.bmp $(DISTDIR)/samples/help + $(CP_P) $(SAMPDIR)/help/*.gif $(DISTDIR)/samples/help + $(CP_P) $(SAMPDIR)/help/cshelp.txt $(DISTDIR)/samples/help + $(CP_P) $(SAMPDIR)/help/*.chm $(DISTDIR)/samples/help + $(CP_P) $(SAMPDIR)/help/*.cnt $(DISTDIR)/samples/help + $(CP_P) $(SAMPDIR)/help/doc.zip $(DISTDIR)/samples/help $(CP_P) $(SAMPDIR)/help/doc/*.* $(DISTDIR)/samples/help/doc mkdir $(DISTDIR)/samples/htlbox @@ -652,8 +692,8 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/html/about/Makefile.in $(DISTDIR)/samples/html/about $(CP_P) $(SAMPDIR)/html/about/*.cpp $(DISTDIR)/samples/html/about mkdir $(DISTDIR)/samples/html/about/data - cp -pf $(SAMPDIR)/html/about/data/*.htm $(DISTDIR)/samples/html/about/data - cp -pf $(SAMPDIR)/html/about/data/*.png $(DISTDIR)/samples/html/about/data + $(CP_P) $(SAMPDIR)/html/about/data/*.htm $(DISTDIR)/samples/html/about/data + $(CP_P) $(SAMPDIR)/html/about/data/*.png $(DISTDIR)/samples/html/about/data mkdir $(DISTDIR)/samples/html/help $(CP_P) $(SAMPDIR)/html/help/Makefile.in $(DISTDIR)/samples/html/help $(CP_P) $(SAMPDIR)/html/help/*.cpp $(DISTDIR)/samples/html/help @@ -662,75 +702,54 @@ SAMPLES_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/samples/html/helpview $(CP_P) $(SAMPDIR)/html/helpview/Makefile.in $(DISTDIR)/samples/html/helpview $(CP_P) $(SAMPDIR)/html/helpview/*.cpp $(DISTDIR)/samples/html/helpview - cp -pf $(SAMPDIR)/html/helpview/*.zip $(DISTDIR)/samples/html/helpview + $(CP_P) $(SAMPDIR)/html/helpview/*.zip $(DISTDIR)/samples/html/helpview mkdir $(DISTDIR)/samples/html/printing $(CP_P) $(SAMPDIR)/html/printing/Makefile.in $(DISTDIR)/samples/html/printing $(CP_P) $(SAMPDIR)/html/printing/*.cpp $(DISTDIR)/samples/html/printing - cp -pf $(SAMPDIR)/html/printing/*.htm $(DISTDIR)/samples/html/printing + $(CP_P) $(SAMPDIR)/html/printing/*.htm $(DISTDIR)/samples/html/printing + $(CP_P) $(SAMPDIR)/html/printing/*.gif $(DISTDIR)/samples/html/printing + $(CP_P) $(SAMPDIR)/html/printing/*.ico $(DISTDIR)/samples/html/printing mkdir $(DISTDIR)/samples/html/test $(CP_P) $(SAMPDIR)/html/test/Makefile.in $(DISTDIR)/samples/html/test $(CP_P) $(SAMPDIR)/html/test/*.cpp $(DISTDIR)/samples/html/test - cp -pf $(SAMPDIR)/html/test/*.bmp $(DISTDIR)/samples/html/test - cp -pf $(SAMPDIR)/html/test/*.png $(DISTDIR)/samples/html/test - cp -pf $(SAMPDIR)/html/test/*.gif $(DISTDIR)/samples/html/test - cp -pf $(SAMPDIR)/html/test/*.htm $(DISTDIR)/samples/html/test - cp -pf $(SAMPDIR)/html/test/*.html $(DISTDIR)/samples/html/test + $(CP_P) $(SAMPDIR)/html/test/*.bmp $(DISTDIR)/samples/html/test + $(CP_P) $(SAMPDIR)/html/test/*.png $(DISTDIR)/samples/html/test + $(CP_P) $(SAMPDIR)/html/test/*.gif $(DISTDIR)/samples/html/test + $(CP_P) $(SAMPDIR)/html/test/*.htm $(DISTDIR)/samples/html/test + $(CP_P) $(SAMPDIR)/html/test/*.html $(DISTDIR)/samples/html/test mkdir $(DISTDIR)/samples/html/virtual $(CP_P) $(SAMPDIR)/html/virtual/Makefile.in $(DISTDIR)/samples/html/virtual $(CP_P) $(SAMPDIR)/html/virtual/*.cpp $(DISTDIR)/samples/html/virtual - cp -pf $(SAMPDIR)/html/virtual/*.htm $(DISTDIR)/samples/html/virtual + $(CP_P) $(SAMPDIR)/html/virtual/*.htm $(DISTDIR)/samples/html/virtual mkdir $(DISTDIR)/samples/html/widget $(CP_P) $(SAMPDIR)/html/widget/Makefile.in $(DISTDIR)/samples/html/widget $(CP_P) $(SAMPDIR)/html/widget/*.cpp $(DISTDIR)/samples/html/widget - cp -pf $(SAMPDIR)/html/widget/*.htm $(DISTDIR)/samples/html/widget + $(CP_P) $(SAMPDIR)/html/widget/*.htm $(DISTDIR)/samples/html/widget mkdir $(DISTDIR)/samples/html/zip $(CP_P) $(SAMPDIR)/html/zip/Makefile.in $(DISTDIR)/samples/html/zip $(CP_P) $(SAMPDIR)/html/zip/*.cpp $(DISTDIR)/samples/html/zip - cp -pf $(SAMPDIR)/html/zip/*.htm $(DISTDIR)/samples/html/zip - cp -pf $(SAMPDIR)/html/zip/*.zip $(DISTDIR)/samples/html/zip + $(CP_P) $(SAMPDIR)/html/zip/*.htm $(DISTDIR)/samples/html/zip + $(CP_P) $(SAMPDIR)/html/zip/*.zip $(DISTDIR)/samples/html/zip mkdir $(DISTDIR)/samples/image $(CP_P) $(SAMPDIR)/image/Makefile.in $(DISTDIR)/samples/image $(CP_P) $(SAMPDIR)/image/makefile.unx $(DISTDIR)/samples/image $(CP_P) $(SAMPDIR)/image/*.cpp $(DISTDIR)/samples/image $(CP_P) $(SAMPDIR)/image/*.mms $(DISTDIR)/samples/image - cp -pf $(SAMPDIR)/image/horse*.* $(DISTDIR)/samples/image - cp -pf $(SAMPDIR)/image/smile.xbm $(DISTDIR)/samples/image - cp -pf $(SAMPDIR)/image/smile.xpm $(DISTDIR)/samples/image + $(CP_P) $(SAMPDIR)/image/horse*.* $(DISTDIR)/samples/image + $(CP_P) $(SAMPDIR)/image/smile.xbm $(DISTDIR)/samples/image + $(CP_P) $(SAMPDIR)/image/smile.xpm $(DISTDIR)/samples/image mkdir $(DISTDIR)/samples/internat - mkdir $(DISTDIR)/samples/internat/bg - mkdir $(DISTDIR)/samples/internat/cs - mkdir $(DISTDIR)/samples/internat/de - mkdir $(DISTDIR)/samples/internat/fr - mkdir $(DISTDIR)/samples/internat/ja - mkdir $(DISTDIR)/samples/internat/ka - mkdir $(DISTDIR)/samples/internat/pl - mkdir $(DISTDIR)/samples/internat/ru - mkdir $(DISTDIR)/samples/internat/sv $(CP_P) $(SAMPDIR)/internat/Makefile.in $(DISTDIR)/samples/internat $(CP_P) $(SAMPDIR)/internat/makefile.unx $(DISTDIR)/samples/internat $(CP_P) $(SAMPDIR)/internat/*.cpp $(DISTDIR)/samples/internat $(CP_P) $(SAMPDIR)/internat/*.xpm $(DISTDIR)/samples/internat $(CP_P) $(SAMPDIR)/internat/*.txt $(DISTDIR)/samples/internat - cp -pf $(SAMPDIR)/internat/bg/*.mo $(DISTDIR)/samples/internat/bg - cp -pf $(SAMPDIR)/internat/cs/*.mo $(DISTDIR)/samples/internat/cs - cp -pf $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de - cp -pf $(SAMPDIR)/internat/fr/*.mo $(DISTDIR)/samples/internat/fr - cp -pf $(SAMPDIR)/internat/ja/*.mo $(DISTDIR)/samples/internat/ja - cp -pf $(SAMPDIR)/internat/ka/*.mo $(DISTDIR)/samples/internat/ka - cp -pf $(SAMPDIR)/internat/pl/*.mo $(DISTDIR)/samples/internat/pl - cp -pf $(SAMPDIR)/internat/ru/*.mo $(DISTDIR)/samples/internat/ru - cp -pf $(SAMPDIR)/internat/sv/*.mo $(DISTDIR)/samples/internat/sv - cp -pf $(SAMPDIR)/internat/bg/*.po $(DISTDIR)/samples/internat/bg - cp -pf $(SAMPDIR)/internat/cs/*.po $(DISTDIR)/samples/internat/cs - cp -pf $(SAMPDIR)/internat/de/*.po $(DISTDIR)/samples/internat/de - cp -pf $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr - cp -pf $(SAMPDIR)/internat/ja/*.po $(DISTDIR)/samples/internat/ja - cp -pf $(SAMPDIR)/internat/ka/*.po $(DISTDIR)/samples/internat/ka - cp -pf $(SAMPDIR)/internat/pl/*.po $(DISTDIR)/samples/internat/pl - cp -pf $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/ru - cp -pf $(SAMPDIR)/internat/sv/*.po $(DISTDIR)/samples/internat/sv + for f in `(cd $(SAMPDIR); find internat -name '*.[mp]o' -print)`; do \ + mkdir -p $(DISTDIR)/samples/`dirname $$f`; \ + $(CP_P) $(SAMPDIR)/$$f $(DISTDIR)/samples/$$f; \ + done mkdir $(DISTDIR)/samples/ipc $(CP_P) $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc @@ -744,7 +763,7 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/joytest/makefile.unx $(DISTDIR)/samples/joytest $(CP_P) $(SAMPDIR)/joytest/*.cpp $(DISTDIR)/samples/joytest $(CP_P) $(SAMPDIR)/joytest/*.h $(DISTDIR)/samples/joytest - cp -pf $(SAMPDIR)/joytest/*.wav $(DISTDIR)/samples/joytest + $(CP_P) $(SAMPDIR)/joytest/*.wav $(DISTDIR)/samples/joytest mkdir $(DISTDIR)/samples/keyboard $(CP_P) $(SAMPDIR)/keyboard/Makefile.in $(DISTDIR)/samples/keyboard @@ -756,6 +775,10 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/layout/*.cpp $(DISTDIR)/samples/layout $(CP_P) $(SAMPDIR)/layout/*.h $(DISTDIR)/samples/layout + mkdir $(DISTDIR)/samples/listbox + $(CP_P) $(SAMPDIR)/listbox/Makefile.in $(DISTDIR)/samples/listbox + $(CP_P) $(SAMPDIR)/listbox/*.cpp $(DISTDIR)/samples/listbox + mkdir $(DISTDIR)/samples/listctrl mkdir $(DISTDIR)/samples/listctrl/bitmaps $(CP_P) $(SAMPDIR)/listctrl/Makefile.in $(DISTDIR)/samples/listctrl @@ -815,7 +838,7 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/mobile/styles/Makefile.in $(DISTDIR)/samples/mobile/styles $(CP_P) $(SAMPDIR)/mobile/styles/*.cpp $(DISTDIR)/samples/mobile/styles $(CP_P) $(SAMPDIR)/mobile/styles/*.h $(DISTDIR)/samples/mobile/styles - cp -pf $(SAMPDIR)/mobile/styles/*.jpg $(DISTDIR)/samples/mobile/styles + $(CP_P) $(SAMPDIR)/mobile/styles/*.jpg $(DISTDIR)/samples/mobile/styles mkdir $(DISTDIR)/samples/multimon $(CP_P) $(SAMPDIR)/multimon/Makefile.in $(DISTDIR)/samples/multimon @@ -836,7 +859,7 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/opengl/penguin/*.cpp $(DISTDIR)/samples/opengl/penguin $(CP_P) $(SAMPDIR)/opengl/penguin/*.c $(DISTDIR)/samples/opengl/penguin $(CP_P) $(SAMPDIR)/opengl/penguin/*.h $(DISTDIR)/samples/opengl/penguin - cp -pf $(SAMPDIR)/opengl/penguin/*.lwo $(DISTDIR)/samples/opengl/penguin + $(CP_P) $(SAMPDIR)/opengl/penguin/*.dxf.gz $(DISTDIR)/samples/opengl/penguin mkdir $(DISTDIR)/samples/opengl/cube $(CP_P) $(SAMPDIR)/opengl/cube/Makefile.in $(DISTDIR)/samples/opengl/cube $(CP_P) $(SAMPDIR)/opengl/cube/makefile.unx $(DISTDIR)/samples/opengl/cube @@ -847,14 +870,14 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/opengl/isosurf/makefile.unx $(DISTDIR)/samples/opengl/isosurf $(CP_P) $(SAMPDIR)/opengl/isosurf/*.cpp $(DISTDIR)/samples/opengl/isosurf $(CP_P) $(SAMPDIR)/opengl/isosurf/*.h $(DISTDIR)/samples/opengl/isosurf - cp -pf $(SAMPDIR)/opengl/isosurf/*.gz $(DISTDIR)/samples/opengl/isosurf + $(CP_P) $(SAMPDIR)/opengl/isosurf/*.gz $(DISTDIR)/samples/opengl/isosurf mkdir $(DISTDIR)/samples/png $(CP_P) $(SAMPDIR)/png/Makefile.in $(DISTDIR)/samples/png $(CP_P) $(SAMPDIR)/png/makefile.unx $(DISTDIR)/samples/png $(CP_P) $(SAMPDIR)/png/*.cpp $(DISTDIR)/samples/png $(CP_P) $(SAMPDIR)/png/*.h $(DISTDIR)/samples/png - cp -pf $(SAMPDIR)/png/*.png $(DISTDIR)/samples/png + $(CP_P) $(SAMPDIR)/png/*.png $(DISTDIR)/samples/png mkdir $(DISTDIR)/samples/popup $(CP_P) $(SAMPDIR)/popup/Makefile.in $(DISTDIR)/samples/popup @@ -867,6 +890,7 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/printing/*.cpp $(DISTDIR)/samples/printing $(CP_P) $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing $(CP_P) $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing + $(CP_P) $(SAMPDIR)/printing/*.rc $(DISTDIR)/samples/printing mkdir $(DISTDIR)/samples/render $(CP_P) $(SAMPDIR)/render/Makefile.in $(DISTDIR)/samples/render @@ -877,18 +901,7 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/rotate/Makefile.in $(DISTDIR)/samples/rotate $(CP_P) $(SAMPDIR)/rotate/makefile.unx $(DISTDIR)/samples/rotate $(CP_P) $(SAMPDIR)/rotate/*.cpp $(DISTDIR)/samples/rotate - cp -pf $(SAMPDIR)/rotate/*.png $(DISTDIR)/samples/rotate - - mkdir $(DISTDIR)/samples/richedit - $(CP_P) $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit - $(CP_P) $(SAMPDIR)/richedit/makefile.unx $(DISTDIR)/samples/richedit - $(CP_P) $(SAMPDIR)/richedit/*.cpp $(DISTDIR)/samples/richedit - rm $(DISTDIR)/samples/richedit/wxLayout.cpp - cp -pf $(SAMPDIR)/richedit/wxLayout.cpp $(DISTDIR)/samples/richedit - $(CP_P) $(SAMPDIR)/richedit/*.h $(DISTDIR)/samples/richedit - $(CP_P) $(SAMPDIR)/richedit/*.xpm $(DISTDIR)/samples/richedit - $(CP_P) $(SAMPDIR)/richedit/README $(DISTDIR)/samples/richedit - $(CP_P) $(SAMPDIR)/richedit/TODO $(DISTDIR)/samples/richedit + $(CP_P) $(SAMPDIR)/rotate/*.png $(DISTDIR)/samples/rotate mkdir $(DISTDIR)/samples/richtext mkdir $(DISTDIR)/samples/richtext/bitmaps @@ -898,6 +911,10 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/richtext/readme.txt $(DISTDIR)/samples/richtext $(CP_P) $(SAMPDIR)/richtext/todo.txt $(DISTDIR)/samples/richtext + mkdir $(DISTDIR)/samples/aui + $(CP_P) $(SAMPDIR)/aui/Makefile.in $(DISTDIR)/samples/aui + $(CP_P) $(SAMPDIR)/aui/*.cpp $(DISTDIR)/samples/aui + mkdir $(DISTDIR)/samples/propsize $(CP_P) $(SAMPDIR)/propsize/Makefile.in $(DISTDIR)/samples/propsize $(CP_P) $(SAMPDIR)/propsize/makefile.unx $(DISTDIR)/samples/propsize @@ -924,7 +941,7 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/shaped/Makefile.in $(DISTDIR)/samples/shaped $(CP_P) $(SAMPDIR)/shaped/makefile.unx $(DISTDIR)/samples/shaped $(CP_P) $(SAMPDIR)/shaped/*.cpp $(DISTDIR)/samples/shaped - cp -pf $(SAMPDIR)/shaped/*.png $(DISTDIR)/samples/shaped + $(CP_P) $(SAMPDIR)/shaped/*.png $(DISTDIR)/samples/shaped mkdir $(DISTDIR)/samples/sockets $(CP_P) $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets @@ -935,13 +952,14 @@ SAMPLES_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/samples/sound $(CP_P) $(SAMPDIR)/sound/Makefile.in $(DISTDIR)/samples/sound $(CP_P) $(SAMPDIR)/sound/*.cpp $(DISTDIR)/samples/sound - cp -pf $(SAMPDIR)/sound/*.wav $(DISTDIR)/samples/sound + $(CP_P) $(SAMPDIR)/sound/*.wav $(DISTDIR)/samples/sound mkdir $(DISTDIR)/samples/splash $(CP_P) $(SAMPDIR)/splash/Makefile.in $(DISTDIR)/samples/splash $(CP_P) $(SAMPDIR)/splash/*.cpp $(DISTDIR)/samples/splash - cp -pf $(SAMPDIR)/splash/*.png $(DISTDIR)/samples/splash - cp -pf $(SAMPDIR)/splash/*.mpg $(DISTDIR)/samples/splash + $(CP_P) $(SAMPDIR)/splash/*.png $(DISTDIR)/samples/splash + $(CP_P) $(SAMPDIR)/splash/*.mpg $(DISTDIR)/samples/splash + $(CP_P) $(SAMPDIR)/splash/*.xpm $(DISTDIR)/samples/splash mkdir $(DISTDIR)/samples/splitter $(CP_P) $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter @@ -954,6 +972,12 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/statbar/*.cpp $(DISTDIR)/samples/statbar $(CP_P) $(SAMPDIR)/statbar/*.xpm $(DISTDIR)/samples/statbar + mkdir $(DISTDIR)/samples/taskbar + $(CP_P) $(SAMPDIR)/taskbar/Makefile.in $(DISTDIR)/samples/taskbar + $(CP_P) $(SAMPDIR)/taskbar/*.cpp $(DISTDIR)/samples/taskbar + $(CP_P) $(SAMPDIR)/taskbar/*.h $(DISTDIR)/samples/taskbar + $(CP_P) $(SAMPDIR)/taskbar/*.xpm $(DISTDIR)/samples/taskbar + mkdir $(DISTDIR)/samples/text $(CP_P) $(SAMPDIR)/text/Makefile.in $(DISTDIR)/samples/text $(CP_P) $(SAMPDIR)/text/makefile.unx $(DISTDIR)/samples/text @@ -1009,7 +1033,6 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/widgets/Makefile.in $(DISTDIR)/samples/widgets $(CP_P) $(SAMPDIR)/widgets/*.cpp $(DISTDIR)/samples/widgets $(CP_P) $(SAMPDIR)/widgets/*.h $(DISTDIR)/samples/widgets - $(CP_P) $(SAMPDIR)/widgets/*.rc $(DISTDIR)/samples/widgets $(CP_P) $(SAMPDIR)/widgets/icons/*.xpm $(DISTDIR)/samples/widgets/icons mkdir $(DISTDIR)/samples/xrc @@ -1018,10 +1041,10 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/xrc/*.cpp $(DISTDIR)/samples/xrc $(CP_P) $(SAMPDIR)/xrc/*.h $(DISTDIR)/samples/xrc $(CP_P) $(SAMPDIR)/xrc/*.rc $(DISTDIR)/samples/xrc - cp -pf $(SAMPDIR)/xrc/rc/*.xpm $(DISTDIR)/samples/xrc/rc - cp -pf $(SAMPDIR)/xrc/rc/*.xrc $(DISTDIR)/samples/xrc/rc - cp -pf $(SAMPDIR)/xrc/rc/*.gif $(DISTDIR)/samples/xrc/rc - cp -pf $(SAMPDIR)/xrc/rc/*.ico $(DISTDIR)/samples/xrc/rc + $(CP_P) $(SAMPDIR)/xrc/rc/*.xpm $(DISTDIR)/samples/xrc/rc + $(CP_P) $(SAMPDIR)/xrc/rc/*.xrc $(DISTDIR)/samples/xrc/rc + $(CP_P) $(SAMPDIR)/xrc/rc/*.gif $(DISTDIR)/samples/xrc/rc + $(CP_P) $(SAMPDIR)/xrc/rc/*.ico $(DISTDIR)/samples/xrc/rc UTILS_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/utils @@ -1042,7 +1065,7 @@ UTILS_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/utils/configtool/src/bitmaps mkdir $(DISTDIR)/utils/configtool/scripts $(CP_P) $(UTILSDIR)/configtool/*.in $(DISTDIR)/utils/configtool - cp -pf $(UTILSDIR)/configtool/configs/*.wxs $(DISTDIR)/utils/configtool/configs + $(CP_P) $(UTILSDIR)/configtool/configs/*.wxs $(DISTDIR)/utils/configtool/configs $(CP_P) $(UTILSDIR)/configtool/docs/*.txt $(DISTDIR)/utils/configtool/docs $(CP_P) $(UTILSDIR)/configtool/src/*.h $(DISTDIR)/utils/configtool/src $(CP_P) $(UTILSDIR)/configtool/src/*.in $(DISTDIR)/utils/configtool/src @@ -1057,8 +1080,8 @@ UTILS_DIST: ALL_GUI_DIST $(CP_P) $(UTILSDIR)/emulator/src/*.h $(DISTDIR)/utils/emulator/src $(CP_P) $(UTILSDIR)/emulator/src/*.in $(DISTDIR)/utils/emulator/src $(CP_P) $(UTILSDIR)/emulator/src/*.cpp $(DISTDIR)/utils/emulator/src - cp -pf $(UTILSDIR)/emulator/src/*.jpg $(DISTDIR)/utils/emulator/src - cp -pf $(UTILSDIR)/emulator/src/*.wxe $(DISTDIR)/utils/emulator/src + $(CP_P) $(UTILSDIR)/emulator/src/*.jpg $(DISTDIR)/utils/emulator/src + $(CP_P) $(UTILSDIR)/emulator/src/*.wxe $(DISTDIR)/utils/emulator/src $(CP_P) $(UTILSDIR)/emulator/src/*.xpm $(DISTDIR)/utils/emulator/src $(CP_P) $(UTILSDIR)/emulator/docs/*.txt $(DISTDIR)/utils/emulator/docs $(CP_P) $(UTILSDIR)/emulator/docs/*.jpg $(DISTDIR)/utils/emulator/docs @@ -1081,8 +1104,11 @@ UTILS_DIST: ALL_GUI_DIST $(CP_P) $(UTILSDIR)/helpview/Makefile.in $(DISTDIR)/utils/helpview $(CP_P) $(UTILSDIR)/helpview/src/*.h $(DISTDIR)/utils/helpview/src $(CP_P) $(UTILSDIR)/helpview/src/*.cpp $(DISTDIR)/utils/helpview/src + $(CP_P) $(UTILSDIR)/helpview/src/*.rc $(DISTDIR)/utils/helpview/src + $(CP_P) $(UTILSDIR)/helpview/src/*.ico $(DISTDIR)/utils/helpview/src + $(CP_P) $(UTILSDIR)/helpview/src/readme.txt $(DISTDIR)/utils/helpview/src $(CP_P) $(UTILSDIR)/helpview/src/Makefile.in $(DISTDIR)/utils/helpview/src - cp -pf $(UTILSDIR)/helpview/src/test.zip $(DISTDIR)/utils/helpview/src + $(CP_P) $(UTILSDIR)/helpview/src/test.zip $(DISTDIR)/utils/helpview/src $(CP_P) $(UTILSDIR)/helpview/src/bitmaps/*.xpm $(DISTDIR)/utils/helpview/src/bitmaps mkdir $(DISTDIR)/utils/wxrc @@ -1161,7 +1187,7 @@ distdir: @GUIDIST@ @# in other dist targets. find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \ \( -name "makefile.*" -a ! -name "makefile.unx" \) \) \ - -print | xargs rm -rf + -print | egrep -v '/(samples|dbbrowse)/.*\.hh.$$' | xargs rm -rf dist: distdir @cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE); @@ -1234,7 +1260,7 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" \ -o -name "*.dsw" -o -name "*.hh*" -o -name "*.mms" \ -o -name "*.mcp" -o -name "*M*.xml" -o -name "*.r" \ - -o -name "*.bkl" -o -name "*.pro" \ + -o -name "*.pro" \ -o -name "*.vpj" -o -name "*.sc" \ -o \( -name "makefile.*" -a ! -name "makefile.unx" \) \ \) -print0 | xargs -0 rm -rf