include expat in distribution tarballs

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

diff --git a/Makefile.in b/Makefile.in
index de4327b3c4bc82eaa5c94d5e9c8023d0596f8905..9373d2c3ddb5ecc4788bd350d6f09b7ef3fee4b2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -17138,6 +17138,7 @@ JPEGDIR  = $(WXDIR)/src/jpeg
 TIFFDIR  = $(WXDIR)/src/tiff
 ZLIBDIR  = $(WXDIR)/src/zlib
 REGEXDIR = $(WXDIR)/src/regex
 TIFFDIR  = $(WXDIR)/src/tiff
 ZLIBDIR  = $(WXDIR)/src/zlib
 REGEXDIR = $(WXDIR)/src/regex

+EXPATDIR = $(WXDIR)/src/expat

 GTKDIR   = $(WXDIR)/src/gtk
 X11DIR   = $(WXDIR)/src/x11
 X11INC   = $(WXDIR)/include/wx/x11
 GTKDIR   = $(WXDIR)/src/gtk
 X11DIR   = $(WXDIR)/src/x11
 X11INC   = $(WXDIR)/include/wx/x11


@@ -17228,6 +17229,8 @@ ALL_DIST: distrib_clean
        cp $(REGEXDIR)/WHATSNEW $(DISTDIR)/src/regex
        cp $(REGEXDIR)/mkh $(DISTDIR)/src/regex
        cp $(REGEXDIR)/tests $(DISTDIR)/src/regex
        cp $(REGEXDIR)/WHATSNEW $(DISTDIR)/src/regex
        cp $(REGEXDIR)/mkh $(DISTDIR)/src/regex
        cp $(REGEXDIR)/tests $(DISTDIR)/src/regex

+       cp -Rf $(EXPATDIR) $(DISTDIR)/src
+       (cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`)

        mkdir $(DISTDIR)/src/iodbc
        cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
        cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc
        mkdir $(DISTDIR)/src/iodbc
        cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
        cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc

diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk
index f856013149fea82e153d8f0aff0198906ef1defb..e153ad13239756a9c2f0d1935c014501fc332fa7 100644 (file)
--- a/build/bakefiles/make_dist.mk
+++ b/build/bakefiles/make_dist.mk
@@ -20,6 +20,7 @@ JPEGDIR  = $(WXDIR)/src/jpeg
 TIFFDIR  = $(WXDIR)/src/tiff
 ZLIBDIR  = $(WXDIR)/src/zlib
 REGEXDIR = $(WXDIR)/src/regex
 TIFFDIR  = $(WXDIR)/src/tiff
 ZLIBDIR  = $(WXDIR)/src/zlib
 REGEXDIR = $(WXDIR)/src/regex

+EXPATDIR = $(WXDIR)/src/expat

 GTKDIR   = $(WXDIR)/src/gtk
 X11DIR   = $(WXDIR)/src/x11
 X11INC   = $(WXDIR)/include/wx/x11
 GTKDIR   = $(WXDIR)/src/gtk
 X11DIR   = $(WXDIR)/src/x11
 X11INC   = $(WXDIR)/include/wx/x11


@@ -110,6 +111,8 @@ ALL_DIST: distrib_clean
        cp $(REGEXDIR)/WHATSNEW $(DISTDIR)/src/regex
        cp $(REGEXDIR)/mkh $(DISTDIR)/src/regex
        cp $(REGEXDIR)/tests $(DISTDIR)/src/regex
        cp $(REGEXDIR)/WHATSNEW $(DISTDIR)/src/regex
        cp $(REGEXDIR)/mkh $(DISTDIR)/src/regex
        cp $(REGEXDIR)/tests $(DISTDIR)/src/regex

+       cp -Rf $(EXPATDIR) $(DISTDIR)/src
+       (cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`)

        mkdir $(DISTDIR)/src/iodbc
        cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
        cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc
        mkdir $(DISTDIR)/src/iodbc
        cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
        cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc