From 0066d957e14ef6189cc54b0e5d07b980f4028a8c Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Mon, 20 Aug 2018 16:52:58 +0300 Subject: [PATCH] Rename the libWPEBackend library just to libwpe This library does not actually implement any backend for WPE, and therefore its name can be misleading. Instead, it contains the code needed by WebKit to interface with actual backend implementations, loading them, and some utility code. The libwpe name is much more fitting. This is a good moment to do this rename, because the API version will be bumped for release 1.0.0 as well: packagers and users of the library will need to update anyway for the API version change and rebuild software which uses libWPEBackend^W libwpe anyway. Fixes #27 --- CMakeLists.txt | 20 ++++++++++---------- include/wpe/keysyms.h | 2 +- scripts/update-keysyms-header | 2 +- wpe.pc.cmake | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 902bb96..b6d6671 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,9 +14,9 @@ set(WPE_API_VERSION "0.1") # - If binary compatibility has been broken (eg removed or changed interfaces) # change to C+1:0:0 # - If the interface is the same as the previous version, change to C:R+1:A -CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(LIBWPEBACKEND 1 0 0) +CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(LIBWPE 1 0 0) -project(wpebackend VERSION "${PROJECT_VERSION}") +project(libwpe VERSION "${PROJECT_VERSION}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -D_POSIX_SOURCE") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") @@ -75,17 +75,17 @@ set(WPE_PUBLIC_HEADERS include/wpe/wpe.h ) -add_library(WPEBackend SHARED ${WPE_SOURCES}) -target_include_directories(WPEBackend PRIVATE ${WPE_INCLUDE_DIRECTORIES}) -target_link_libraries(WPEBackend ${WPE_LIBRARIES}) +add_library(wpe SHARED ${WPE_SOURCES}) +target_include_directories(wpe PRIVATE ${WPE_INCLUDE_DIRECTORIES}) +target_link_libraries(wpe ${WPE_LIBRARIES}) -set_target_properties(WPEBackend PROPERTIES - OUTPUT_NAME WPEBackend-${WPE_API_VERSION} - VERSION ${LIBWPEBACKEND_VERSION} - SOVERSION ${LIBWPEBACKEND_VERSION_MAJOR} +set_target_properties(wpe PROPERTIES + OUTPUT_NAME wpe-${WPE_API_VERSION} + VERSION ${LIBWPE_VERSION} + SOVERSION ${LIBWPE_VERSION_MAJOR} ) -install(TARGETS WPEBackend +install(TARGETS wpe LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) install( diff --git a/include/wpe/keysyms.h b/include/wpe/keysyms.h index 2e3363b..d31dc2d 100644 --- a/include/wpe/keysyms.h +++ b/include/wpe/keysyms.h @@ -5,7 +5,7 @@ #ifndef wpe_keysyms_h #define wpe_keysyms_h -/* This file is autogenerated; use https://github.com/WebPlatformForEmbedded/WPEBackend/blob/master/scripts/update-keysyms-header to update it. */ +/* This file is autogenerated; use https://github.com/WebPlatformForEmbedded/libwpe/blob/master/scripts/update-keysyms-header to update it. */ /*********************************************************** Copyright 1987, 1994, 1998 The Open Group diff --git a/scripts/update-keysyms-header b/scripts/update-keysyms-header index 1880f72..8a7d9d3 100755 --- a/scripts/update-keysyms-header +++ b/scripts/update-keysyms-header @@ -16,7 +16,7 @@ output.write('''#if !defined(__WPE_H_INSIDE__) && !defined(WPE_COMPILATION) #ifndef wpe_keysyms_h #define wpe_keysyms_h -/* This file is autogenerated; use https://github.com/WebPlatformForEmbedded/WPEBackend/blob/master/scripts/update-keysyms-header to update it. */ +/* This file is autogenerated; use https://github.com/WebPlatformForEmbedded/libwpe/blob/master/scripts/update-keysyms-header to update it. */ ''') with open('/usr/include/X11/keysymdef.h') as header: diff --git a/wpe.pc.cmake b/wpe.pc.cmake index d14398d..87771b5 100644 --- a/wpe.pc.cmake +++ b/wpe.pc.cmake @@ -8,4 +8,4 @@ Description: The wpe library Version: @PROJECT_VERSION@ Requires: xkbcommon Cflags: -I${includedir}/wpe-@WPE_API_VERSION@ -Libs: -L${libdir} -lWPEBackend-@WPE_API_VERSION@ +Libs: -L${libdir} -lwpe-@WPE_API_VERSION@