Restore ALL_BASE_HEADERS to its previous meaning of 'all for a given port' as

it is used in this sense in rpmspec.bkl, add ALL_PORTS_BASE_HEADERS for
'make dist', and rebake.

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

diff --git a/Makefile.in b/Makefile.in
index 15e8519465c3fd71355f21a0169c9863b3dc171b..8154fe3225db337b9e6b7007326ff15b835beb10 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -216,7 +216,7 @@ WXEXPAT_OBJECTS =  \
        wxexpat_xmlrole.o \
        wxexpat_xmltok.o
 PLUGINS_INST_DIR = $(libdir)/wx/$(PLUGIN_VERSION0)
-ALL_HEADERS =  \
+ALL_BASE_HEADERS =  \
        wx/afterstd.h \
        wx/app.h \
        wx/apptrait.h \
@@ -339,9 +339,11 @@ ALL_HEADERS =  \
        wx/xtixml.h \
        wx/db.h \
        wx/dbkeyg.h \
-       wx/dbtable.h \
+       wx/dbtable.h
+ALL_HEADERS =  \
+       $(ALL_BASE_HEADERS) \
        $(ALL_GUI_HEADERS)
-ALL_BASE_HEADERS =  \
+ALL_PORTS_BASE_HEADERS =  \
        wx/afterstd.h \
        wx/app.h \
        wx/apptrait.h \
@@ -2714,6 +2716,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
        wx/xrc/xh_tglbtn.h \
        wx/xrc/xh_toolb.h \
        wx/xrc/xh_tree.h \
+       wx/xrc/xh_treebk.h \
        wx/xrc/xh_unkwn.h \
        wx/xrc/xh_wizrd.h \
        wx/xrc/xmlres.h
@@ -24599,7 +24602,7 @@ BASE_DIST: ALL_DIST
        ln -sf $(DOCDIR)/base/readme.txt $(DISTDIR)/README.txt
        ln -sf $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
        ln -sf $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common
-       list='$(ALL_BASE_HEADERS)'; for p in $$list; do \
+       list='$(ALL_PORTS_BASE_HEADERS)'; for p in $$list; do \
          ln -sf $(WXDIR)/include/$$p $(DISTDIR)/include/$$p; \
        done
        list='$(ALL_BASE_SOURCES)'; for p in $$list; do \

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index f20a29037f110e1b71e863b1b39d3fde1cdd9cbf..d0d7033130298f5678648c01421fc952b378d851 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -2969,16 +2969,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     </set>
 
     <!-- for 'make install', only the headers needed for the installed port -->
