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
This commit is contained in:
@@ -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)
|
||||
|
@@ -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 \
|
||||
|
@@ -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"/>
|
||||
|
||||
|
Reference in New Issue
Block a user