Add more missing files to the tarballs

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

diff --git a/Makefile.in b/Makefile.in
index 238a30120dd9e017b50f57a11507d9c03519457b..16c1dc0f57460a8ffa4b9bdb49951123fd565396 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -25143,6 +25143,7 @@ SAMPLES_DIST: ALL_GUI_DIST
        $(CP_P) $(SAMPDIR)/html/help/*.cpp $(DISTDIR)/samples/html/help
        mkdir $(DISTDIR)/samples/html/help/helpfiles
        $(CP_P) $(SAMPDIR)/html/help/helpfiles/*.??? $(DISTDIR)/samples/html/help/helpfiles
        $(CP_P) $(SAMPDIR)/html/help/*.cpp $(DISTDIR)/samples/html/help
        mkdir $(DISTDIR)/samples/html/help/helpfiles
        $(CP_P) $(SAMPDIR)/html/help/helpfiles/*.??? $(DISTDIR)/samples/html/help/helpfiles

+

        mkdir $(DISTDIR)/samples/html/helpview
        $(CP_P) $(SAMPDIR)/html/helpview/Makefile.in $(DISTDIR)/samples/html/helpview
        $(CP_P) $(SAMPDIR)/html/helpview/*.cpp $(DISTDIR)/samples/html/helpview
        mkdir $(DISTDIR)/samples/html/helpview
        $(CP_P) $(SAMPDIR)/html/helpview/Makefile.in $(DISTDIR)/samples/html/helpview
        $(CP_P) $(SAMPDIR)/html/helpview/*.cpp $(DISTDIR)/samples/html/helpview


@@ -25656,7 +25657,7 @@ distdir: @GUIDIST@
        @# 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" \) \) \
        @# 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" \) \) \

-                       -print | xargs rm -rf
+                       -print | grep -v '/samples/.*\.hh.$$' | xargs rm -rf

 
 dist: distdir
        @cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
 
 dist: distdir
        @cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);

diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk
index 9c31ef2e07925fe6d5909d237c881b170b932009..7bde8029ad5231f30991425237bc6d2dd484e5d4 100644 (file)
--- a/build/bakefiles/make_dist.mk
+++ b/build/bakefiles/make_dist.mk
@@ -669,6 +669,7 @@ SAMPLES_DIST: ALL_GUI_DIST
        $(CP_P) $(SAMPDIR)/html/help/*.cpp $(DISTDIR)/samples/html/help
        mkdir $(DISTDIR)/samples/html/help/helpfiles
        $(CP_P) $(SAMPDIR)/html/help/helpfiles/*.??? $(DISTDIR)/samples/html/help/helpfiles
        $(CP_P) $(SAMPDIR)/html/help/*.cpp $(DISTDIR)/samples/html/help
        mkdir $(DISTDIR)/samples/html/help/helpfiles
        $(CP_P) $(SAMPDIR)/html/help/helpfiles/*.??? $(DISTDIR)/samples/html/help/helpfiles

+

        mkdir $(DISTDIR)/samples/html/helpview
        $(CP_P) $(SAMPDIR)/html/helpview/Makefile.in $(DISTDIR)/samples/html/helpview
        $(CP_P) $(SAMPDIR)/html/helpview/*.cpp $(DISTDIR)/samples/html/helpview
        mkdir $(DISTDIR)/samples/html/helpview
        $(CP_P) $(SAMPDIR)/html/helpview/Makefile.in $(DISTDIR)/samples/html/helpview
        $(CP_P) $(SAMPDIR)/html/helpview/*.cpp $(DISTDIR)/samples/html/helpview


@@ -1182,7 +1183,7 @@ distdir: @GUIDIST@
        @# 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" \) \) \
        @# 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" \) \) \

-                       -print | xargs rm -rf
+                       -print | grep -v '/samples/.*\.hh.$$' | xargs rm -rf

 
 dist: distdir
        @cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
 
 dist: distdir
        @cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);