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

Name libraries -client and -server for consistency

Browse source 
Instead of wayland-server and wayland...
This commit is contained in:
Kristian Høgsberg 2010-08-10 14:12:05 -04:00
parent 4fe1a3ed3a
commit a661f263b4
11 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Makefile
View file

@ -1,33 +1,33 @@
include config.mk include config.mk
subdirs = clients spec subdirs = clients spec
libs = libwayland-server.so libwayland.so libs = libwayland-server.so libwayland-client.so
all : $(libs) compositor subdirs-all scanner all : $(libs) compositor subdirs-all scanner
headers = \ headers = \
wayland-util.h \ wayland-util.h \
wayland-server-protocol.h \ wayland-server-protocol.h \
wayland.h \ wayland-server.h \
wayland-client-protocol.h \ wayland-client-protocol.h \
wayland-client.h \ wayland-client.h \
libwayland-server.so : \ libwayland-server.so : \
wayland-protocol.o \ wayland-protocol.o \
wayland.o \ wayland-server.o \
event-loop.o \ event-loop.o \
connection.o \ connection.o \
wayland-util.o \ wayland-util.o \
wayland-hash.o wayland-hash.o
libwayland.so : \ libwayland-client.so : \
wayland-protocol.o \ wayland-protocol.o \
wayland-client.o \ wayland-client.o \
connection.o \ connection.o \
wayland-util.o \ wayland-util.o \
wayland-hash.o wayland-hash.o
wayland.o : wayland-server-protocol.h wayland-server.o : wayland-server-protocol.h
wayland-client.o : wayland-client-protocol.h wayland-client.o : wayland-client-protocol.h
wayland-protocol.c : protocol.xml scanner wayland-protocol.c : protocol.xml scanner
@ -67,7 +67,7 @@ subdirs-all subdirs-clean :
install : $(libs) compositor install : $(libs) compositor
install -d $(libdir) $(libdir)/pkgconfig ${udev_rules_dir} install -d $(libdir) $(libdir)/pkgconfig ${udev_rules_dir}
install $(libs) $(libdir) install $(libs) $(libdir)
install wayland-server.pc wayland.pc $(libdir)/pkgconfig install wayland-server.pc wayland-client.pc $(libdir)/pkgconfig
install $(headers) $(includedir) install $(headers) $(includedir)
install 70-wayland.rules ${udev_rules_dir} install 70-wayland.rules ${udev_rules_dir}

2
clients/Makefile
View file

@ -1,7 +1,7 @@
include ../config.mk include ../config.mk
CFLAGS += -I.. $(CLIENT_CFLAGS) CFLAGS += -I.. $(CLIENT_CFLAGS)
LDLIBS += -L.. -lwayland $(CLIENT_LIBS) -lrt -lm LDLIBS += -L.. -lwayland-client $(CLIENT_LIBS) -lrt -lm
egl_clients = gears egl_clients = gears
cairo_clients = flower screenshot terminal image view cairo_clients = flower screenshot terminal image view

1
compositor-drm.c
View file

@ -33,7 +33,6 @@
#include <EGL/egl.h> #include <EGL/egl.h>
#include <EGL/eglext.h> #include <EGL/eglext.h>
#include "wayland.h"
#include "compositor.h" #include "compositor.h"
struct drm_compositor { struct drm_compositor {

1
compositor-x11.c
View file

@ -37,7 +37,6 @@
#include <EGL/egl.h> #include <EGL/egl.h>
#include <EGL/eglext.h> #include <EGL/eglext.h>
#include "wayland.h"
#include "compositor.h" #include "compositor.h"
#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0])) #define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0]))

1
compositor.c
View file

@ -30,7 +30,6 @@
#include <time.h> #include <time.h>
#include <linux/input.h> #include <linux/input.h>
#include "wayland.h"
#include "wayland-server-protocol.h" #include "wayland-server-protocol.h"
#include "cairo-util.h" #include "cairo-util.h"
#include "compositor.h" #include "compositor.h"

2
compositor.h
View file

@ -23,7 +23,7 @@
#include <xf86drm.h> #include <xf86drm.h>
#include <xf86drmMode.h> #include <xf86drmMode.h>
#include <libudev.h> #include <libudev.h>
#include "wayland.h" #include "wayland-server.h"
#include "wayland-util.h" #include "wayland-util.h"
#define GL_GLEXT_PROTOTYPES #define GL_GLEXT_PROTOTYPES

2
configure.ac
View file

@ -25,5 +25,5 @@ AC_CHECK_LIB(expat, XML_ParserCreate, [EXPAT_LIBS="-lexpat"],
[AC_MSG_ERROR([Can't find expat library. Please install expat.])]) [AC_MSG_ERROR([Can't find expat library. Please install expat.])])
AC_SUBST(EXPAT_LIBS) AC_SUBST(EXPAT_LIBS)
AC_CONFIG_FILES([config.mk wayland-server.pc wayland.pc]) AC_CONFIG_FILES([config.mk wayland-server.pc wayland-client.pc])
AC_OUTPUT AC_OUTPUT

2
event-loop.c
View file

@ -33,7 +33,7 @@
#include <sys/timerfd.h> #include <sys/timerfd.h>
#include <unistd.h> #include <unistd.h>
#include <assert.h> #include <assert.h>
#include "wayland.h" #include "wayland-server.h"
struct wl_event_loop { struct wl_event_loop {
int epoll_fd; int epoll_fd;

2
wayland.pc.in → wayland-client.pc.in
View file

@ -7,4 +7,4 @@ Name: Wayland Client
Description: Wayland client side library Description: Wayland client side library
Version: 0.1 Version: 0.1
Cflags: -I${includedir} Cflags: -I${includedir}
Libs: -L${libdir} -lwayland Libs: -L${libdir} -lwayland-client

2
wayland.c → wayland-server.c
View file

@ -34,7 +34,7 @@
#include <assert.h> #include <assert.h>
#include <ffi.h> #include <ffi.h>
#include "wayland.h" #include "wayland-server.h"
#include "wayland-server-protocol.h" #include "wayland-server-protocol.h"
#include "connection.h" #include "connection.h"

0
wayland.h → wayland-server.h
View file