mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-05 13:29:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
wayland/src/Makefile.am

73 lines
1.7 KiB
Text
Raw Normal View History

Use automake
2010-10-12 17:24:20 -04:00
lib_LTLIBRARIES = libwayland-server.la libwayland-client.la
noinst_LTLIBRARIES = libwayland-util.la
include_HEADERS = \
wayland-util.h \
wayland-server-protocol.h \
wayland-server.h \
wayland-client-protocol.h \
Add wayland-egl.h This header defines native EGL wayland types and affiliated initialization, processing and destruction routines. EGL implementations must implement this API in order to allow applications using this native types for the EGL implementation.
2011-02-04 11:22:35 +01:00
wayland-client.h \
Add a public header for the version number This adds a public header so that applications can get the Wayland version number at compile time. This can be used to make applications that support compiling against multiple versions of Wayland. There is a separate installed header called cogl-version.h which gets included by both wayland-client.h and wayland-server.h The canonical place for the version number is the configure.ac script which splits it into three separate m4 defines for the major, minor and micro version. These are copied into the generated wayland-version.h header using AC_SUBST. There is also a string form of the complete version number. The version number is now also automatically copied into the two .pc files. Because the major, minor and micro parts are required it is no longer possible to leave the version number as 'master' when building from git. Most projects seem to immediately bump the git repo to a fake version number (usually odd) after making a release so that there is always a relative number that can be used for comparison. This patch sets the git version to 0.99.0 under the assumption that the next release will be 1.0.0.
2012-04-11 16:59:05 +01:00
wayland-egl.h \
wayland-version.h
Use automake
2010-10-12 17:24:20 -04:00
libwayland_util_la_SOURCES = \
connection.c \
wayland-util.c \
wayland-util.h \
os: wrap socket(SOCK_CLOEXEC) calls Some system C libraries do not offer SOCK_CLOEXEC flag. Add a new header for OS compatibility wrappers. Wrap socket() calls into wl_os_socket_cloexec() which makes sure the O_CLOEXEC flag gets set on the file descriptor. On systems having SOCK_CLOEXEC this uses the old socket() call, and falls back if it fails due to the flag (kernel not supporting it). wayland-os.h is private and not exported. Add close-on-exec tests for both normal and forced fallback paths. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-03-21 11:11:26 +02:00
wayland-os.c \
wayland-os.h \
Drop unused hash table We now just use a table for looking up object IDs so we should drop the hash table.
2011-12-27 13:53:59 -05:00
wayland-private.h
Use automake
2010-10-12 17:24:20 -04:00
Add support for signed 24.8 decimal numbers 'fixed' is a signed decimal type which offers a sign bit, 23 bits of integer precision, and 8 bits of decimal precision. This is exposed as an opaque struct with conversion helpers to and from double and int on the C API side. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-08 17:17:25 +01:00
libwayland_server_la_LIBADD = $(FFI_LIBS) libwayland-util.la -lrt -lm
Remove input structs Looking at the functionality in the server library, it's clear (in hindsight) that there are two different "things" in there: 1) The IPC API, that is, everything that concerns wl_display, wl_client, wl_resource and 2) and half-hearted attempt at sharing input code and focus logic that leaves a lot of problematic structs in the API surface, only to share less than 1000 lines of code. We can just move those input structs and helper functions into weston and cut libwayland-server down to just the core server side IPC API. In the short term, compositors can copy those structs and functions into their source, but longer term, they're probably better off reimplementing those objects and logic their native framework (QObject, GObject etc).
2013-04-18 15:07:23 -04:00
libwayland_server_la_LDFLAGS = -version-info 1:0:1
Use automake
2010-10-12 17:24:20 -04:00
libwayland_server_la_SOURCES = \
wayland-protocol.c \
wayland-server.c \
Add common shm-server code
2011-03-08 11:32:24 +01:00
wayland-shm.c \
Use automake
2010-10-12 17:24:20 -04:00
event-loop.c
Add support for signed 24.8 decimal numbers 'fixed' is a signed decimal type which offers a sign bit, 23 bits of integer precision, and 8 bits of decimal precision. This is exposed as an opaque struct with conversion helpers to and from double and int on the C API side. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-05-08 17:17:25 +01:00
libwayland_client_la_LIBADD = $(FFI_LIBS) libwayland-util.la -lrt -lm
client: Introduce functions to allocate and marshal proxies atomically The server requires clients to only allocate one ID ahead of the previously highest ID in order to keep the ID range tight. Failure to do so will make the server close the client connection. However, the way we allocate new IDs is racy. The generated code looks like: new_proxy = wl_proxy_create(...); wl_proxy_marshal(proxy, ... new_proxy, ...); If two threads do this at the same time, there's a chance that thread A will allocate a proxy, then get pre-empted by thread B which then allocates a proxy and then passes it to wl_proxy_marshal(). The ID for thread As proxy will be one higher that the currently highest ID, but the ID for thread Bs proxy will be two higher. But since thread B prempted thread A before it could send its new ID, B will send its new ID first, the server will see the ID from thread Bs proxy first, and will reject it. We fix this by introducing wl_proxy_marshal_constructor(). This function is identical to wl_proxy_marshal(), except that it will allocate a wl_proxy for NEW_ID arguments and send it, all under the display mutex. By introducing a new function, we maintain backwards compatibility with older code from the generator, and make sure that the new generated code has an explicit dependency on a new enough libwayland-client.so. A virtual Wayland merit badge goes to Kalle Vahlman, who tracked this down and analyzed the issue. Reported-by: Kalle Vahlman <kalle.vahlman@movial.com>
2013-11-14 21:29:06 -08:00
libwayland_client_la_LDFLAGS = -version-info 2:0:2
Use automake
2010-10-12 17:24:20 -04:00
libwayland_client_la_SOURCES = \
wayland-protocol.c \
wayland-client.c
Install the pkgconfig files Lost the install rule when we converted to automake.
2011-01-01 10:55:45 -05:00
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = wayland-client.pc wayland-server.pc
don't use deprecated INCLUDES variable
2011-01-24 16:27:27 +00:00
AM_CPPFLAGS = $(FFI_CFLAGS)
Add -pthread to AM_CFLAGS to do the right thing when using threads https://bugs.freedesktop.org/show_bug.cgi?id=71633
2013-11-23 12:24:26 -08:00
AM_CFLAGS = $(GCC_CFLAGS) -pthread
Use automake
2010-10-12 17:24:20 -04:00
Split into a core repository that only holds the core Wayland libraries
2011-02-14 22:17:41 -05:00
protocoldir = $(top_srcdir)/protocol
Add configure option to disable scanner compilation When cross-compiling Wayland, wayland-scanner should be picked up from the host system instead of compiling and trying to run e.g. ARM wayland-scanner on X86. This patch adds --disable-scanner option for disabling the scanner from the build and using existing wayland-scanner instead (from PATH) which should help in most cross-compilation systems. By default everything works as before. Signed-off-by: Jani Uusi-Rantala <jani.uusi-rantala@nokia.com>
2011-05-06 06:13:36 +00:00
if ENABLE_SCANNER
Rename source subdir from wayland to src
2011-08-12 15:09:00 -04:00
wayland_scanner = $(top_builddir)/src/wayland-scanner
Add configure option to disable scanner compilation When cross-compiling Wayland, wayland-scanner should be picked up from the host system instead of compiling and trying to run e.g. ARM wayland-scanner on X86. This patch adds --disable-scanner option for disabling the scanner from the build and using existing wayland-scanner instead (from PATH) which should help in most cross-compilation systems. By default everything works as before. Signed-off-by: Jani Uusi-Rantala <jani.uusi-rantala@nokia.com>
2011-05-06 06:13:36 +00:00
else
wayland_scanner = wayland-scanner
endif
Rename source subdir from wayland to src
2011-08-12 15:09:00 -04:00
include $(top_srcdir)/src/scanner.mk
Use automake
2010-10-12 17:24:20 -04:00
Add configure option to disable scanner compilation When cross-compiling Wayland, wayland-scanner should be picked up from the host system instead of compiling and trying to run e.g. ARM wayland-scanner on X86. This patch adds --disable-scanner option for disabling the scanner from the build and using existing wayland-scanner instead (from PATH) which should help in most cross-compilation systems. By default everything works as before. Signed-off-by: Jani Uusi-Rantala <jani.uusi-rantala@nokia.com>
2011-05-06 06:13:36 +00:00
if ENABLE_SCANNER
Split into a core repository that only holds the core Wayland libraries
2011-02-14 22:17:41 -05:00
bin_PROGRAMS = wayland-scanner
Use automake
2010-10-12 17:24:20 -04:00
Split into a core repository that only holds the core Wayland libraries
2011-02-14 22:17:41 -05:00
wayland_scanner_SOURCES = \
Use automake
2010-10-12 17:24:20 -04:00
scanner.c
Split into a core repository that only holds the core Wayland libraries
2011-02-14 22:17:41 -05:00
wayland_scanner_LDADD = $(EXPAT_LIBS) libwayland-util.la
Use automake
2010-10-12 17:24:20 -04:00
Split into a core repository that only holds the core Wayland libraries
2011-02-14 22:17:41 -05:00
$(BUILT_SOURCES) : wayland-scanner
build: Add wayland-scanner.pc. To allow user program to include wayland-scanner.m4 in tarball, move the path variables from it into wayland-scanner.pc.
2013-07-02 18:38:15 +09:00
scannerpkgconfigdir = $(datadir)/pkgconfig
scannerpkgconfig_DATA = wayland-scanner.pc
Add configure option to disable scanner compilation When cross-compiling Wayland, wayland-scanner should be picked up from the host system instead of compiling and trying to run e.g. ARM wayland-scanner on X86. This patch adds --disable-scanner option for disabling the scanner from the build and using existing wayland-scanner instead (from PATH) which should help in most cross-compilation systems. By default everything works as before. Signed-off-by: Jani Uusi-Rantala <jani.uusi-rantala@nokia.com>
2011-05-06 06:13:36 +00:00
endif
Use automake
2010-10-12 17:24:20 -04:00
BUILT_SOURCES = \
wayland-server-protocol.h \
wayland-client-protocol.h \
wayland-protocol.c
CLEANFILES = $(BUILT_SOURCES)
Add a public header for the version number This adds a public header so that applications can get the Wayland version number at compile time. This can be used to make applications that support compiling against multiple versions of Wayland. There is a separate installed header called cogl-version.h which gets included by both wayland-client.h and wayland-server.h The canonical place for the version number is the configure.ac script which splits it into three separate m4 defines for the major, minor and micro version. These are copied into the generated wayland-version.h header using AC_SUBST. There is also a string form of the complete version number. The version number is now also automatically copied into the two .pc files. Because the major, minor and micro parts are required it is no longer possible to leave the version number as 'master' when building from git. Most projects seem to immediately bump the git repo to a fake version number (usually odd) after making a release so that there is always a relative number that can be used for comparison. This patch sets the git version to 0.99.0 under the assumption that the next release will be 1.0.0.
2012-04-11 16:59:05 +01:00
DISTCLEANFILES = wayland-version.h
EXTRA_DIST = wayland-version.h.in
Reference in a new issue Copy permalink