Add missing wxUniv files to msw and gtk tarballs

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index da116c5fb8e51b35d21cff8314a461eb85caa235..bb85e99f58f989d78ab31fde39c7f746987ca8d7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -24748,7 +24748,7 @@ BASE_DIST: ALL_DIST
        $(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.rc $(DISTDIR)/utils/tex2rtf/src
        $(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.xpm $(DISTDIR)/utils/tex2rtf/src
 
        $(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.rc $(DISTDIR)/utils/tex2rtf/src
        $(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.xpm $(DISTDIR)/utils/tex2rtf/src
 

-GTK_DIST: ALL_GUI_DIST
+GTK_DIST: UNIV_DIST

        $(CP_P) $(WXDIR)/wxGTK.spec $(DISTDIR)
        $(CP_P) $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk
        $(CP_P) $(GTKDIR)/*.h $(DISTDIR)/src/gtk
        $(CP_P) $(WXDIR)/wxGTK.spec $(DISTDIR)
        $(CP_P) $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk
        $(CP_P) $(GTKDIR)/*.h $(DISTDIR)/src/gtk


@@ -24772,7 +24772,7 @@ GTK_DIST: ALL_GUI_DIST
        case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac
        $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
 
        case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac
        $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
 

-X11_DIST: ALL_GUI_DIST UNIV_DIST
+X11_DIST: UNIV_DIST

        $(CP_P) $(WXDIR)/wxX11.spec $(DISTDIR)
        $(CP_P) $(INCDIR)/wx/x11/*.h $(DISTDIR)/include/wx/x11
        $(CP_P) $(X11DIR)/*.cpp $(DISTDIR)/src/x11
        $(CP_P) $(WXDIR)/wxX11.spec $(DISTDIR)
        $(CP_P) $(INCDIR)/wx/x11/*.h $(DISTDIR)/include/wx/x11
        $(CP_P) $(X11DIR)/*.cpp $(DISTDIR)/src/x11


@@ -24844,7 +24844,7 @@ MACX_DIST: ALL_GUI_DIST
 COCOA_DIST: ALL_GUI_DIST
        $(CP_P) $(COCOADIR)/*.mm $(DISTDIR)/src/cocoa
 
 COCOA_DIST: ALL_GUI_DIST
        $(CP_P) $(COCOADIR)/*.mm $(DISTDIR)/src/cocoa
 

-MSW_DIST: ALL_GUI_DIST
+MSW_DIST: UNIV_DIST

        $(CP_P) $(WXDIR)/wxWINE.spec $(DISTDIR)
        mkdir $(DISTDIR)/include/wx/msw/ole
        mkdir $(DISTDIR)/include/wx/msw/wince
        $(CP_P) $(WXDIR)/wxWINE.spec $(DISTDIR)
        mkdir $(DISTDIR)/include/wx/msw/ole
        mkdir $(DISTDIR)/include/wx/msw/wince

diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk
index d97d3e1d3ddd68e77c99a01aba1f09d1489d0a23..7e52fd04ff976a6bfe1201326b6f8af78b9debf7 100644 (file)
--- a/build/bakefiles/make_dist.mk
+++ b/build/bakefiles/make_dist.mk
@@ -274,7 +274,7 @@ BASE_DIST: ALL_DIST
        $(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.rc $(DISTDIR)/utils/tex2rtf/src
        $(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.xpm $(DISTDIR)/utils/tex2rtf/src
 
        $(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.rc $(DISTDIR)/utils/tex2rtf/src
        $(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.xpm $(DISTDIR)/utils/tex2rtf/src
 

-GTK_DIST: ALL_GUI_DIST
+GTK_DIST: UNIV_DIST

        $(CP_P) $(WXDIR)/wxGTK.spec $(DISTDIR)
        $(CP_P) $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk
        $(CP_P) $(GTKDIR)/*.h $(DISTDIR)/src/gtk
        $(CP_P) $(WXDIR)/wxGTK.spec $(DISTDIR)
        $(CP_P) $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk
        $(CP_P) $(GTKDIR)/*.h $(DISTDIR)/src/gtk


@@ -298,7 +298,7 @@ GTK_DIST: ALL_GUI_DIST
        case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac
        $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
 
        case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac
        $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
 

-X11_DIST: ALL_GUI_DIST UNIV_DIST
+X11_DIST: UNIV_DIST

        $(CP_P) $(WXDIR)/wxX11.spec $(DISTDIR)
        $(CP_P) $(INCDIR)/wx/x11/*.h $(DISTDIR)/include/wx/x11
        $(CP_P) $(X11DIR)/*.cpp $(DISTDIR)/src/x11
        $(CP_P) $(WXDIR)/wxX11.spec $(DISTDIR)
        $(CP_P) $(INCDIR)/wx/x11/*.h $(DISTDIR)/include/wx/x11
        $(CP_P) $(X11DIR)/*.cpp $(DISTDIR)/src/x11


@@ -370,7 +370,7 @@ MACX_DIST: ALL_GUI_DIST
 COCOA_DIST: ALL_GUI_DIST
        $(CP_P) $(COCOADIR)/*.mm $(DISTDIR)/src/cocoa
 
 COCOA_DIST: ALL_GUI_DIST
        $(CP_P) $(COCOADIR)/*.mm $(DISTDIR)/src/cocoa
 

-MSW_DIST: ALL_GUI_DIST
+MSW_DIST: UNIV_DIST

        $(CP_P) $(WXDIR)/wxWINE.spec $(DISTDIR)
        mkdir $(DISTDIR)/include/wx/msw/ole
        mkdir $(DISTDIR)/include/wx/msw/wince
        $(CP_P) $(WXDIR)/wxWINE.spec $(DISTDIR)
        mkdir $(DISTDIR)/include/wx/msw/ole
        mkdir $(DISTDIR)/include/wx/msw/wince