Move webkit2gtk.pc.in, webkit2gtk-web-extension.pc.in files under Source/WebKit2...

https://bugs.webkit.org/show_bug.cgi?id=161703

Reviewed by Carlos Garcia Campos.

Move the pkg-config input files that are specific to the GTK+ port
under the Source/WebKit2/gtk/ directory. Build rules are updated
accordingly.

* PlatformGTK.cmake:
* gtk/webkit2gtk-web-extension.pc.in: Renamed from Source/WebKit2/webkit2gtk-web-extension.pc.in.
* gtk/webkit2gtk.pc.in: Renamed from Source/WebKit2/webkit2gtk.pc.in.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@205594 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index ad7000a..381eac6 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,18 @@
+2016-09-08  Zan Dobersek  <zdobersek@igalia.com>
+
+        Move webkit2gtk.pc.in, webkit2gtk-web-extension.pc.in files under Source/WebKit2/gtk/
+        https://bugs.webkit.org/show_bug.cgi?id=161703
+
+        Reviewed by Carlos Garcia Campos.
+
+        Move the pkg-config input files that are specific to the GTK+ port
+        under the Source/WebKit2/gtk/ directory. Build rules are updated
+        accordingly.
+
+        * PlatformGTK.cmake:
+        * gtk/webkit2gtk-web-extension.pc.in: Renamed from Source/WebKit2/webkit2gtk-web-extension.pc.in.
+        * gtk/webkit2gtk.pc.in: Renamed from Source/WebKit2/webkit2gtk.pc.in.
+
 2016-09-07  Joseph Pecoraro  <pecoraro@apple.com>
 
         [Mac] Address some clang static analyzer warnings in WebKit

diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake
index e87d087..f01a142 100644 (file)
--- a/Source/WebKit2/PlatformGTK.cmake
+++ b/Source/WebKit2/PlatformGTK.cmake
@@ -10,8 +10,8 @@ file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WEBKIT2GTK_DIR})
 file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR})
 
 configure_file(UIProcess/API/gtk/WebKitVersion.h.in ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitVersion.h)
-configure_file(webkit2gtk.pc.in ${WebKit2_PKGCONFIG_FILE} @ONLY)
-configure_file(webkit2gtk-web-extension.pc.in ${WebKit2WebExtension_PKGCONFIG_FILE} @ONLY)
+configure_file(gtk/webkit2gtk.pc.in ${WebKit2_PKGCONFIG_FILE} @ONLY)
+configure_file(gtk/webkit2gtk-web-extension.pc.in ${WebKit2WebExtension_PKGCONFIG_FILE} @ONLY)
 
 add_definitions(-DBUILDING_WEBKIT)
 add_definitions(-DWEBKIT2_COMPILATION)

diff --git a/Source/WebKit2/webkit2gtk-web-extension.pc.in b/Source/WebKit2/gtk/webkit2gtk-web-extension.pc.in
similarity index 100%
rename from Source/WebKit2/webkit2gtk-web-extension.pc.in
rename to Source/WebKit2/gtk/webkit2gtk-web-extension.pc.in

diff --git a/Source/WebKit2/webkit2gtk.pc.in b/Source/WebKit2/gtk/webkit2gtk.pc.in
similarity index 100%
rename from Source/WebKit2/webkit2gtk.pc.in
rename to Source/WebKit2/gtk/webkit2gtk.pc.in