X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/616d1b3cb0baf1c2eb643113724336b11d43a8a4..a70abf19f5e745553a8624d8fccf8f9c991a2b18:/build/bakefiles/make_dist.mk diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk index 6ebfc3a7e0..37abcff7cc 100644 --- a/build/bakefiles/make_dist.mk +++ b/build/bakefiles/make_dist.mk @@ -67,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) @@ -74,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) @@ -98,7 +102,7 @@ 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)/*.c $(DISTDIR)/src/regex @@ -122,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 \ @@ -137,6 +139,7 @@ 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 @@ -144,6 +147,7 @@ ALL_GUI_DIST: ALL_DIST 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 @@ -158,12 +162,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 @@ -190,13 +194,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 @@ -217,10 +221,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) @@ -237,7 +248,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 @@ -256,16 +266,27 @@ MOTIF_DIST: ALL_GUI_DIST 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 + cp $(MACDIR)/carbon/*.cpp $(DISTDIR)/src/mac/carbon + cp $(MACDIR)/carbon/*.c $(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) @@ -275,9 +296,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 @@ -285,33 +303,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/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)/*.rc $(DISTDIR)/src/msw cp $(MSWDIR)/*.def $(DISTDIR)/src/msw cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole 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 @@ -324,7 +333,6 @@ MSW_ZIP_TEXT_DIST: ALL_GUI_DIST 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) @@ -366,6 +374,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 @@ -465,7 +474,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 @@ -516,6 +524,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 @@ -593,7 +605,7 @@ 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 @@ -649,6 +661,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 @@ -736,6 +752,11 @@ 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 @@ -816,6 +837,12 @@ SAMPLES_DIST: ALL_GUI_DIST 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 @@ -873,6 +900,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 @@ -887,6 +918,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 @@ -912,12 +954,16 @@ UTILS_DIST: ALL_GUI_DIST cp $(UTILSDIR)/emulator/docs/*.jpg $(DISTDIR)/utils/emulator/docs 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 + 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 @@ -929,12 +975,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 @@ -980,7 +1026,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); \ @@ -995,7 +1041,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 \ @@ -1015,7 +1061,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); \ @@ -1030,7 +1076,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); \ @@ -1044,7 +1090,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 @@ -1054,6 +1100,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 @@ -1082,16 +1129,8 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST rm -rf $(DISTDIR)/wxPython/contrib/iewin find $(DISTDIR)/wxPython \( -name "mac" -o -name "msw" \) -print0 | xargs -0 rm -rf - - @# We can't get at the individual components of the version here - @# anymore, so strip the major and minor version out of the blob. - - ( \ - wx_version=$(WX_VERSION); \ - wx_release=$${wx_version%.*}; \ - rm -rf $(WXDIR)/../wxwidgets$${wx_release}-$${wx_version}; \ - mv $(DISTDIR) $(WXDIR)/../wxwidgets$${wx_release}-$${wx_version};\ - ) + rm -rf $(DEBIAN_SOURCE_DIR) + mv $(DISTDIR) $(DEBIAN_SOURCE_DIR) debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST