[GTK] Miscellaneous build cleanups

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

Reviewed by Žan Doberšek.

.:

* Source/cmake/OptionsGTK.cmake:

Source/JavaScriptCore:

* PlatformGTK.cmake:

Source/WebKit:

* PlatformGTK.cmake:

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

Author: [email protected]

ChangeLog

@@ -1,3 +1,12 @@
+2018-04-25  Michael Catanzaro  <[email protected]>
+
+        [GTK] Miscellaneous build cleanups
+        https://bugs.webkit.org/show_bug.cgi?id=184399
+
+        Reviewed by Žan Doberšek.
+
+        * Source/cmake/OptionsGTK.cmake:
+
 2018-04-24  Leo Balter  <[email protected]>
 
         Land test262 test results associated with Test262 runner

Source/JavaScriptCore/ChangeLog

@@ -1,3 +1,12 @@
+2018-04-25  Michael Catanzaro  <[email protected]>
+
+        [GTK] Miscellaneous build cleanups
+        https://bugs.webkit.org/show_bug.cgi?id=184399
+
+        Reviewed by Žan Doberšek.
+
+        * PlatformGTK.cmake:
+
 2018-04-24  Keith Miller  <[email protected]>
 
         fromCharCode is missing some exception checks

Source/JavaScriptCore/PlatformGTK.cmake

@@ -40,7 +40,6 @@ if (ENABLE_INTROSPECTION)
 endif ()
 
 add_definitions(-DSTATICALLY_LINKED_WITH_WTF)
-add_definitions(-DLIBDIR="${LIB_INSTALL_DIR}")
 add_definitions(-DJSC_COMPILATION)
 
 list(APPEND JavaScriptCore_LIBRARIES

Source/WebKit/ChangeLog

@@ -1,3 +1,12 @@
+2018-04-25  Michael Catanzaro  <[email protected]>
+
+        [GTK] Miscellaneous build cleanups
+        https://bugs.webkit.org/show_bug.cgi?id=184399
+
+        Reviewed by Žan Doberšek.
+
+        * PlatformGTK.cmake:
+
 2018-04-25  Dean Jackson  <[email protected]>
 
         Make a better flag for system preview, and disable it where necessary

Source/WebKit/PlatformGTK.cmake

@@ -18,11 +18,9 @@ add_definitions(-DBUILDING_WEBKIT)
 add_definitions(-DWEBKIT2_COMPILATION)
 add_definitions(-DWEBKIT_DOM_USE_UNSTABLE_API)
 
-add_definitions(-DLIBEXECDIR="${CMAKE_INSTALL_FULL_LIBEXECDIR}")
 add_definitions(-DPKGLIBEXECDIR="${LIBEXEC_INSTALL_DIR}")
 add_definitions(-DLOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
 add_definitions(-DLIBDIR="${LIB_INSTALL_DIR}")
-add_definitions(-DDATADIR="${CMAKE_INSTALL_FULL_DATADIR}")
 
 if (NOT DEVELOPER_MODE AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
     WEBKIT_ADD_TARGET_PROPERTIES(WebKit LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/webkitglib-symbols.map")

Source/cmake/OptionsGTK.cmake

@@ -13,8 +13,6 @@ set(LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE PATH "Absolute path to
 set(EXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_BINDIR}" CACHE PATH "Absolute path to executable installation directory")
 set(LIBEXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/webkit2gtk-${WEBKITGTK_API_VERSION}" CACHE PATH "Absolute path to install executables executed by the library")
 
-set(DATA_BUILD_DIR "${CMAKE_BINARY_DIR}/share/${WebKit_OUTPUT_NAME}")
-set(DATA_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/webkitgtk-${WEBKITGTK_API_VERSION}")
 set(WEBKITGTK_HEADER_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/webkitgtk-${WEBKITGTK_API_VERSION}")
 set(INTROSPECTION_INSTALL_GIRDIR "${CMAKE_INSTALL_FULL_DATADIR}/gir-1.0")
 set(INTROSPECTION_INSTALL_TYPELIBDIR "${LIB_INSTALL_DIR}/girepository-1.0")
@@ -383,7 +381,6 @@ set(FORWARDING_HEADERS_WEBKIT2GTK_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk)
 set(FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk-webextension)
 
 set(JavaScriptCore_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc)
-set(WebKit_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKitLegacy/gtk/webkitgtk-${WEBKITGTK_API_VERSION}.pc)
 set(WebKit2_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit/webkit2gtk-${WEBKITGTK_API_VERSION}.pc)
 set(WebKit2WebExtension_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit/webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}.pc)