-    <set var="ALL_HEADERS" make_var="1" hints="files">
+    <set var="ALL_BASE_HEADERS" make_var="1" hints="files">
         $(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
         $(NET_CMN_HDR) $(NET_PLATFORM_HDR)
         $(XML_HDR) $(ODBC_HDR)
-        $(ALL_GUI_HEADERS)
+    </set>
+    <set var="ALL_HEADERS" make_var="1" hints="files">
+        $(ALL_BASE_HEADERS) $(ALL_GUI_HEADERS)
     </set>
 
 
     <!-- used by 'make dist', should include wxBase headers for all ports -->
-    <set var="ALL_BASE_HEADERS" make_var="1" hints="files">
+    <set var="ALL_PORTS_BASE_HEADERS" make_var="1" hints="files">
         $(BASE_CMN_HDR)
         $(BASE_UNIX_HDR)
         $(BASE_WIN32_HDR) $(BASE_WINCE_HDR)

diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk
index 6e6adbc39ed4e2990f9ef504861a549679088705..d47aa8e082a39dd38a38a4bd969799b852237457 100644 (file)
--- a/build/bakefiles/make_dist.mk
+++ b/build/bakefiles/make_dist.mk
@@ -223,7 +223,7 @@ BASE_DIST: ALL_DIST
        ln -sf $(DOCDIR)/base/readme.txt $(DISTDIR)/README.txt
        ln -sf $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
        ln -sf $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common
-       list='$(ALL_BASE_HEADERS)'; for p in $$list; do \
+       list='$(ALL_PORTS_BASE_HEADERS)'; for p in $$list; do \
          ln -sf $(WXDIR)/include/$$p $(DISTDIR)/include/$$p; \
        done
        list='$(ALL_BASE_SOURCES)'; for p in $$list; do \

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 2a1555f72fa5406acfde3f85b0589f50b1ca3d99..4d1ad461f5722999b5c408a1b9788cd176ab5f91 100644 (file)
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -218,7 +218,7 @@
 
         <!-- add "make dist" target to autoconf: -->
         <set var="VARS_DONT_ELIMINATE" append="1">
-            ALL_BASE_HEADERS ALL_BASE_SOURCES WX_VERSION
+            ALL_PORTS_BASE_HEADERS ALL_BASE_SOURCES WX_VERSION
         </set>
         <fragment format="autoconf" file="make_dist.mk"/>
 

diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index d2d4e8ac5743bb3115b523286b9c41b88331fd9b..863811fb88c8fcdd500f756bdf43f5836b7d867b 100644 (file)
--- a/src/wxWindows.dsp
+++ b/src/wxWindows.dsp
@@ -3207,6 +3207,10 @@ SOURCE=..\include\wx\xrc\xh_tree.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\xrc\xh_treebk.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\xrc\xh_unkwn.h
 # End Source File
 # Begin Source File

diff --git a/wxGTK.spec b/wxGTK.spec
index 8f0c52cd17d9dc2ff444580d474e2a09c5faeb31..0afa3b0f41f0903332e40bbe41df1f9e91be038f 100644 (file)
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -347,37 +347,6 @@ wx/unix/pipe.h
 wx/unix/private.h
 wx/unix/stackwalk.h
 wx/unix/stdpaths.h
-wx/msw/apptrait.h
-wx/msw/apptbase.h
-wx/msw/chkconf.h
-wx/msw/crashrpt.h
-wx/msw/dde.h
-wx/msw/debughlp.h
-wx/msw/gccpriv.h
-wx/msw/mimetype.h
-wx/msw/stackwalk.h
-wx/msw/stdpaths.h
-wx/msw/winundef.h
-wx/msw/wrapcctl.h
-wx/msw/wrapcdlg.h
-wx/msw/wrapwin.h
-wx/unix/apptbase.h
-wx/unix/apptrait.h
-wx/unix/execute.h
-wx/unix/mimetype.h
-wx/unix/pipe.h
-wx/unix/private.h
-wx/unix/stackwalk.h
-wx/unix/stdpaths.h
-wx/mac/corefoundation/cfstring.h
-wx/mac/corefoundation/hid.h
-wx/mac/corefoundation/stdpaths.h
-wx/palmos/apptbase.h
-wx/palmos/apptrait.h
-wx/palmos/chkconf.h
-wx/palmos/mimetype.h
-wx/palmos/stdpaths.h
-wx/msdos/mimetype.h
 wx/fs_inet.h
 wx/gsocket.h
 wx/protocol/file.h
@@ -390,10 +359,6 @@ wx/sckstrm.h
 wx/socket.h
 wx/url.h
 wx/unix/gsockunx.h
-wx/msw/gsockmsw.h
-wx/unix/gsockunx.h
-wx/unix/gsockunx.h
-wx/mac/carbon/gsockmac.h
 wx/xml/xml.h
 wx/xtixml.h
 wx/db.h

diff --git a/wxMotif.spec b/wxMotif.spec
index 1863f044731294b2b10dd15a69c7b0784955b81b..cbcdeb971cc65244d2fe8854ead3081ba479d4b7 100644 (file)
--- a/wxMotif.spec
+++ b/wxMotif.spec
@@ -223,37 +223,6 @@ wx/unix/pipe.h
 wx/unix/private.h
 wx/unix/stackwalk.h
 wx/unix/stdpaths.h
-wx/msw/apptrait.h
-wx/msw/apptbase.h
-wx/msw/chkconf.h
-wx/msw/crashrpt.h
-wx/msw/dde.h
-wx/msw/debughlp.h
-wx/msw/gccpriv.h
-wx/msw/mimetype.h
-wx/msw/stackwalk.h
-wx/msw/stdpaths.h
-wx/msw/winundef.h
-wx/msw/wrapcctl.h
-wx/msw/wrapcdlg.h
-wx/msw/wrapwin.h
-wx/unix/apptbase.h
-wx/unix/apptrait.h
-wx/unix/execute.h
-wx/unix/mimetype.h
-wx/unix/pipe.h
-wx/unix/private.h
-wx/unix/stackwalk.h
-wx/unix/stdpaths.h
-wx/mac/corefoundation/cfstring.h
-wx/mac/corefoundation/hid.h
-wx/mac/corefoundation/stdpaths.h
-wx/palmos/apptbase.h
-wx/palmos/apptrait.h
-wx/palmos/chkconf.h
-wx/palmos/mimetype.h
-wx/palmos/stdpaths.h
-wx/msdos/mimetype.h
 wx/fs_inet.h
 wx/gsocket.h
 wx/protocol/file.h
@@ -266,10 +235,6 @@ wx/sckstrm.h
 wx/socket.h
 wx/url.h
 wx/unix/gsockunx.h
-wx/msw/gsockmsw.h
-wx/unix/gsockunx.h
-wx/unix/gsockunx.h
-wx/mac/carbon/gsockmac.h
 wx/xml/xml.h
 wx/xtixml.h
 wx/db.h

diff --git a/wxX11.spec b/wxX11.spec
index fe2242159a9f2b5d4a9b6d2136ea6cd8b9fd5416..08107a5dfae33b47596f27840795e48b009d770a 100644 (file)
--- a/wxX11.spec
+++ b/wxX11.spec
@@ -248,37 +248,6 @@ wx/unix/pipe.h
 wx/unix/private.h
 wx/unix/stackwalk.h
 wx/unix/stdpaths.h
-wx/msw/apptrait.h
-wx/msw/apptbase.h
-wx/msw/chkconf.h
-wx/msw/crashrpt.h
-wx/msw/dde.h
-wx/msw/debughlp.h
-wx/msw/gccpriv.h
-wx/msw/mimetype.h
-wx/msw/stackwalk.h
-wx/msw/stdpaths.h
-wx/msw/winundef.h
-wx/msw/wrapcctl.h
-wx/msw/wrapcdlg.h
-wx/msw/wrapwin.h
-wx/unix/apptbase.h
-wx/unix/apptrait.h
-wx/unix/execute.h
-wx/unix/mimetype.h
-wx/unix/pipe.h
-wx/unix/private.h
-wx/unix/stackwalk.h
-wx/unix/stdpaths.h
-wx/mac/corefoundation/cfstring.h
-wx/mac/corefoundation/hid.h
-wx/mac/corefoundation/stdpaths.h
-wx/palmos/apptbase.h
-wx/palmos/apptrait.h
-wx/palmos/chkconf.h
-wx/palmos/mimetype.h
-wx/palmos/stdpaths.h
-wx/msdos/mimetype.h
 wx/fs_inet.h
 wx/gsocket.h
 wx/protocol/file.h
@@ -291,10 +260,6 @@ wx/sckstrm.h
 wx/socket.h
 wx/url.h
 wx/unix/gsockunx.h
-wx/msw/gsockmsw.h
-wx/unix/gsockunx.h
-wx/unix/gsockunx.h
-wx/mac/carbon/gsockmac.h
 wx/xml/xml.h
 wx/xtixml.h
 wx/db.h