Title: [230576] trunk/Source
Revision
230576
Author
[email protected]
Date
2018-04-12 08:51:10 -0700 (Thu, 12 Apr 2018)

Log Message

[WPE] Improve include hierarchy
https://bugs.webkit.org/show_bug.cgi?id=184376

Reviewed by Žan Doberšek.

Source/_javascript_Core:

Install JSC headers under /usr/include/wpe-webkit-0.1/jsc instead of
/usr/include/wpe-0.1/WPE/jsc.

* PlatformWPE.cmake:

Source/WebKit:

Install our headers under /usr/include/wpe-webkit-0.1/wpe instead of
/usr/include/wpe-0.1/WPE/wpe. Too much WPE, not enough WebKit!

* PlatformWPE.cmake:
* wpe/wpe-webkit.pc.in:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (230575 => 230576)


--- trunk/Source/_javascript_Core/ChangeLog	2018-04-12 15:34:48 UTC (rev 230575)
+++ trunk/Source/_javascript_Core/ChangeLog	2018-04-12 15:51:10 UTC (rev 230576)
@@ -1,3 +1,15 @@
+2018-04-12  Michael Catanzaro  <[email protected]>
+
+        [WPE] Improve include hierarchy
+        https://bugs.webkit.org/show_bug.cgi?id=184376
+
+        Reviewed by Žan Doberšek.
+
+        Install JSC headers under /usr/include/wpe-webkit-0.1/jsc instead of
+        /usr/include/wpe-0.1/WPE/jsc.
+
+        * PlatformWPE.cmake:
+
 2018-04-11  Carlos Garcia Campos  <[email protected]>
 
         [GLIB] Handle strings containing null characters

Modified: trunk/Source/_javascript_Core/PlatformWPE.cmake (230575 => 230576)


--- trunk/Source/_javascript_Core/PlatformWPE.cmake	2018-04-12 15:34:48 UTC (rev 230575)
+++ trunk/Source/_javascript_Core/PlatformWPE.cmake	2018-04-12 15:51:10 UTC (rev 230576)
@@ -28,7 +28,7 @@
 )
 
 install(FILES ${_javascript_Core_INSTALLED_HEADERS}
-    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/wpe-${WPE_API_VERSION}/WPE/jsc"
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/wpe-webkit-${WPE_API_VERSION}/jsc"
     COMPONENT "Development"
 )
 

Modified: trunk/Source/WebKit/ChangeLog (230575 => 230576)


--- trunk/Source/WebKit/ChangeLog	2018-04-12 15:34:48 UTC (rev 230575)
+++ trunk/Source/WebKit/ChangeLog	2018-04-12 15:51:10 UTC (rev 230576)
@@ -1,3 +1,16 @@
+2018-04-12  Michael Catanzaro  <[email protected]>
+
+        [WPE] Improve include hierarchy
+        https://bugs.webkit.org/show_bug.cgi?id=184376
+
+        Reviewed by Žan Doberšek.
+
+        Install our headers under /usr/include/wpe-webkit-0.1/wpe instead of
+        /usr/include/wpe-0.1/WPE/wpe. Too much WPE, not enough WebKit!
+
+        * PlatformWPE.cmake:
+        * wpe/wpe-webkit.pc.in:
+
 2018-04-11  Andy Estes  <[email protected]>
 
         [iOS] Add a mechanism for holding Wi-Fi assertions

Modified: trunk/Source/WebKit/PlatformWPE.cmake (230575 => 230576)


--- trunk/Source/WebKit/PlatformWPE.cmake	2018-04-12 15:34:48 UTC (rev 230575)
+++ trunk/Source/WebKit/PlatformWPE.cmake	2018-04-12 15:51:10 UTC (rev 230576)
@@ -328,6 +328,6 @@
 )
 
 install(FILES ${WPE_API_INSTALLED_HEADERS}
-    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/wpe-${WPE_API_VERSION}/WPE/wpe"
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/wpe-webkit-${WPE_API_VERSION}/wpe"
     COMPONENT "Development"
 )

Modified: trunk/Source/WebKit/wpe/wpe-webkit.pc.in (230575 => 230576)


--- trunk/Source/WebKit/wpe/wpe-webkit.pc.in	2018-04-12 15:34:48 UTC (rev 230575)
+++ trunk/Source/WebKit/wpe/wpe-webkit.pc.in	2018-04-12 15:51:10 UTC (rev 230576)
@@ -9,4 +9,4 @@
 Version: @PROJECT_VERSION@
 Requires: glib-2.0 libsoup-2.4
 Libs: -L${libdir} -lWPEWebKit-@WPE_API_VERSION@
-Cflags: -I${includedir}/wpe-@WPE_API_VERSION@ -I${includedir}/wpe-@WPE_API_VERSION@/WPE
+Cflags: -I${includedir}/wpe-webkit-@WPE_API_VERSION@
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to