Commit a661f263 authored by Kristian Høgsberg's avatar Kristian Høgsberg
Browse files

Name libraries -client and -server for consistency

Instead of wayland-server and wayland...
parent 4fe1a3ed
include config.mk
subdirs = clients spec
libs = libwayland-server.so libwayland.so
libs = libwayland-server.so libwayland-client.so
all : $(libs) compositor subdirs-all scanner
headers = \
wayland-util.h \
wayland-server-protocol.h \
wayland.h \
wayland-server.h \
wayland-client-protocol.h \
wayland-client.h \
libwayland-server.so : \
wayland-protocol.o \
wayland.o \
wayland-server.o \
event-loop.o \
connection.o \
wayland-util.o \
wayland-hash.o
libwayland.so : \
libwayland-client.so : \
wayland-protocol.o \
wayland-client.o \
connection.o \
wayland-util.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-protocol.c : protocol.xml scanner
......@@ -67,7 +67,7 @@ subdirs-all subdirs-clean :
install : $(libs) compositor
install -d $(libdir) $(libdir)/pkgconfig ${udev_rules_dir}
install $(libs) $(libdir)
install wayland-server.pc wayland.pc $(libdir)/pkgconfig
install wayland-server.pc wayland-client.pc $(libdir)/pkgconfig
install $(headers) $(includedir)
install 70-wayland.rules ${udev_rules_dir}
......
include ../config.mk
CFLAGS += -I.. $(CLIENT_CFLAGS)
LDLIBS += -L.. -lwayland $(CLIENT_LIBS) -lrt -lm
LDLIBS += -L.. -lwayland-client $(CLIENT_LIBS) -lrt -lm
egl_clients = gears
cairo_clients = flower screenshot terminal image view
......
......@@ -33,7 +33,6 @@
#include <EGL/egl.h>
#include <EGL/eglext.h>
#include "wayland.h"
#include "compositor.h"
struct drm_compositor {
......
......@@ -37,7 +37,6 @@
#include <EGL/egl.h>
#include <EGL/eglext.h>
#include "wayland.h"
#include "compositor.h"
#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0]))
......
......@@ -30,7 +30,6 @@
#include <time.h>
#include <linux/input.h>
#include "wayland.h"
#include "wayland-server-protocol.h"
#include "cairo-util.h"
#include "compositor.h"
......
......@@ -23,7 +23,7 @@
#include <xf86drm.h>
#include <xf86drmMode.h>
#include <libudev.h>
#include "wayland.h"
#include "wayland-server.h"
#include "wayland-util.h"
#define GL_GLEXT_PROTOTYPES
......
......@@ -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_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
......@@ -33,7 +33,7 @@
#include <sys/timerfd.h>
#include <unistd.h>
#include <assert.h>
#include "wayland.h"
#include "wayland-server.h"
struct wl_event_loop {
int epoll_fd;
......
......@@ -7,4 +7,4 @@ Name: Wayland Client
Description: Wayland client side library
Version: 0.1
Cflags: -I${includedir}
Libs: -L${libdir} -lwayland
Libs: -L${libdir} -lwayland-client
......@@ -34,7 +34,7 @@
#include <assert.h>
#include <ffi.h>
#include "wayland.h"
#include "wayland-server.h"
#include "wayland-server-protocol.h"
#include "connection.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment