Include webview library headers in the list of all headers.

Due to a typo in files.bkl (${...} was used instead of $(...) so the variable
didn't get really dereferenced), the web view headers were not included in the
list of all headers and hence not installed by "make install" under Unix.

Closes #13690.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-11-27 19:49:48 +00:00
parent b82f92a80c
commit d8991cbffe
6 changed files with 72 additions and 2 deletions

View File

@@ -2125,6 +2125,14 @@ COND_USE_STC_1___wxscintilla___depname = \
@COND_TOOLKIT_WINCE@ wx/msw/wince/chkconf.h
@COND_TOOLKIT_WINCE@NET_WINCE_SRC = src/msw/wince/net.cpp
@COND_TOOLKIT_MSW@MSW_HTML_HDR = wx/msw/helpbest.h
@COND_PLATFORM_MACOSX_1@WEBVIEW_HDR_PLATFORM = \
@COND_PLATFORM_MACOSX_1@ wx/osx/webviewhistoryitem_webkit.h \
@COND_PLATFORM_MACOSX_1@ wx/osx/webview_webkit.h
@COND_PLATFORM_UNIX_1@WEBVIEW_HDR_PLATFORM = \
@COND_PLATFORM_UNIX_1@ wx/gtk/webviewhistoryitem_webkit.h \
@COND_PLATFORM_UNIX_1@ wx/gtk/webview_webkit.h
@COND_TOOLKIT_MSW@WEBVIEW_HDR_PLATFORM = \
@COND_TOOLKIT_MSW@ wx/msw/webviewhistoryitem_ie.h wx/msw/webview_ie.h
@COND_TOOLKIT_OSX_CARBON@OPENGL_HDR_PLATFORM = wx/osx/glcanvas.h
@COND_TOOLKIT_OSX_COCOA@OPENGL_HDR_PLATFORM = wx/osx/glcanvas.h
@COND_TOOLKIT_COCOA@OPENGL_HDR_PLATFORM = wx/cocoa/glcanvas.h
@@ -4261,7 +4269,9 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \
wx/richtext/richtextuicustomization.h \
wx/richtext/richtextxml.h \
wx/stc/stc.h \
${WEBVIEW_HDR}
$(WEBVIEW_HDR_PLATFORM) \
wx/webview.h \
wx/webviewarchivehandler.h
@COND_USE_GUI_1@ALL_GUI_HEADERS = $(COND_USE_GUI_1_ALL_GUI_HEADERS)
COND_MONOLITHIC_1_SHARED_1___monodll___depname = \
$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)

View File

@@ -4013,7 +4013,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(GUI_CORE_HEADERS)
$(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
$(OPENGL_HDR) $(QA_HDR) $(XRC_HDR) $(AUI_HDR) $(PROPGRID_HDR)
$(RIBBON_HDR) $(RICHTEXT_HDR) $(STC_HDR) ${WEBVIEW_HDR}
$(RIBBON_HDR) $(RICHTEXT_HDR) $(STC_HDR) $(WEBVIEW_HDR)
</if>
</set>

View File

@@ -5444,6 +5444,14 @@ SOURCE=..\..\include\wx\msw\uxthemep.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\webview_ie.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\webviewhistoryitem_ie.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\window.h
# End Source File
# End Group
@@ -7012,6 +7020,14 @@ SOURCE=..\..\include\wx\vscroll.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\webview.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\webviewarchivehandler.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\persist\window.h
# End Source File
# Begin Source File

View File

@@ -4654,6 +4654,12 @@
<File
RelativePath="..\..\include\wx\msw\uxthemep.h">
</File>
<File
RelativePath="..\..\include\wx\msw\webview_ie.h">
</File>
<File
RelativePath="..\..\include\wx\msw\webviewhistoryitem_ie.h">
</File>
<File
RelativePath="..\..\include\wx\msw\window.h">
</File>
@@ -5834,6 +5840,12 @@
<File
RelativePath="..\..\include\wx\vscroll.h">
</File>
<File
RelativePath="..\..\include\wx\webview.h">
</File>
<File
RelativePath="..\..\include\wx\webviewarchivehandler.h">
</File>
<File
RelativePath="..\..\include\wx\persist\window.h">
</File>

View File

@@ -6227,6 +6227,14 @@
RelativePath="..\..\include\wx\msw\uxthemep.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\webview_ie.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\webviewhistoryitem_ie.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\window.h"
>
@@ -7799,6 +7807,14 @@
RelativePath="..\..\include\wx\vscroll.h"
>
</File>
<File
RelativePath="..\..\include\wx\webview.h"
>
</File>
<File
RelativePath="..\..\include\wx\webviewarchivehandler.h"
>
</File>
<File
RelativePath="..\..\include\wx\persist\window.h"
>

View File

@@ -6223,6 +6223,14 @@
RelativePath="..\..\include\wx\msw\uxthemep.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\webview_ie.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\webviewhistoryitem_ie.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\window.h"
>
@@ -7795,6 +7803,14 @@
RelativePath="..\..\include\wx\vscroll.h"
>
</File>
<File
RelativePath="..\..\include\wx\webview.h"
>
</File>
<File
RelativePath="..\..\include\wx\webviewarchivehandler.h"
>
</File>
<File
RelativePath="..\..\include\wx\persist\window.h"
>