X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0ff1f245a9ac4a6f8c44e824ff3b2647504ac461..bd018e7e31361bc2112a386f18663908a0559d58:/build/bakefiles/make_dist.mk diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk index e67ec30616..8f690116bf 100644 --- a/build/bakefiles/make_dist.mk +++ b/build/bakefiles/make_dist.mk @@ -1,6 +1,5 @@ # # "make dist" target implementation: -# $Id$ # @@ -68,6 +67,9 @@ DISTDIR=./_dist_dir/$(DISTDIRNAME) ALL_DIST: distrib_clean mkdir _dist_dir mkdir $(DISTDIR) + cp $(WXDIR)/configure.in $(DISTDIR) + cp $(WXDIR)/configure $(DISTDIR) + cp $(WXDIR)/autoconf_inc.m4 $(DISTDIR) cp $(WXDIR)/wxwin.m4 $(DISTDIR) cp $(WXDIR)/aclocal.m4 $(DISTDIR) cp $(WXDIR)/config.sub $(DISTDIR) @@ -75,6 +77,7 @@ ALL_DIST: distrib_clean cp $(WXDIR)/install-sh $(DISTDIR) cp $(WXDIR)/mkinstalldirs $(DISTDIR) cp $(WXDIR)/wx-config.in $(DISTDIR) + cp $(WXDIR)/wx-config-inplace.in $(DISTDIR) cp $(WXDIR)/version-script.in $(DISTDIR) cp $(WXDIR)/setup.h.in $(DISTDIR) cp $(WXDIR)/setup.h_vms $(DISTDIR) @@ -99,18 +102,12 @@ ALL_DIST: distrib_clean cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib - cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib +# cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib mkdir $(DISTDIR)/src/regex cp $(REGEXDIR)/*.h $(DISTDIR)/src/regex - cp $(REGEXDIR)/*.ih $(DISTDIR)/src/regex cp $(REGEXDIR)/*.c $(DISTDIR)/src/regex - cp $(REGEXDIR)/Makefile $(DISTDIR)/src/regex - cp $(REGEXDIR)/makefile.* $(DISTDIR)/src/regex cp $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex cp $(REGEXDIR)/README $(DISTDIR)/src/regex - cp $(REGEXDIR)/WHATSNEW $(DISTDIR)/src/regex - cp $(REGEXDIR)/mkh $(DISTDIR)/src/regex - cp $(REGEXDIR)/tests $(DISTDIR)/src/regex cp -Rf $(EXPATDIR) $(DISTDIR)/src (cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`) mkdir $(DISTDIR)/src/iodbc @@ -129,8 +126,6 @@ ALL_DIST: distrib_clean # this target is the common part of distribution script for all GUI toolkits, # but is not used when building wxBase distribution ALL_GUI_DIST: ALL_DIST - cp $(WXDIR)/configure.in $(DISTDIR) - cp $(WXDIR)/configure $(DISTDIR) cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt if test -f $(DOCDIR)/$(TOOLKITDIR)/changes.txt ; then \ @@ -144,13 +139,14 @@ ALL_GUI_DIST: ALL_DIST mkdir $(DISTDIR)/include/wx/protocol mkdir $(DISTDIR)/include/wx/unix mkdir $(DISTDIR)/include/wx/xml + mkdir $(DISTDIR)/include/wx/xrc cp $(INCDIR)/wx/*.h $(DISTDIR)/include/wx - cp $(INCDIR)/wx/*.inl $(DISTDIR)/include/wx cp $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx cp $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic cp $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html cp $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix cp $(INCDIR)/wx/xml/*.h $(DISTDIR)/include/wx/xml + cp $(INCDIR)/wx/xrc/*.h $(DISTDIR)/include/wx/xrc cp $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol mkdir $(DISTDIR)/art mkdir $(DISTDIR)/art/gtk @@ -165,12 +161,12 @@ ALL_GUI_DIST: ALL_DIST mkdir $(DISTDIR)/src/jpeg mkdir $(DISTDIR)/src/tiff mkdir $(DISTDIR)/src/unix + mkdir $(DISTDIR)/src/xrc + cp $(SRCDIR)/xrc/*.cpp $(DISTDIR)/src/xrc cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common cp $(COMMDIR)/*.c $(DISTDIR)/src/common cp $(COMMDIR)/*.inc $(DISTDIR)/src/common - cp $(COMMDIR)/*.h $(DISTDIR)/src/common cp $(COMMDIR)/*.mms $(DISTDIR)/src/common - cp $(UNIXDIR)/*.c $(DISTDIR)/src/unix cp $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix cp $(UNIXDIR)/*.mms $(DISTDIR)/src/unix cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic @@ -197,13 +193,13 @@ BASE_DIST: ALL_DIST mkdir $(DISTDIR)/include/wx/unix mkdir $(DISTDIR)/include/wx/xml mkdir $(DISTDIR)/include/wx/msw + mkdir $(DISTDIR)/include/wx/html mkdir $(DISTDIR)/src/unix mkdir $(DISTDIR)/src/msw cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt cp $(DOCDIR)/base/readme.txt $(DISTDIR)/README.txt cp $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common cp $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common - cp $(WXDIR)/src/common/unzip.h $(DISTDIR)/src/common list='$(ALL_BASE_HEADERS)'; for p in $$list; do \ cp $(WXDIR)/include/$$p $(DISTDIR)/include/$$p; \ done @@ -224,10 +220,17 @@ BASE_DIST: ALL_DIST GTK_DIST: ALL_GUI_DIST cp $(WXDIR)/wxGTK.spec $(DISTDIR) cp $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk + cp $(GTKDIR)/*.h $(DISTDIR)/src/gtk cp $(GTKDIR)/*.cpp $(DISTDIR)/src/gtk cp $(GTKDIR)/*.c $(DISTDIR)/src/gtk cp $(GTKDIR)/*.xbm $(DISTDIR)/src/gtk cp $(GTKDIR)/*.mms $(DISTDIR)/src/gtk + + mkdir $(DISTDIR)/include/wx/gtk/gnome + mkdir $(DISTDIR)/src/gtk/gnome + cp $(INCDIR)/wx/gtk/gnome/*.h $(DISTDIR)/include/wx/gtk/gnome + cp $(GTKDIR)/gnome/*.cpp $(DISTDIR)/src/gtk/gnome + mkdir $(DISTDIR)/contrib cp -R $(WXDIR)/contrib $(DISTDIR) @@ -244,7 +247,6 @@ MOTIF_DIST: ALL_GUI_DIST cp $(WXDIR)/wxMotif.spec $(DISTDIR) cp $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif cp $(MOTIFDIR)/*.cpp $(DISTDIR)/src/motif - cp $(MOTIFDIR)/*.c $(DISTDIR)/src/motif cp $(MOTIFDIR)/*.xbm $(DISTDIR)/src/motif mkdir $(DISTDIR)/src/motif/xmcombo cp $(MOTIFDIR)/xmcombo/*.c $(DISTDIR)/src/motif/xmcombo @@ -253,26 +255,47 @@ MOTIF_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/src/x11 mkdir $(DISTDIR)/include/wx/x11 cp $(X11DIR)/pen.cpp $(X11DIR)/brush.cpp $(X11DIR)/utilsx.cpp \ - $(X11DIR)/bitmap.cpp $(X11DIR)/region.cpp \ + $(X11DIR)/bitmap.cpp $(X11DIR)/glcanvas.cpp $(X11DIR)/region.cpp \ $(DISTDIR)/src/x11 cp $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \ - $(X11INC)/bitmap.h $(X11INC)/private.h $(X11INC)/region.h \ + $(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \ $(DISTDIR)/include/wx/x11 mkdir $(DISTDIR)/contrib cp -R $(WXDIR)/contrib $(DISTDIR) MACX_DIST: ALL_GUI_DIST cp $(INCDIR)/*.* $(DISTDIR)/include + mkdir $(DISTDIR)/include/wx/mac/carbon + mkdir $(DISTDIR)/include/wx/mac/private + mkdir $(DISTDIR)/include/wx/mac/carbon/private cp $(INCDIR)/wx/mac/*.h $(DISTDIR)/include/wx/mac - cp $(MACDIR)/*.cpp $(DISTDIR)/src/mac - cp $(MACDIR)/*.c $(DISTDIR)/src/mac - cp $(MACDIR)/*.h $(DISTDIR)/src/mac - cp $(MACDIR)/*.r $(DISTDIR)/src/mac - mkdir $(DISTDIR)/src/mac/morefile - cp $(MACDIR)/morefile/*.h $(DISTDIR)/src/mac/morefile - cp $(MACDIR)/morefile/*.c $(DISTDIR)/src/mac/morefile - mkdir $(DISTDIR)/src/mac/macsock - cp $(MACDIR)/macsock/*.lib $(DISTDIR)/src/mac/macsock + cp $(INCDIR)/wx/mac/carbon/*.h $(DISTDIR)/include/wx/mac/carbon + cp $(INCDIR)/wx/mac/carbon/private/*.h $(DISTDIR)/include/wx/mac/carbon/private + cp $(INCDIR)/wx/mac/private/*.h $(DISTDIR)/include/wx/mac/private + mkdir $(DISTDIR)/include/wx/mac/corefoundation + cp $(INCDIR)/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation + mkdir $(DISTDIR)/src/mac/corefoundation + cp $(MACDIR)/corefoundation/*.cpp $(DISTDIR)/src/mac/corefoundation + mkdir $(DISTDIR)/src/html/htmlctrl + mkdir $(DISTDIR)/src/html/htmlctrl/webkit + cp $(WXDIR)/src/html/htmlctrl/webkit/*.mm $(DISTDIR)/src/html/htmlctrl/webkit + mkdir $(DISTDIR)/src/mac/carbon + cp $(MACDIR)/carbon/*.cpp $(DISTDIR)/src/mac/carbon + cp $(MACDIR)/carbon/*.mm $(DISTDIR)/src/mac/carbon + cp $(MACDIR)/carbon/*.icns $(DISTDIR)/src/mac/carbon + cp $(MACDIR)/carbon/Info.plist.in $(DISTDIR)/src/mac/carbon + cp $(MACDIR)/carbon/*.h $(DISTDIR)/src/mac/carbon + cp $(MACDIR)/carbon/*.r $(DISTDIR)/src/mac/carbon + mkdir $(DISTDIR)/src/mac/carbon/morefile + cp $(MACDIR)/carbon/morefile/*.h $(DISTDIR)/src/mac/carbon/morefile + cp $(MACDIR)/carbon/morefile/*.c $(DISTDIR)/src/mac/carbon/morefile + mkdir $(DISTDIR)/src/mac/carbon/morefilex + cp $(MACDIR)/carbon/morefilex/*.h $(DISTDIR)/src/mac/carbon/morefilex + cp $(MACDIR)/carbon/morefilex/*.c $(DISTDIR)/src/mac/carbon/morefilex + cp $(MACDIR)/carbon/morefilex/*.cpp $(DISTDIR)/src/mac/carbon/morefilex +# obsolete +# mkdir $(DISTDIR)/src/mac/macsock +# cp $(MACDIR)/macsock/*.lib $(DISTDIR)/src/mac/macsock mkdir $(DISTDIR)/contrib cp -R $(WXDIR)/contrib $(DISTDIR) @@ -282,9 +305,6 @@ COCOA_DIST: ALL_GUI_DIST MSW_DIST: ALL_GUI_DIST cp $(WXDIR)/wxWINE.spec $(DISTDIR) - mkdir $(DISTDIR)/include/wx/msw/ctl3d - mkdir $(DISTDIR)/include/wx/msw/gnuwin32 - mkdir $(DISTDIR)/include/wx/msw/gnuwin32/gl mkdir $(DISTDIR)/include/wx/msw/ole mkdir $(DISTDIR)/include/wx/msw/wince cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw @@ -292,36 +312,24 @@ MSW_DIST: ALL_GUI_DIST cp $(INCDIR)/wx/msw/*.ico $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.bmp $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw - cp $(INCDIR)/wx/msw/ctl3d/*.h $(DISTDIR)/include/wx/msw/ctl3d - cp $(INCDIR)/wx/msw/gnuwin32/*.h $(DISTDIR)/include/wx/msw/gnuwin32 - cp $(INCDIR)/wx/msw/gnuwin32/gl/*.h $(DISTDIR)/include/wx/msw/gnuwin32/gl - cp $(INCDIR)/wx/msw/gnuwin32/gl/*.def $(DISTDIR)/include/wx/msw/gnuwin32/gl + cp $(INCDIR)/wx/msw/wx.manifest $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole cp $(INCDIR)/wx/msw/wince/*.h $(DISTDIR)/include/wx/msw/wince mkdir $(DISTDIR)/src/msw/ole mkdir $(DISTDIR)/src/msw/wince cp $(MSWDIR)/*.cpp $(DISTDIR)/src/msw cp $(MSWDIR)/*.c $(DISTDIR)/src/msw - cp $(MSWDIR)/*.def $(DISTDIR)/src/msw + cp $(MSWDIR)/*.rc $(DISTDIR)/src/msw cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole - cp $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince - mkdir $(DISTDIR)/contrib - cp -R $(WXDIR)/contrib $(DISTDIR) MSW_ZIP_TEXT_DIST: ALL_GUI_DIST cp $(WXDIR)/wxWINE.spec $(DISTDIR) mkdir $(DISTDIR)/include/wx/msw - mkdir $(DISTDIR)/include/wx/msw/ctl3d - mkdir $(DISTDIR)/include/wx/msw/gnuwin32 - mkdir $(DISTDIR)/include/wx/msw/gnuwin32/gl mkdir $(DISTDIR)/include/wx/msw/ole mkdir $(DISTDIR)/include/wx/msw/wince cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw - cp $(INCDIR)/wx/msw/ctl3d/*.h $(DISTDIR)/include/wx/msw/ctl3d - cp $(INCDIR)/wx/msw/gnuwin32/*.h $(DISTDIR)/include/wx/msw/gnuwin32 - cp $(INCDIR)/wx/msw/gnuwin32/gl/*.h $(DISTDIR)/include/wx/msw/gnuwin32/gl - cp $(INCDIR)/wx/msw/gnuwin32/gl/*.def $(DISTDIR)/include/wx/msw/gnuwin32/gl + cp $(INCDIR)/wx/msw/wx.manifest $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole cp $(INCDIR)/wx/msw/wince/*.h $(DISTDIR)/include/wx/msw/wince mkdir $(DISTDIR)/src/msw @@ -329,12 +337,10 @@ MSW_ZIP_TEXT_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/src/msw/wince cp $(MSWDIR)/*.cpp $(DISTDIR)/src/msw cp $(MSWDIR)/*.c $(DISTDIR)/src/msw - cp $(MSWDIR)/*.def $(DISTDIR)/src/msw cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole cp $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince cp $(SRCDIR)/*.??? $(DISTDIR)/src cp $(SRCDIR)/*.?? $(DISTDIR)/src - cp $(MSWDIR)/?ake*.* $(DISTDIR)/src/msw mkdir $(DISTDIR)/contrib cp -R $(WXDIR)/contrib $(DISTDIR) @@ -376,6 +382,7 @@ DEMOS_DIST: ALL_GUI_DIST cp $(DEMODIR)/forty/*.cpp $(DISTDIR)/demos/forty cp $(DEMODIR)/forty/*.xpm $(DISTDIR)/demos/forty cp $(DEMODIR)/forty/*.xbm $(DISTDIR)/demos/forty + cp $(DEMODIR)/forty/*.htm $(DISTDIR)/demos/forty mkdir $(DISTDIR)/demos/life mkdir $(DISTDIR)/demos/life/bitmaps @@ -449,6 +456,9 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/controls/makefile.unx $(DISTDIR)/samples/controls cp $(SAMPDIR)/controls/*.cpp $(DISTDIR)/samples/controls cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls + cp $(SAMPDIR)/controls/*.bmp $(DISTDIR)/samples/controls + cp $(SAMPDIR)/controls/*.ico $(DISTDIR)/samples/controls + cp $(SAMPDIR)/controls/*.rc $(DISTDIR)/samples/controls cp $(SAMPDIR)/controls/*.mms $(DISTDIR)/samples/controls cp $(SAMPDIR)/controls/icons/*.??? $(DISTDIR)/samples/controls/icons @@ -475,7 +485,6 @@ SAMPLES_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/samples/dnd cp $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd cp $(SAMPDIR)/dnd/makefile.unx $(DISTDIR)/samples/dnd - cp $(SAMPDIR)/dnd/*.wxr $(DISTDIR)/samples/dnd cp $(SAMPDIR)/dnd/*.cpp $(DISTDIR)/samples/dnd cp $(SAMPDIR)/dnd/*.xpm $(DISTDIR)/samples/dnd cp $(SAMPDIR)/dnd/*.txt $(DISTDIR)/samples/dnd @@ -526,6 +535,10 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/event/makefile.unx $(DISTDIR)/samples/event cp $(SAMPDIR)/event/*.cpp $(DISTDIR)/samples/event + mkdir $(DISTDIR)/samples/except + cp $(SAMPDIR)/except/Makefile.in $(DISTDIR)/samples/except + cp $(SAMPDIR)/except/*.cpp $(DISTDIR)/samples/except + mkdir $(DISTDIR)/samples/exec cp $(SAMPDIR)/exec/Makefile.in $(DISTDIR)/samples/exec cp $(SAMPDIR)/exec/makefile.unx $(DISTDIR)/samples/exec @@ -603,27 +616,39 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/image/makefile.unx $(DISTDIR)/samples/image cp $(SAMPDIR)/image/*.cpp $(DISTDIR)/samples/image cp $(SAMPDIR)/image/*.mms $(DISTDIR)/samples/image - cp $(SAMPDIR)/image/horse.* $(DISTDIR)/samples/image + cp $(SAMPDIR)/image/horse*.* $(DISTDIR)/samples/image cp $(SAMPDIR)/image/smile.xbm $(DISTDIR)/samples/image cp $(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/ju + mkdir $(DISTDIR)/samples/internat/ja + mkdir $(DISTDIR)/samples/internat/ka + mkdir $(DISTDIR)/samples/internat/pl mkdir $(DISTDIR)/samples/internat/ru cp $(SAMPDIR)/internat/Makefile.in $(DISTDIR)/samples/internat cp $(SAMPDIR)/internat/makefile.unx $(DISTDIR)/samples/internat cp $(SAMPDIR)/internat/*.cpp $(DISTDIR)/samples/internat cp $(SAMPDIR)/internat/*.xpm $(DISTDIR)/samples/internat cp $(SAMPDIR)/internat/*.txt $(DISTDIR)/samples/internat - cp $(SAMPDIR)/internat/fr/*.mo $(DISTDIR)/samples/internat/fr + cp $(SAMPDIR)/internat/bg/*.mo $(DISTDIR)/samples/internat/bg + cp $(SAMPDIR)/internat/cs/*.mo $(DISTDIR)/samples/internat/cs cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de + cp $(SAMPDIR)/internat/fr/*.mo $(DISTDIR)/samples/internat/fr cp $(SAMPDIR)/internat/ja/*.mo $(DISTDIR)/samples/internat/ja + cp $(SAMPDIR)/internat/ka/*.mo $(DISTDIR)/samples/internat/ka + cp $(SAMPDIR)/internat/pl/*.mo $(DISTDIR)/samples/internat/pl cp $(SAMPDIR)/internat/ru/*.mo $(DISTDIR)/samples/internat/ru - cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr + cp $(SAMPDIR)/internat/bg/*.po $(DISTDIR)/samples/internat/bg + cp $(SAMPDIR)/internat/cs/*.po $(DISTDIR)/samples/internat/cs cp $(SAMPDIR)/internat/de/*.po $(DISTDIR)/samples/internat/de + cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr cp $(SAMPDIR)/internat/ja/*.po $(DISTDIR)/samples/internat/ja + cp $(SAMPDIR)/internat/ka/*.po $(DISTDIR)/samples/internat/ka + cp $(SAMPDIR)/internat/pl/*.po $(DISTDIR)/samples/internat/pl cp $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/ru mkdir $(DISTDIR)/samples/ipc @@ -659,6 +684,10 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/listctrl/*.xpm $(DISTDIR)/samples/listctrl cp $(SAMPDIR)/listctrl/bitmaps/*.xpm $(DISTDIR)/samples/listctrl/bitmaps + mkdir $(DISTDIR)/samples/mediaplayer + cp $(SAMPDIR)/mediaplayer/Makefile.in $(DISTDIR)/samples/mediaplayer + cp $(SAMPDIR)/mediaplayer/*.cpp $(DISTDIR)/samples/mediaplayer + mkdir $(DISTDIR)/samples/mdi mkdir $(DISTDIR)/samples/mdi/bitmaps cp $(SAMPDIR)/mdi/Makefile.in $(DISTDIR)/samples/mdi @@ -693,7 +722,6 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/minimal/Makefile.in $(DISTDIR)/samples/minimal cp $(SAMPDIR)/minimal/makefile.unx $(DISTDIR)/samples/minimal cp $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal - cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal cp $(SAMPDIR)/minimal/*.mms $(DISTDIR)/samples/minimal mkdir $(DISTDIR)/samples/mobile @@ -747,13 +775,17 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/png/*.h $(DISTDIR)/samples/png cp $(SAMPDIR)/png/*.png $(DISTDIR)/samples/png + mkdir $(DISTDIR)/samples/popup + cp $(SAMPDIR)/popup/Makefile.in $(DISTDIR)/samples/popup + cp $(SAMPDIR)/popup/makefile.unx $(DISTDIR)/samples/popup + cp $(SAMPDIR)/popup/*.cpp $(DISTDIR)/samples/popup + mkdir $(DISTDIR)/samples/printing cp $(SAMPDIR)/printing/Makefile.in $(DISTDIR)/samples/printing cp $(SAMPDIR)/printing/makefile.unx $(DISTDIR)/samples/printing cp $(SAMPDIR)/printing/*.cpp $(DISTDIR)/samples/printing cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing - cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing # mkdir $(DISTDIR)/samples/resource # cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource @@ -771,7 +803,7 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/rotate/Makefile.in $(DISTDIR)/samples/rotate cp $(SAMPDIR)/rotate/makefile.unx $(DISTDIR)/samples/rotate cp $(SAMPDIR)/rotate/*.cpp $(DISTDIR)/samples/rotate - cp $(SAMPDIR)/rotate/*.bmp $(DISTDIR)/samples/rotate + cp $(SAMPDIR)/rotate/*.png $(DISTDIR)/samples/rotate mkdir $(DISTDIR)/samples/richedit cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit @@ -822,6 +854,17 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/sockets/*.cpp $(DISTDIR)/samples/sockets cp $(SAMPDIR)/sockets/*.xpm $(DISTDIR)/samples/sockets + mkdir $(DISTDIR)/samples/sound + cp $(SAMPDIR)/sound/Makefile.in $(DISTDIR)/samples/sound + cp $(SAMPDIR)/sound/*.cpp $(DISTDIR)/samples/sound + cp $(SAMPDIR)/sound/*.wav $(DISTDIR)/samples/sound + + mkdir $(DISTDIR)/samples/splash + cp $(SAMPDIR)/splash/Makefile.in $(DISTDIR)/samples/splash + cp $(SAMPDIR)/splash/*.cpp $(DISTDIR)/samples/splash + cp $(SAMPDIR)/splash/*.png $(DISTDIR)/samples/splash + cp $(SAMPDIR)/splash/*.mpg $(DISTDIR)/samples/splash + mkdir $(DISTDIR)/samples/splitter cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter cp $(SAMPDIR)/splitter/makefile.unx $(DISTDIR)/samples/splitter @@ -879,6 +922,10 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/validate/*.h $(DISTDIR)/samples/validate cp $(SAMPDIR)/validate/*.xpm $(DISTDIR)/samples/validate + mkdir $(DISTDIR)/samples/vscroll + cp $(SAMPDIR)/vscroll/Makefile.in $(DISTDIR)/samples/vscroll + cp $(SAMPDIR)/vscroll/*.cpp $(DISTDIR)/samples/vscroll + mkdir $(DISTDIR)/samples/wizard cp $(SAMPDIR)/wizard/Makefile.in $(DISTDIR)/samples/wizard cp $(SAMPDIR)/wizard/makefile.unx $(DISTDIR)/samples/wizard @@ -893,6 +940,17 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/widgets/*.rc $(DISTDIR)/samples/widgets cp $(SAMPDIR)/widgets/icons/*.xpm $(DISTDIR)/samples/widgets/icons + mkdir $(DISTDIR)/samples/xrc + mkdir $(DISTDIR)/samples/xrc/rc + cp $(SAMPDIR)/xrc/Makefile.in $(DISTDIR)/samples/xrc + cp $(SAMPDIR)/xrc/*.cpp $(DISTDIR)/samples/xrc + cp $(SAMPDIR)/xrc/*.h $(DISTDIR)/samples/xrc + cp $(SAMPDIR)/xrc/*.rc $(DISTDIR)/samples/xrc + cp $(SAMPDIR)/xrc/rc/*.xpm $(DISTDIR)/samples/xrc/rc + cp $(SAMPDIR)/xrc/rc/*.xrc $(DISTDIR)/samples/xrc/rc + cp $(SAMPDIR)/xrc/rc/*.gif $(DISTDIR)/samples/xrc/rc + cp $(SAMPDIR)/xrc/rc/*.ico $(DISTDIR)/samples/xrc/rc + UTILS_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/utils cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils @@ -917,33 +975,17 @@ UTILS_DIST: ALL_GUI_DIST cp $(UTILSDIR)/emulator/docs/*.txt $(DISTDIR)/utils/emulator/docs cp $(UTILSDIR)/emulator/docs/*.jpg $(DISTDIR)/utils/emulator/docs - mkdir $(DISTDIR)/utils/makegen - mkdir $(DISTDIR)/utils/makegen/templates - cp $(UTILSDIR)/makegen/Makefile.in $(DISTDIR)/utils/makegen - cp $(UTILSDIR)/makegen/*.cpp $(DISTDIR)/utils/makegen - cp $(UTILSDIR)/makegen/templates/*.* $(DISTDIR)/utils/makegen/templates - mkdir $(DISTDIR)/utils/hhp2cached - cp $(UTILSDIR)/hhp2cached/*.* $(DISTDIR)/utils/hhp2cached + cp $(UTILSDIR)/hhp2cached/Makefile.in $(DISTDIR)/utils/hhp2cached + cp $(UTILSDIR)/hhp2cached/*.cpp $(DISTDIR)/utils/hhp2cached + cp $(UTILSDIR)/hhp2cached/*.rc $(DISTDIR)/utils/hhp2cached mkdir $(DISTDIR)/utils/HelpGen mkdir $(DISTDIR)/utils/HelpGen/src cp $(UTILSDIR)/HelpGen/Makefile.in $(DISTDIR)/utils/HelpGen - cp $(UTILSDIR)/HelpGen/src/*.* $(DISTDIR)/utils/HelpGen/src - - mkdir $(DISTDIR)/utils/dialoged - mkdir $(DISTDIR)/utils/dialoged/src - mkdir $(DISTDIR)/utils/dialoged/src/bitmaps - mkdir $(DISTDIR)/utils/dialoged/docs - cp $(UTILSDIR)/dialoged/Makefile.in $(DISTDIR)/utils/dialoged - cp $(UTILSDIR)/dialoged/src/*.h $(DISTDIR)/utils/dialoged/src - cp $(UTILSDIR)/dialoged/src/*.cpp $(DISTDIR)/utils/dialoged/src - cp $(UTILSDIR)/dialoged/src/Makefile.in $(DISTDIR)/utils/dialoged/src - cp $(UTILSDIR)/dialoged/src/makefile.unx $(DISTDIR)/utils/dialoged/src - cp $(UTILSDIR)/dialoged/src/bitmaps/*.xpm $(DISTDIR)/utils/dialoged/src/bitmaps - cp $(UTILSDIR)/dialoged/docs/*.tex $(DISTDIR)/utils/dialoged/docs - cp $(UTILSDIR)/dialoged/docs/*.ini $(DISTDIR)/utils/dialoged/docs - cp $(UTILSDIR)/dialoged/docs/*.gif $(DISTDIR)/utils/dialoged/docs + cp $(UTILSDIR)/HelpGen/src/Makefile.in $(DISTDIR)/utils/HelpGen/src + cp $(UTILSDIR)/HelpGen/src/*.h $(DISTDIR)/utils/HelpGen/src + cp $(UTILSDIR)/HelpGen/src/*.cpp $(DISTDIR)/utils/HelpGen/src mkdir $(DISTDIR)/utils/helpview mkdir $(DISTDIR)/utils/helpview/src @@ -955,12 +997,12 @@ UTILS_DIST: ALL_GUI_DIST cp $(UTILSDIR)/helpview/src/test.zip $(DISTDIR)/utils/helpview/src cp $(UTILSDIR)/helpview/src/bitmaps/*.xpm $(DISTDIR)/utils/helpview/src/bitmaps + mkdir $(DISTDIR)/utils/wxrc + cp $(UTILSDIR)/wxrc/Makefile.in $(DISTDIR)/utils/wxrc + cp $(UTILSDIR)/wxrc/*.cpp $(DISTDIR)/utils/wxrc + cp $(UTILSDIR)/wxrc/*.rc $(DISTDIR)/utils/wxrc + MISC_DIST: ALL_GUI_DIST - mkdir $(DISTDIR)/misc - mkdir $(DISTDIR)/misc/afm - cp $(MISCDIR)/afm/*.afm $(DISTDIR)/misc/afm - mkdir $(DISTDIR)/misc/gs_afm - cp $(MISCDIR)/gs_afm/*.afm $(DISTDIR)/misc/gs_afm INTL_DIST: mkdir $(DISTDIR)/locale @@ -979,64 +1021,26 @@ MANUAL_DIST: cp $(DOCDIR)/latex/wx/*.bib $(DISTDIR)/docs/latex/wx cp $(DOCDIR)/latex/wx/*.sty $(DISTDIR)/docs/latex/wx -# this target does not generate a complete wxPython dist, it only includes -# those files needed for the Debian source package. -# see utils/wxPython/distrib for scripts to make a proper wxPython dist. + +# Copy all the files from wxPython needed for the Debian source package, +# and then remove some that are not needed. PYTHON_DIST: - mkdir $(DISTDIR)/wxPython - mkdir $(DISTDIR)/wxPython/contrib - mkdir $(DISTDIR)/wxPython/contrib/dllwidget - mkdir $(DISTDIR)/wxPython/contrib/gizmos - mkdir $(DISTDIR)/wxPython/contrib/glcanvas - mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk - mkdir $(DISTDIR)/wxPython/contrib/ogl - mkdir $(DISTDIR)/wxPython/contrib/stc - mkdir $(DISTDIR)/wxPython/contrib/stc/gtk - mkdir $(DISTDIR)/wxPython/contrib/xrc - mkdir $(DISTDIR)/wxPython/demo - mkdir $(DISTDIR)/wxPython/demo/bitmaps - mkdir $(DISTDIR)/wxPython/demo/bmp_source - mkdir $(DISTDIR)/wxPython/demo/data - mkdir $(DISTDIR)/wxPython/demo/dllwidget - mkdir $(DISTDIR)/wxPython/src - mkdir $(DISTDIR)/wxPython/src/gtk - mkdir $(DISTDIR)/wxPython/scripts - mkdir $(DISTDIR)/wxPython/wxPython - mkdir $(DISTDIR)/wxPython/wxPython/lib - mkdir $(DISTDIR)/wxPython/wxPython/lib/PyCrust - mkdir $(DISTDIR)/wxPython/wxPython/lib/editor - mkdir $(DISTDIR)/wxPython/wxPython/lib/mixins - mkdir $(DISTDIR)/wxPython/wxPython/tools - mkdir $(DISTDIR)/wxPython/wxPython/tools/XRCed - - cp $(WXDIR)/wxPython/*.txt $(DISTDIR)/wxPython - cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython - cp $(WXDIR)/wxPython/setup.cfg $(DISTDIR)/wxPython - cp $(WXDIR)/wxPython/MANIFEST.in $(DISTDIR)/wxPython - cp $(WXDIR)/wxPython/contrib/dllwidget/*.{py,cpp,h,i} $(DISTDIR)/wxPython/contrib/dllwidget - cp $(WXDIR)/wxPython/contrib/gizmos/*.{py,cpp,i} $(DISTDIR)/wxPython/contrib/gizmos - -cp $(WXDIR)/wxPython/contrib/glcanvas/* $(DISTDIR)/wxPython/contrib/glcanvas - cp $(WXDIR)/wxPython/contrib/glcanvas/gtk/glcanvas.* $(DISTDIR)/wxPython/contrib/glcanvas/gtk - -cp $(WXDIR)/wxPython/contrib/ogl/* $(DISTDIR)/wxPython/contrib/ogl - -cp $(WXDIR)/wxPython/contrib/stc/* $(DISTDIR)/wxPython/contrib/stc - -cp $(WXDIR)/wxPython/contrib/stc/gtk/* $(DISTDIR)/wxPython/contrib/stc/gtk - -cp $(WXDIR)/wxPython/contrib/xrc/xrc.* $(DISTDIR)/wxPython/contrib/xrc - -cp $(WXDIR)/wxPython/demo/* $(DISTDIR)/wxPython/demo - -cp $(WXDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/wxPython/demo/bitmaps - -cp $(WXDIR)/wxPython/demo/bmp_source/* $(DISTDIR)/wxPython/demo/bmp_source - -cp $(WXDIR)/wxPython/demo/data/* $(DISTDIR)/wxPython/demo/data - -cp $(WXDIR)/wxPython/demo/dllwidget/Makefile $(DISTDIR)/wxPython/demo/dllwidget - -cp $(WXDIR)/wxPython/demo/dllwidget/test_* $(DISTDIR)/wxPython/demo/dllwidget - -cp $(WXDIR)/wxPython/scripts/* $(DISTDIR)/wxPython/scripts - -cp $(WXDIR)/wxPython/src/* $(DISTDIR)/wxPython/src - cp $(WXDIR)/wxPython/src/gtk/*.py $(DISTDIR)/wxPython/src/gtk - cp $(WXDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/wxPython/src/gtk - cp $(WXDIR)/wxPython/wxPython/lib/*.py $(DISTDIR)/wxPython/wxPython/lib - cp $(WXDIR)/wxPython/wxPython/lib/PyCrust/*.py $(DISTDIR)/wxPython/wxPython/lib/PyCrust - cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor - cp $(WXDIR)/wxPython/wxPython/lib/mixins/*.py $(DISTDIR)/wxPython/wxPython/lib/mixins - cp $(WXDIR)/wxPython/wxPython/tools/*.py $(DISTDIR)/wxPython/wxPython/tools - cp $(WXDIR)/wxPython/wxPython/tools/XRCed/*.{py,ico,sh,xrc} $(DISTDIR)/wxPython/wxPython/tools/XRCed + for dir in `grep -v '#' $(WXDIR)/wxPython/distrib/DIRLIST`; do \ + echo "Copying dir: $$dir..."; \ + mkdir $(DISTDIR)/$$dir; \ + cp $(WXDIR)/$$dir/* $(DISTDIR)/$$dir > /dev/null 2>&1; \ + done; \ + \ + find $(DISTDIR)/wxPython -name "*~" > RM_FILES; \ + find $(DISTDIR)/wxPython -name "*.pyc" >> RM_FILES; \ + find $(DISTDIR)/wxPython -name "*.bat" >> RM_FILES; \ + find $(DISTDIR)/wxPython -name "core" >> RM_FILES; \ + find $(DISTDIR)/wxPython -name "core.[0-9]*" >> RM_FILES; \ + find $(DISTDIR)/wxPython -name "*.orig" >> RM_FILES; \ + find $(DISTDIR)/wxPython -name "*.rej" >> RM_FILES; \ + for f in `cat RM_FILES`; do rm $$f; done; \ + rm RM_FILES + distrib_clean: $(RM) -r _dist_dir @@ -1044,7 +1048,7 @@ distrib_clean: # VZ: the -only targets allow to do "make dist bzip-dist-only" without copying # the files twice dist-only: - @echo "*** Creating wxWindows distribution in $(DISTDIR)..." + @echo "*** Creating wxWidgets distribution in $(DISTDIR)..." @cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE); @if test "$(USE_GUI)" = 1; then \ cd $(DISTDIR); \ @@ -1059,7 +1063,7 @@ dist-only: fi dist: @GUIDIST@ - @echo "*** Creating wxWindows distribution in $(DISTDIR)..." + @echo "*** Creating wxWidgets distribution in $(DISTDIR)..." @# now prune away a lot of the crap included by using cp -R @# in other dist targets. find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \ @@ -1079,7 +1083,7 @@ dist: @GUIDIST@ fi bzip-dist-only: - @echo "*** Creating wxWindows distribution in $(DISTDIR)..." + @echo "*** Creating wxWidgets distribution in $(DISTDIR)..." @cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP); @if test "$(USE_GUI)" = 1; then \ cd $(DISTDIR); \ @@ -1094,7 +1098,7 @@ bzip-dist-only: fi bzip-dist: @GUIDIST@ - @echo "*** Creating wxWindows distribution in $(DISTDIR)..." + @echo "*** Creating wxWidgets distribution in $(DISTDIR)..." @cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP) @if test "$(USE_GUI)" = 1; then \ cd $(DISTDIR); \ @@ -1108,7 +1112,7 @@ bzip-dist: @GUIDIST@ # RR: Copy text and binary data separatly win-dist: MSW_ZIP_TEXT_DIST - @echo "*** Creating wxWindows ZIP distribution in $(DISTDIR)..." + @echo "*** Creating wxWidgets ZIP distribution in $(DISTDIR)..." @cd _dist_dir && mv $(DISTDIRNAME) wxMSW @cd _dist_dir && zip -r -l ../$(WXARCHIVE_ZIP) * cp $(INCDIR)/wx/msw/*.cur _dist_dir/wxMSW/include/wx/msw @@ -1118,6 +1122,7 @@ win-dist: MSW_ZIP_TEXT_DIST @cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.ico @cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.bmp +debian-dist: DEBIAN_SOURCE_DIR = $(WXDIR)/../wxwidgets@WX_RELEASE@@WX_FLAVOUR@-@WX_SUBVERSION@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST mkdir $(DISTDIR)/debian -cp $(WXDIR)/debian/* $(DISTDIR)/debian @@ -1130,12 +1135,25 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST @# in other dist targets. Ugly and hardly portable but it @# will run on any Debian box and that's enough for now. - find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \ - \( -name "makefile.*" -a ! -name "makefile.unx" \) \) \ - -print0 | xargs -0 rm -rf + rm -rf $(DISTDIR)/contrib/build + 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 "*.vpj" -o -name "*.sc" \ + -o \( -name "makefile.*" -a ! -name "makefile.unx" \) \ + \) -print0 | xargs -0 rm -rf + + rm -rf $(DISTDIR)/wxPython/SWIG + rm -rf $(DISTDIR)/wxPython/distrib + rm -rf $(DISTDIR)/wxPython/distutils + rm -rf $(DISTDIR)/wxPython/samples + rm -rf $(DISTDIR)/wxPython/contrib/iewin + find $(DISTDIR)/wxPython \( -name "mac" -o -name "msw" \) -print0 | xargs -0 rm -rf + + rm -rf $(DEBIAN_SOURCE_DIR) + mv $(DISTDIR) $(DEBIAN_SOURCE_DIR) - rm -rf $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER) - mv $(DISTDIR) $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER) debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST