From 3c49e952724e293f473b16f4172a595a0d1a6c40 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 31 Oct 2006 16:50:39 +0000 Subject: [PATCH] include wx/private/*.h and wx/port/gtk/*.h files in the distribution (also fixes Debian packages build) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 8 ++++++++ build/bakefiles/make_dist.mk | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/Makefile.in b/Makefile.in index d79634f0f2..a37fd650eb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -28852,7 +28852,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 @@ -28877,6 +28879,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 @@ -29039,6 +29045,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 diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk index 6a2817d6c6..1b82b7fea4 100644 --- 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 -- 2.45.2