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
# 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
+ 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
mkdir $(DISTDIR)/include/wx/html
mkdir $(DISTDIR)/include/wx/richtext
mkdir $(DISTDIR)/include/wx/aui
+ mkdir $(DISTDIR)/include/wx/ribbon
mkdir $(DISTDIR)/include/wx/propgrid
mkdir $(DISTDIR)/include/wx/stc
mkdir $(DISTDIR)/include/wx/protocol
$(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/propgrid/*.h $(DISTDIR)/include/wx/propgrid
$(CP_P) $(INCDIR)/wx/stc/*.h $(DISTDIR)/include/wx/stc
$(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
$(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
$(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
mkdir $(DISTDIR)/include/wx/html
mkdir $(DISTDIR)/include/wx/richtext
mkdir $(DISTDIR)/include/wx/aui
+ mkdir $(DISTDIR)/include/wx/ribbon
mkdir $(DISTDIR)/include/wx/propgrid
mkdir $(DISTDIR)/include/wx/stc
mkdir $(DISTDIR)/include/wx/osx
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
$(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/carbon/private
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) $(SAMPDIR)/samples.* $(DISTDIR)/samples
# copy files common to all samples in a general way
- for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/mobile $(SAMPDIR)/opengl \
+ for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/opengl \
-mindepth 1 -maxdepth 1 -type d -not -name .svn`; do \
t="$(DISTDIR)/samples/`echo $$s | sed 's@$(SAMPDIR)/@@'`"; \
mkdir -p $$t; \
$(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
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
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
$(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/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
fi
win-dist: MSW_ZIP_TEXT_DIST SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST INTL_DIST
-# RR: copy VC files common to all samples in a general way
- for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/mobile $(SAMPDIR)/opengl \
+ 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) \