Use kControlContentIconRef when recreating the tool for toggled state

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

diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk
index 5ef1f92d024b6eaf96153c75e3b94f4305b388ed..1b82b7fea4585bf89165e3331e8a58754b650cb3 100644 (file)
--- a/build/bakefiles/make_dist.mk
+++ b/build/bakefiles/make_dist.mk
@@ -131,7 +131,9 @@ ALL_DIST: distrib_clean
        # copy some files from include/ that are not installed:
        mkdir $(DISTDIR)/include
        mkdir $(DISTDIR)/include/wx
+       mkdir $(DISTDIR)/include/wx/private
        $(CP_P) $(INCDIR)/wx/fmappriv.h $(DISTDIR)/include/wx
+       $(CP_P) $(INCDIR)/wx/private/*.h $(DISTDIR)/include/wx/private
        # copy wxpresets
        mkdir $(DISTDIR)/build
        mkdir $(DISTDIR)/build/bakefiles
@@ -156,6 +158,10 @@ ALL_GUI_DIST: ALL_DIST
        if test -f $(DOCDIR)/$(TOOLKITDIR)/todo.txt ; then \
          $(CP_P) $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt ; fi
        mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR)
+       if test -d $(INCDIR)/wx/$(TOOLKITDIR)/private; then \
+           mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR)/private && \
+           $(CP_P) $(INCDIR)/wx/$(TOOLKITDIR)/private/*.h $(DISTDIR)/include/wx/$(TOOLKITDIR)/private; \
+       fi
        mkdir $(DISTDIR)/include/wx/generic
        mkdir $(DISTDIR)/include/wx/html
        mkdir $(DISTDIR)/include/wx/richtext
@@ -318,6 +324,8 @@ GTK_DIST: UNIV_DIST
 X11_DIST: UNIV_DIST
        $(CP_P) $(WXDIR)/wxX11.spec $(DISTDIR)
        $(CP_P) $(INCDIR)/wx/x11/*.h $(DISTDIR)/include/wx/x11
+       mkdir $(DISTDIR)/include/wx/gtk/private
+       $(CP_P) $(INCDIR)/wx/gtk/private/string.h $(DISTDIR)/include/wx/gtk/private
        $(CP_P) $(X11DIR)/*.cpp $(DISTDIR)/src/x11
        $(CP_P) $(X11DIR)/*.c $(DISTDIR)/src/x11
        $(CP_P) $(X11DIR)/*.xbm $(DISTDIR)/src/x11
@@ -395,7 +403,6 @@ COCOA_DIST: ALL_GUI_DIST
        $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
 
 MSW_DIST: UNIV_DIST
-       $(CP_P) $(WXDIR)/wxWINE.spec $(DISTDIR)
        mkdir $(DISTDIR)/include/wx/msw/ole
        mkdir $(DISTDIR)/include/wx/msw/wince
        $(CP_P) $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
@@ -415,7 +422,6 @@ MSW_DIST: UNIV_DIST
        $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
 
 MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
-       $(CP_P) $(WXDIR)/wxWINE.spec $(DISTDIR)
        mkdir $(DISTDIR)/include/wx/msw
        mkdir $(DISTDIR)/include/wx/msw/ole
        mkdir $(DISTDIR)/include/wx/msw/wince
@@ -539,6 +545,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/throbber.gif $(DISTDIR)/samples/animate
+
        $(CP_P) $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console
 
        $(CP_P) $(SAMPDIR)/dialogs/tips.txt $(DISTDIR)/samples/dialogs
@@ -612,21 +621,6 @@ UTILS_DIST: ALL_GUI_DIST
        $(CP_P) $(UTILSDIR)/tex2rtf/src/*.cpp $(DISTDIR)/utils/tex2rtf/src
        -$(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.* $(DISTDIR)/utils/tex2rtf/src
 
-       mkdir $(DISTDIR)/utils/configtool
-       mkdir $(DISTDIR)/utils/configtool/configs
-       mkdir $(DISTDIR)/utils/configtool/docs
-       mkdir $(DISTDIR)/utils/configtool/src
-       mkdir $(DISTDIR)/utils/configtool/src/bitmaps
-       mkdir $(DISTDIR)/utils/configtool/scripts
-       $(CP_P) $(UTILSDIR)/configtool/*.in $(DISTDIR)/utils/configtool
-       $(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
-       $(CP_P) $(UTILSDIR)/configtool/src/*.cpp $(DISTDIR)/utils/configtool/src
-       $(CP_P) $(UTILSDIR)/configtool/src/bitmaps/*.xpm $(DISTDIR)/utils/configtool/src/bitmaps
-       $(CP_P) $(UTILSDIR)/configtool/scripts/????* $(DISTDIR)/utils/configtool/scripts
-
        mkdir $(DISTDIR)/utils/emulator
        mkdir $(DISTDIR)/utils/emulator/src
        mkdir $(DISTDIR)/utils/emulator/docs