From b3706b40d2b7597fb7e165a6309e56e5952ceb2b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 23 Oct 2010 14:09:49 +0000 Subject: [PATCH] Add more headers to "make dist" and remove .mo files. Add wx/persist headers to the list of files used by "make dist" and remove the message catalogs which shouldn't be part of the source distribution. See #12567. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 10 +++++++--- build/bakefiles/make_dist.mk | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Makefile.in b/Makefile.in index a075aad300..a55938aaf4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -36395,6 +36395,7 @@ ALL_GUI_DIST: ALL_DIST mkdir $(DISTDIR)/include/wx/richtext mkdir $(DISTDIR)/include/wx/aui mkdir $(DISTDIR)/include/wx/ribbon + mkdir $(DISTDIR)/include/wx/persist mkdir $(DISTDIR)/include/wx/propgrid mkdir $(DISTDIR)/include/wx/stc mkdir $(DISTDIR)/include/wx/protocol @@ -36411,13 +36412,14 @@ ALL_GUI_DIST: ALL_DIST $(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/persist/*.h $(DISTDIR)/include/wx/persist $(CP_P) $(INCDIR)/wx/propgrid/*.h $(DISTDIR)/include/wx/propgrid $(CP_P) $(INCDIR)/wx/stc/*.h $(DISTDIR)/include/wx/stc + $(CP_P) $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol $(CP_P) $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix $(CP_P) $(INCDIR)/wx/unix/private/*.h $(DISTDIR)/include/wx/unix/private $(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 @@ -36451,7 +36453,7 @@ ALL_GUI_DIST: ALL_DIST mkdir $(DISTDIR)/src/aui $(CP_P) $(AUIDIR)/*.cpp $(DISTDIR)/src/aui - + mkdir $(DISTDIR)/src/ribbon $(CP_P) $(RIBBONDIR)/*.cpp $(DISTDIR)/src/ribbon @@ -36520,6 +36522,7 @@ BASE_DIST: ALL_DIST INTL_DIST mkdir $(DISTDIR)/include/wx/richtext mkdir $(DISTDIR)/include/wx/aui mkdir $(DISTDIR)/include/wx/ribbon + mkdir $(DISTDIR)/include/wx/persist mkdir $(DISTDIR)/include/wx/propgrid mkdir $(DISTDIR)/include/wx/stc mkdir $(DISTDIR)/include/wx/osx @@ -36941,7 +36944,6 @@ INTL_DIST: mkdir $(DISTDIR)/locale $(CP_P) $(INTLDIR)/Makefile $(DISTDIR)/locale $(CP_P) $(INTLDIR)/*.po $(DISTDIR)/locale - -$(CP_P) $(INTLDIR)/*.mo $(DISTDIR)/locale subdirs=`cd $(INTLDIR) && ls */*.po | sed 's|/.*||' | uniq`; \ for dir in "$$subdirs"; do \ mkdir $(DISTDIR)/locale/$$dir; \ @@ -36976,6 +36978,7 @@ MANUAL_DIST: mkdir $(DISTDIR)/interface/wx/html mkdir $(DISTDIR)/interface/wx/msw mkdir $(DISTDIR)/interface/wx/msw/ole + mkdir $(DISTDIR)/interface/wx/persist mkdir $(DISTDIR)/interface/wx/protocol mkdir $(DISTDIR)/interface/wx/propgrid mkdir $(DISTDIR)/interface/wx/richtext @@ -36989,6 +36992,7 @@ MANUAL_DIST: $(CP_P) $(IFACEDIR)/wx/html/*.h $(DISTDIR)/interface/wx/html $(CP_P) $(IFACEDIR)/wx/msw/*.h $(DISTDIR)/interface/wx/msw $(CP_P) $(IFACEDIR)/wx/msw/ole/*.h $(DISTDIR)/interface/wx/msw/ole + $(CP_P) $(IFACEDIR)/wx/persist/*.h $(DISTDIR)/interface/wx/persist $(CP_P) $(IFACEDIR)/wx/protocol/*.h $(DISTDIR)/interface/wx/protocol $(CP_P) $(IFACEDIR)/wx/propgrid/*.h $(DISTDIR)/interface/wx/propgrid $(CP_P) $(IFACEDIR)/wx/richtext/*.h $(DISTDIR)/interface/wx/richtext diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk index 0e903814ee..1adbbebecc 100644 --- a/build/bakefiles/make_dist.mk +++ b/build/bakefiles/make_dist.mk @@ -169,6 +169,7 @@ ALL_GUI_DIST: ALL_DIST mkdir $(DISTDIR)/include/wx/richtext mkdir $(DISTDIR)/include/wx/aui mkdir $(DISTDIR)/include/wx/ribbon + mkdir $(DISTDIR)/include/wx/persist mkdir $(DISTDIR)/include/wx/propgrid mkdir $(DISTDIR)/include/wx/stc mkdir $(DISTDIR)/include/wx/protocol @@ -185,13 +186,14 @@ ALL_GUI_DIST: ALL_DIST $(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/persist/*.h $(DISTDIR)/include/wx/persist $(CP_P) $(INCDIR)/wx/propgrid/*.h $(DISTDIR)/include/wx/propgrid $(CP_P) $(INCDIR)/wx/stc/*.h $(DISTDIR)/include/wx/stc + $(CP_P) $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol $(CP_P) $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix $(CP_P) $(INCDIR)/wx/unix/private/*.h $(DISTDIR)/include/wx/unix/private $(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 @@ -225,7 +227,7 @@ ALL_GUI_DIST: ALL_DIST mkdir $(DISTDIR)/src/aui $(CP_P) $(AUIDIR)/*.cpp $(DISTDIR)/src/aui - + mkdir $(DISTDIR)/src/ribbon $(CP_P) $(RIBBONDIR)/*.cpp $(DISTDIR)/src/ribbon @@ -294,6 +296,7 @@ BASE_DIST: ALL_DIST INTL_DIST mkdir $(DISTDIR)/include/wx/richtext mkdir $(DISTDIR)/include/wx/aui mkdir $(DISTDIR)/include/wx/ribbon + mkdir $(DISTDIR)/include/wx/persist mkdir $(DISTDIR)/include/wx/propgrid mkdir $(DISTDIR)/include/wx/stc mkdir $(DISTDIR)/include/wx/osx @@ -715,7 +718,6 @@ INTL_DIST: mkdir $(DISTDIR)/locale $(CP_P) $(INTLDIR)/Makefile $(DISTDIR)/locale $(CP_P) $(INTLDIR)/*.po $(DISTDIR)/locale - -$(CP_P) $(INTLDIR)/*.mo $(DISTDIR)/locale subdirs=`cd $(INTLDIR) && ls */*.po | sed 's|/.*||' | uniq`; \ for dir in "$$subdirs"; do \ mkdir $(DISTDIR)/locale/$$dir; \ @@ -750,6 +752,7 @@ MANUAL_DIST: mkdir $(DISTDIR)/interface/wx/html mkdir $(DISTDIR)/interface/wx/msw mkdir $(DISTDIR)/interface/wx/msw/ole + mkdir $(DISTDIR)/interface/wx/persist mkdir $(DISTDIR)/interface/wx/protocol mkdir $(DISTDIR)/interface/wx/propgrid mkdir $(DISTDIR)/interface/wx/richtext @@ -763,6 +766,7 @@ MANUAL_DIST: $(CP_P) $(IFACEDIR)/wx/html/*.h $(DISTDIR)/interface/wx/html $(CP_P) $(IFACEDIR)/wx/msw/*.h $(DISTDIR)/interface/wx/msw $(CP_P) $(IFACEDIR)/wx/msw/ole/*.h $(DISTDIR)/interface/wx/msw/ole + $(CP_P) $(IFACEDIR)/wx/persist/*.h $(DISTDIR)/interface/wx/persist $(CP_P) $(IFACEDIR)/wx/protocol/*.h $(DISTDIR)/interface/wx/protocol $(CP_P) $(IFACEDIR)/wx/propgrid/*.h $(DISTDIR)/interface/wx/propgrid $(CP_P) $(IFACEDIR)/wx/richtext/*.h $(DISTDIR)/interface/wx/richtext