Remove duplicate wxEVT_COMMAND_TEXT_ENTER generation from wxOSX/Cocoa.

[wxWidgets.git] / build / bakefiles / make_dist.mk

diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk
index cce4e4d493d3668cadb65da4aa8aa40179382370..467a6f194a48fa6271dde95774f9b0b1b72d0f40 100644 (file)
--- a/build/bakefiles/make_dist.mk
+++ b/build/bakefiles/make_dist.mk
@@ -15,6 +15,8 @@ COMMDIR  = $(WXDIR)/src/common
 HTMLDIR  = $(WXDIR)/src/html
 RICHTEXTDIR = $(WXDIR)/src/richtext
 AUIDIR =   $(WXDIR)/src/aui
+RIBBONDIR = $(WXDIR)/src/ribbon
+PROPGRIDDIR = $(WXDIR)/src/propgrid
 STCDIR =   $(WXDIR)/src/stc
 UNIXDIR  = $(WXDIR)/src/unix
 PNGDIR   = $(WXDIR)/src/png
@@ -130,13 +132,18 @@ ALL_DIST: distrib_clean
        # copy wxpresets
        mkdir $(DISTDIR)/build
        mkdir $(DISTDIR)/build/bakefiles
+       $(CP_P) $(WXDIR)/build/bakefiles/README $(DISTDIR)/build/bakefiles
+       $(CP_P) $(WXDIR)/build/bakefiles/*.* $(DISTDIR)/build/bakefiles
        mkdir $(DISTDIR)/build/bakefiles/wxpresets
        mkdir $(DISTDIR)/build/bakefiles/wxpresets/presets
-       mkdir $(DISTDIR)/build/bakefiles/wxpresets/sample
+       $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/*.txt $(DISTDIR)/build/bakefiles/wxpresets
        $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/presets/*.bkl $(DISTDIR)/build/bakefiles/wxpresets/presets
+       $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/presets/wx_presets.py $(DISTDIR)/build/bakefiles/wxpresets/presets
+       mkdir $(DISTDIR)/build/bakefiles/wxpresets/sample
        $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/sample/minimal* $(DISTDIR)/build/bakefiles/wxpresets/sample
        $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/sample/config* $(DISTDIR)/build/bakefiles/wxpresets/sample
-       $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/*.txt $(DISTDIR)/build/bakefiles/wxpresets
+       mkdir $(DISTDIR)/build/bakefiles/wxpresets/libsample
+       $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/libsample/*.* $(DISTDIR)/build/bakefiles/wxpresets/libsample
        mkdir $(DISTDIR)/build/aclocal
        $(CP_P) $(WXDIR)/build/aclocal/*.m4 $(DISTDIR)/build/aclocal
 
@@ -157,9 +164,13 @@ ALL_GUI_DIST: ALL_DIST
        fi
        mkdir $(DISTDIR)/include/wx/meta
        mkdir $(DISTDIR)/include/wx/generic
+       mkdir $(DISTDIR)/include/wx/generic/private
        mkdir $(DISTDIR)/include/wx/html
        mkdir $(DISTDIR)/include/wx/richtext
        mkdir $(DISTDIR)/include/wx/aui
+       mkdir $(DISTDIR)/include/wx/ribbon
+       mkdir $(DISTDIR)/include/wx/persist
+       mkdir $(DISTDIR)/include/wx/propgrid
        mkdir $(DISTDIR)/include/wx/stc
        mkdir $(DISTDIR)/include/wx/protocol
        mkdir $(DISTDIR)/include/wx/unix
@@ -170,49 +181,59 @@ ALL_GUI_DIST: ALL_DIST
        $(CP_P) $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx
        $(CP_P) $(INCDIR)/wx/meta/*.h $(DISTDIR)/include/wx/meta
        $(CP_P) $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
+       $(CP_P) $(INCDIR)/wx/generic/private/*.h $(DISTDIR)/include/wx/generic/private
        $(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/ribbon/*.h $(DISTDIR)/include/wx/ribbon
+       $(CP_P) $(INCDIR)/wx/persist/*.h $(DISTDIR)/include/wx/persist
+       $(CP_P) $(INCDIR)/wx/propgrid/*.h $(DISTDIR)/include/wx/propgrid
        $(CP_P) $(INCDIR)/wx/stc/*.h $(DISTDIR)/include/wx/stc
+       $(CP_P) $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol
        $(CP_P) $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
        $(CP_P) $(INCDIR)/wx/unix/private/*.h $(DISTDIR)/include/wx/unix/private
        $(CP_P) $(INCDIR)/wx/xml/*.h $(DISTDIR)/include/wx/xml
        $(CP_P) $(INCDIR)/wx/xrc/*.h $(DISTDIR)/include/wx/xrc
-       $(CP_P) $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol
-        
+
        mkdir $(DISTDIR)/art
        mkdir $(DISTDIR)/art/gtk
        mkdir $(DISTDIR)/art/motif
        $(CP_P) $(WXDIR)/art/*.xpm $(DISTDIR)/art
        $(CP_P) $(WXDIR)/art/gtk/*.xpm $(DISTDIR)/art/gtk
        $(CP_P) $(WXDIR)/art/motif/*.xpm $(DISTDIR)/art/motif
-        
+
        mkdir $(DISTDIR)/src/$(TOOLKITDIR)
        $(CP_P) $(COMMDIR)/*.cpp $(DISTDIR)/src/common
        $(CP_P) $(COMMDIR)/*.c $(DISTDIR)/src/common
        $(CP_P) $(COMMDIR)/*.inc $(DISTDIR)/src/common
        $(CP_P) $(COMMDIR)/*.mms $(DISTDIR)/src/common
-        
+
        mkdir $(DISTDIR)/src/xrc
        $(CP_P) $(SRCDIR)/xrc/*.cpp $(DISTDIR)/src/xrc
-        
+
        mkdir $(DISTDIR)/src/unix
        $(CP_P) $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix
        $(CP_P) $(UNIXDIR)/*.mms $(DISTDIR)/src/unix
-        
+
        mkdir $(DISTDIR)/src/generic
        $(CP_P) $(GENDIR)/*.cpp $(DISTDIR)/src/generic
        $(CP_P) $(GENDIR)/*.mms $(DISTDIR)/src/generic
-        
+
        mkdir $(DISTDIR)/src/html
        $(CP_P) $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
-        
+
        mkdir $(DISTDIR)/src/richtext
        $(CP_P) $(RICHTEXTDIR)/*.cpp $(DISTDIR)/src/richtext
-        
+
        mkdir $(DISTDIR)/src/aui
        $(CP_P) $(AUIDIR)/*.cpp $(DISTDIR)/src/aui
-        
+
+       mkdir $(DISTDIR)/src/ribbon
+       $(CP_P) $(RIBBONDIR)/*.cpp $(DISTDIR)/src/ribbon
+
+       mkdir $(DISTDIR)/src/propgrid
+       $(CP_P) $(PROPGRIDDIR)/*.cpp $(DISTDIR)/src/propgrid
+
        mkdir $(DISTDIR)/src/stc
        mkdir $(DISTDIR)/src/stc/scintilla
        mkdir $(DISTDIR)/src/stc/scintilla/src
@@ -220,15 +241,17 @@ ALL_GUI_DIST: ALL_DIST
        $(CP_P) $(STCDIR)/*.* $(DISTDIR)/src/stc
        $(CP_P) $(STCDIR)/scintilla/src/* $(DISTDIR)/src/stc/scintilla/src
        $(CP_P) $(STCDIR)/scintilla/include/* $(DISTDIR)/src/stc/scintilla/include
-        
+
        mkdir $(DISTDIR)/src/png
        $(CP_PR) $(PNGDIR)/* $(DISTDIR)/src/png
-        
+
        mkdir $(DISTDIR)/src/jpeg
        $(CP_P) $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
        $(CP_P) $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg
+       $(CP_P) $(JPEGDIR)/*.vc $(DISTDIR)/src/jpeg
+       $(CP_P) $(JPEGDIR)/makefile.* $(DISTDIR)/src/jpeg
        $(CP_P) $(JPEGDIR)/README $(DISTDIR)/src/jpeg
-        
+
        mkdir $(DISTDIR)/src/tiff
        mkdir $(DISTDIR)/src/tiff/config
        mkdir $(DISTDIR)/src/tiff/contrib
@@ -272,6 +295,9 @@ BASE_DIST: ALL_DIST INTL_DIST
        mkdir $(DISTDIR)/include/wx/html
        mkdir $(DISTDIR)/include/wx/richtext
        mkdir $(DISTDIR)/include/wx/aui
+       mkdir $(DISTDIR)/include/wx/ribbon
+       mkdir $(DISTDIR)/include/wx/persist
+       mkdir $(DISTDIR)/include/wx/propgrid
        mkdir $(DISTDIR)/include/wx/stc
        mkdir $(DISTDIR)/include/wx/osx
        mkdir $(DISTDIR)/include/wx/osx/carbon
@@ -282,7 +308,6 @@ BASE_DIST: ALL_DIST INTL_DIST
        mkdir $(DISTDIR)/src/osx
        mkdir $(DISTDIR)/src/osx/core
        mkdir $(DISTDIR)/src/osx/carbon
-       mkdir $(DISTDIR)/src/osx/carbon/morefilex
        mkdir $(DISTDIR)/src/msdos
        mkdir $(DISTDIR)/src/msw
        mkdir $(DISTDIR)/src/os2
@@ -298,6 +323,10 @@ BASE_DIST: ALL_DIST INTL_DIST
 
        mkdir $(DISTDIR)/samples
        $(CP_P) $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
+       $(CP_P) $(SAMPDIR)/makefile.* $(DISTDIR)/samples
+       $(CP_P) $(SAMPDIR)/Info.plist $(DISTDIR)/samples
+       $(CP_P) $(SAMPDIR)/sample.* $(DISTDIR)/samples
+       $(CP_P) $(SAMPDIR)/samples.* $(DISTDIR)/samples
 
        mkdir $(DISTDIR)/samples/console
        $(CP_P) $(SAMPDIR)/console/Makefile.in $(DISTDIR)/samples/console
@@ -334,7 +363,7 @@ GTK_DIST: UNIV_DIST
        mkdir $(DISTDIR)/src/gtk/hildon
        $(CP_P) $(INCDIR)/wx/gtk/hildon/*.h $(DISTDIR)/include/wx/gtk/hildon
        $(CP_P) $(GTKDIR)/hildon/*.cpp $(DISTDIR)/src/gtk/hildon
-        
+
        mkdir $(DISTDIR)/src/osx
        mkdir $(DISTDIR)/src/osx/core
        $(CP_P) $(WXDIR)/src/osx/core/*.cpp $(DISTDIR)/src/osx/core
@@ -375,19 +404,28 @@ MOTIF_DIST: ALL_GUI_DIST
                $(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \
                $(DISTDIR)/include/wx/x11
 
-MACX_DIST: ALL_GUI_DIST
+OSX_CARBON_DIST: ALL_GUI_DIST
        $(CP_P) $(INCDIR)/*.* $(DISTDIR)/include
        mkdir $(DISTDIR)/include/wx/osx/carbon
-       mkdir $(DISTDIR)/include/wx/osx/private
        mkdir $(DISTDIR)/include/wx/osx/carbon/private
+       mkdir $(DISTDIR)/include/wx/osx/cocoa
+       mkdir $(DISTDIR)/include/wx/osx/iphone
        $(CP_P) $(INCDIR)/wx/osx/*.h $(DISTDIR)/include/wx/osx
        $(CP_P) $(INCDIR)/wx/osx/carbon/*.h $(DISTDIR)/include/wx/osx/carbon
        $(CP_P) $(INCDIR)/wx/osx/carbon/private/*.h $(DISTDIR)/include/wx/osx/carbon/private
        $(CP_P) $(INCDIR)/wx/osx/private/*.h $(DISTDIR)/include/wx/osx/private
+       $(CP_P) $(INCDIR)/wx/osx/cocoa/*.h $(DISTDIR)/include/wx/osx/cocoa
+       $(CP_P) $(INCDIR)/wx/osx/iphone/*.h $(DISTDIR)/include/wx/osx/iphone
        mkdir $(DISTDIR)/include/wx/osx/core
+       mkdir $(DISTDIR)/include/wx/osx/core/private
        $(CP_P) $(INCDIR)/wx/osx/core/*.h $(DISTDIR)/include/wx/osx/core
+       $(CP_P) $(INCDIR)/wx/osx/core/private/*.h $(DISTDIR)/include/wx/osx/core/private
        mkdir $(DISTDIR)/src/osx/core
        $(CP_P) $(MACDIR)/core/*.cpp $(DISTDIR)/src/osx/core
+       mkdir $(DISTDIR)/src/osx/cocoa
+       $(CP_P) $(MACDIR)/cocoa/*.mm $(DISTDIR)/src/osx/cocoa
+       mkdir $(DISTDIR)/src/osx/iphone
+       $(CP_P) $(MACDIR)/iphone/*.mm $(DISTDIR)/src/osx/iphone
        mkdir $(DISTDIR)/src/html/htmlctrl
        mkdir $(DISTDIR)/src/html/htmlctrl/webkit
        $(CP_P) $(WXDIR)/src/html/htmlctrl/webkit/*.mm $(DISTDIR)/src/html/htmlctrl/webkit
@@ -398,13 +436,8 @@ MACX_DIST: ALL_GUI_DIST
        $(CP_P) $(MACDIR)/carbon/Info.plist.in $(DISTDIR)/src/osx/carbon
        $(CP_P) $(MACDIR)/carbon/*.h $(DISTDIR)/src/osx/carbon
        $(CP_P) $(MACDIR)/carbon/*.r $(DISTDIR)/src/osx/carbon
-       mkdir $(DISTDIR)/src/osx/carbon/morefile
-       $(CP_P) $(MACDIR)/carbon/morefile/*.h $(DISTDIR)/src/osx/carbon/morefile
-       $(CP_P) $(MACDIR)/carbon/morefile/*.c $(DISTDIR)/src/osx/carbon/morefile
-       mkdir $(DISTDIR)/src/osx/carbon/morefilex
-       $(CP_P) $(MACDIR)/carbon/morefilex/*.h $(DISTDIR)/src/osx/carbon/morefilex
-       $(CP_P) $(MACDIR)/carbon/morefilex/*.c $(DISTDIR)/src/osx/carbon/morefilex
-       $(CP_P) $(MACDIR)/carbon/morefilex/*.cpp $(DISTDIR)/src/osx/carbon/morefilex
+       mkdir $(DISTDIR)/src/wxWindows.xcodeproj
+       $(CP_P) $(WXDIR)/src/wxWindows.xcodeproj/* $(DISTDIR)/src/wxWindows.xcodeproj
 
 COCOA_DIST: ALL_GUI_DIST
        $(CP_P) $(INCDIR)/wx/cocoa/*.h $(DISTDIR)/include/wx/cocoa
@@ -438,7 +471,9 @@ MSW_DIST: UNIV_DIST
        $(CP_P) $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
 
 MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
-       mkdir $(DISTDIR)/include/wx/msw
+       mkdir $(DISTDIR)/build/msw
+       $(CP_P) $(WXDIR)/build/msw/* $(DISTDIR)/build/msw
+       $(CP_P) $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
        mkdir $(DISTDIR)/include/wx/msw/ole
        mkdir $(DISTDIR)/include/wx/msw/wince
        $(CP_P) $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
@@ -446,15 +481,14 @@ MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
        $(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
        mkdir $(DISTDIR)/src/msw/ole
        mkdir $(DISTDIR)/src/msw/wince
        $(CP_P) $(MSWDIR)/*.cpp $(DISTDIR)/src/msw
+       $(CP_P) $(MSWDIR)/*.rc $(DISTDIR)/src/msw
        $(CP_P) $(MSWDIR)/*.c $(DISTDIR)/src/msw
        $(CP_P) $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
        $(CP_P) $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince
        $(CP_P) $(SRCDIR)/*.??? $(DISTDIR)/src
-       $(CP_P) $(SRCDIR)/*.?? $(DISTDIR)/src
 
 UNIV_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/include/wx/univ
@@ -535,11 +569,17 @@ DEMOS_DIST: ALL_GUI_DIST
 SAMPLES_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/samples
        $(CP_P) $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
+       $(CP_P) $(SAMPDIR)/makefile.* $(DISTDIR)/samples
+       $(CP_P) $(SAMPDIR)/Info.plist $(DISTDIR)/samples
        $(CP_P) $(SAMPDIR)/sample.* $(DISTDIR)/samples
-
-       # copy files common to all samples in a general way
-       for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/mobile $(SAMPDIR)/opengl \
-                   -mindepth 1 -maxdepth 1 -type d -not -name CVS`; do \
+       $(CP_P) $(SAMPDIR)/samples.* $(DISTDIR)/samples
+
+       # copy files common to all samples in a general way (samples without
+       # Makefile.in in them are Windows-specific and shouldn't be included in
+       # Unix distribution)
+       for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/opengl \
+                   -mindepth 1 -maxdepth 1 -type d -not -name .svn`; do \
+           if [ ! -f $$s/Makefile.in ]; then continue; fi; \
            t="$(DISTDIR)/samples/`echo $$s | sed 's@$(SAMPDIR)/@@'`"; \
            mkdir -p $$t; \
            $(CP_P) $$s/Makefile.in \
@@ -557,11 +597,9 @@ SAMPLES_DIST: ALL_GUI_DIST
        done
 
        # copy the rest, not covered by the above loop
-       $(CP_P) $(SAMPDIR)/animate/hourglass.ani $(DISTDIR)/samples/hourglass.ani
+       $(CP_P) $(SAMPDIR)/animate/hourglass.ani $(DISTDIR)/samples/animate
        $(CP_P) $(SAMPDIR)/animate/throbber.gif $(DISTDIR)/samples/animate
 
-       $(CP_P) $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console
-
        $(CP_P) $(SAMPDIR)/dialogs/tips.txt $(DISTDIR)/samples/dialogs
 
        $(CP_P) $(SAMPDIR)/dnd/d_and_d.txt $(DISTDIR)/samples/dnd
@@ -602,8 +640,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 
        $(CP_P) $(SAMPDIR)/joytest/*.wav $(DISTDIR)/samples/joytest
 
-       $(CP_P) $(SAMPDIR)/mobile/styles/*.jpg $(DISTDIR)/samples/mobile/styles
-
        $(CP_P) $(SAMPDIR)/opengl/penguin/trackball.c $(DISTDIR)/samples/opengl/penguin
        $(CP_P) $(SAMPDIR)/opengl/penguin/*.dxf.gz $(DISTDIR)/samples/opengl/penguin
        $(CP_P) $(SAMPDIR)/opengl/isosurf/*.gz $(DISTDIR)/samples/opengl/isosurf
@@ -619,15 +655,22 @@ SAMPLES_DIST: ALL_GUI_DIST
        $(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
        $(CP_P) $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
 
+       mkdir $(DISTDIR)/utils/screenshotgen
+       mkdir $(DISTDIR)/utils/screenshotgen/src
+       mkdir $(DISTDIR)/utils/screenshotgen/src/bitmaps
+       $(CP_P) $(UTILSDIR)/screenshotgen/README.txt $(DISTDIR)/utils/screenshotgen
+       $(CP_P) $(UTILSDIR)/screenshotgen/*.in $(DISTDIR)/utils/screenshotgen
+       $(CP_P) $(UTILSDIR)/screenshotgen/src/*.* $(DISTDIR)/utils/screenshotgen/src
+       $(CP_P) $(UTILSDIR)/screenshotgen/src/bitmaps/*.* $(DISTDIR)/utils/screenshotgen/src/bitmaps
+
        mkdir $(DISTDIR)/utils/ifacecheck
        mkdir $(DISTDIR)/utils/ifacecheck/src
-       $(CP_P) $(UTILSDIR)/ifacecheck/README $(DISTDIR)/utils/ifacecheck
+       $(CP_P) $(UTILSDIR)/ifacecheck/README.txt $(DISTDIR)/utils/ifacecheck
        $(CP_P) $(UTILSDIR)/ifacecheck/*.dtd $(DISTDIR)/utils/ifacecheck
        $(CP_P) $(UTILSDIR)/ifacecheck/*.xsl $(DISTDIR)/utils/ifacecheck
        $(CP_P) $(UTILSDIR)/ifacecheck/*.in $(DISTDIR)/utils/ifacecheck
@@ -675,7 +718,6 @@ INTL_DIST:
        mkdir $(DISTDIR)/locale
        $(CP_P) $(INTLDIR)/Makefile $(DISTDIR)/locale
        $(CP_P) $(INTLDIR)/*.po $(DISTDIR)/locale
-       -$(CP_P) $(INTLDIR)/*.mo $(DISTDIR)/locale
        subdirs=`cd $(INTLDIR) && ls */*.po | sed 's|/.*||' | uniq`; \
        for dir in "$$subdirs"; do                                   \
            mkdir $(DISTDIR)/locale/$$dir;                           \
@@ -687,6 +729,7 @@ MANUAL_DIST:
        mkdir $(DISTDIR)/docs/doxygen
        mkdir $(DISTDIR)/docs/doxygen/groups
        mkdir $(DISTDIR)/docs/doxygen/images
+       mkdir $(DISTDIR)/docs/doxygen/images/stock
        mkdir $(DISTDIR)/docs/doxygen/images/wxgtk
        mkdir $(DISTDIR)/docs/doxygen/images/wxmac
        mkdir $(DISTDIR)/docs/doxygen/images/wxmsw
@@ -697,28 +740,35 @@ MANUAL_DIST:
        $(CP_P) $(DOCDIR)/doxygen/mainpages/*.h $(DISTDIR)/docs/doxygen/mainpages
        $(CP_P) $(DOCDIR)/doxygen/overviews/*.h $(DISTDIR)/docs/doxygen/overviews
        $(CP_P) $(DOCDIR)/doxygen/images/*.??? $(DISTDIR)/docs/doxygen/images
+       $(CP_P) $(DOCDIR)/doxygen/images/wxgtk/*.??? $(DISTDIR)/docs/doxygen/images/stock
        $(CP_P) $(DOCDIR)/doxygen/images/wxgtk/*.??? $(DISTDIR)/docs/doxygen/images/wxgtk
-#      $(CP_P) $(DOCDIR)/doxygen/images/wxmac/*.??? $(DISTDIR)/docs/doxygen/images/wxmac
-#      $(CP_P) $(DOCDIR)/doxygen/images/wxmsw/*.??? $(DISTDIR)/docs/doxygen/images/wxmsw
+       $(CP_P) $(DOCDIR)/doxygen/images/wxmac/*.??? $(DISTDIR)/docs/doxygen/images/wxmac
+       $(CP_P) $(DOCDIR)/doxygen/images/wxmsw/*.??? $(DISTDIR)/docs/doxygen/images/wxmsw
        mkdir $(DISTDIR)/interface
        mkdir $(DISTDIR)/interface/wx
        mkdir $(DISTDIR)/interface/wx/aui
+       mkdir $(DISTDIR)/interface/wx/ribbon
        mkdir $(DISTDIR)/interface/wx/generic
        mkdir $(DISTDIR)/interface/wx/html
        mkdir $(DISTDIR)/interface/wx/msw
        mkdir $(DISTDIR)/interface/wx/msw/ole
+       mkdir $(DISTDIR)/interface/wx/persist
        mkdir $(DISTDIR)/interface/wx/protocol
+       mkdir $(DISTDIR)/interface/wx/propgrid
        mkdir $(DISTDIR)/interface/wx/richtext
        mkdir $(DISTDIR)/interface/wx/stc
        mkdir $(DISTDIR)/interface/wx/xml
        mkdir $(DISTDIR)/interface/wx/xrc
        $(CP_P) $(IFACEDIR)/wx/*.h $(DISTDIR)/interface/wx
        $(CP_P) $(IFACEDIR)/wx/aui/*.h $(DISTDIR)/interface/wx/aui
+       $(CP_P) $(IFACEDIR)/wx/ribbon/*.h $(DISTDIR)/interface/wx/ribbon
        $(CP_P) $(IFACEDIR)/wx/generic/*.h $(DISTDIR)/interface/wx/generic
        $(CP_P) $(IFACEDIR)/wx/html/*.h $(DISTDIR)/interface/wx/html
        $(CP_P) $(IFACEDIR)/wx/msw/*.h $(DISTDIR)/interface/wx/msw
        $(CP_P) $(IFACEDIR)/wx/msw/ole/*.h $(DISTDIR)/interface/wx/msw/ole
+       $(CP_P) $(IFACEDIR)/wx/persist/*.h $(DISTDIR)/interface/wx/persist
        $(CP_P) $(IFACEDIR)/wx/protocol/*.h $(DISTDIR)/interface/wx/protocol
+       $(CP_P) $(IFACEDIR)/wx/propgrid/*.h $(DISTDIR)/interface/wx/propgrid
        $(CP_P) $(IFACEDIR)/wx/richtext/*.h $(DISTDIR)/interface/wx/richtext
        $(CP_P) $(IFACEDIR)/wx/stc/*.h $(DISTDIR)/interface/wx/stc
        $(CP_P) $(IFACEDIR)/wx/xml/*.h $(DISTDIR)/interface/wx/xml
@@ -770,7 +820,7 @@ distdir: @GUIDIST@
        @# 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 \
-                       \( -name "makefile.*" -a ! -name "makefile.unx" \) \) \
+                       \( -name "makefile.*" -a ! -name "makefile.gcc" -a ! -name "makefile.unx" \) \) \
                        -print | egrep -v '/samples/.*\.hh.$$' | xargs rm -rf
 
 dist: distdir
@@ -815,8 +865,14 @@ bzip-dist: @GUIDIST@
        mv wxDemos demos; \
        fi
 
-# RR: Copy text and binary data separatly
-win-dist: MSW_ZIP_TEXT_DIST
+win-dist: MSW_ZIP_TEXT_DIST SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST INTL_DIST
+       for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/opengl \
+                   -mindepth 1 -maxdepth 1 -type d -not -name CVS`; do \
+           t="$(DISTDIR)/samples/`echo $$s | sed 's@$(SAMPDIR)/@@'`"; \
+           $(CP_P) \
+                   `find $$s -maxdepth 1 -name '*.dsp' -o -name '*.vcproj'` $$t; \
+       done
+# RR: Copy text and binary data separately
        @echo "*** Creating wxWidgets ZIP distribution in $(DISTDIR)..."
        @cd _dist_dir && mv $(DISTDIRNAME) wxMSW
        @cd _dist_dir && zip -r -l  ../$(WXARCHIVE_ZIP) *
@@ -877,5 +933,5 @@ rpm: bzip-dist
        -mkdir $(RPMTOP)/RPMS
        -mkdir $(RPMTOP)/SRPMS
        cp -f $(WXARCHIVE_BZIP) $(RPMTOP)/SOURCES
-       rpm -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec
-       mv -f `find $(RPMTOP) -name "wx$(TOOLKIT)*.rpm"` .
+       rpmbuild -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec
+       mv -f `find $(RPMTOP) -name "wx-*.rpm"` .