From a661f263b4ff9e3b15267df461bc9197abf19934 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Tue, 10 Aug 2010 14:12:05 -0400 Subject: [PATCH] Name libraries -client and -server for consistency Instead of wayland-server and wayland... --- Makefile | 12 ++++++------ clients/Makefile | 2 +- compositor-drm.c | 1 - compositor-x11.c | 1 - compositor.c | 1 - compositor.h | 2 +- configure.ac | 2 +- event-loop.c | 2 +- wayland.pc.in => wayland-client.pc.in | 2 +- wayland.c => wayland-server.c | 2 +- wayland.h => wayland-server.h | 0 11 files changed, 12 insertions(+), 15 deletions(-) rename wayland.pc.in => wayland-client.pc.in (84%) rename wayland.c => wayland-server.c (99%) rename wayland.h => wayland-server.h (100%) diff --git a/Makefile b/Makefile index 3de68cb7..afaf9133 100644 --- a/Makefile +++ b/Makefile @@ -1,33 +1,33 @@ 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} diff --git a/clients/Makefile b/clients/Makefile index 458100f6..f6b51ec4 100644 --- a/clients/Makefile +++ b/clients/Makefile @@ -1,7 +1,7 @@ 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 diff --git a/compositor-drm.c b/compositor-drm.c index 0daf6777..b054bc66 100644 --- a/compositor-drm.c +++ b/compositor-drm.c @@ -33,7 +33,6 @@ #include #include -#include "wayland.h" #include "compositor.h" struct drm_compositor { diff --git a/compositor-x11.c b/compositor-x11.c index 37bed38b..f310d9cb 100644 --- a/compositor-x11.c +++ b/compositor-x11.c @@ -37,7 +37,6 @@ #include #include -#include "wayland.h" #include "compositor.h" #define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0])) diff --git a/compositor.c b/compositor.c index 8f50aef8..e31cb75f 100644 --- a/compositor.c +++ b/compositor.c @@ -30,7 +30,6 @@ #include #include -#include "wayland.h" #include "wayland-server-protocol.h" #include "cairo-util.h" #include "compositor.h" diff --git a/compositor.h b/compositor.h index 3dfafe52..1237fbcf 100644 --- a/compositor.h +++ b/compositor.h @@ -23,7 +23,7 @@ #include #include #include -#include "wayland.h" +#include "wayland-server.h" #include "wayland-util.h" #define GL_GLEXT_PROTOTYPES diff --git a/configure.ac b/configure.ac index 1ffe3e91..4ab09556 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/event-loop.c b/event-loop.c index 11f53427..3546cdfb 100644 --- a/event-loop.c +++ b/event-loop.c @@ -33,7 +33,7 @@ #include #include #include -#include "wayland.h" +#include "wayland-server.h" struct wl_event_loop { int epoll_fd; diff --git a/wayland.pc.in b/wayland-client.pc.in similarity index 84% rename from wayland.pc.in rename to wayland-client.pc.in index 63f638a8..59a925df 100644 --- a/wayland.pc.in +++ b/wayland-client.pc.in @@ -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 diff --git a/wayland.c b/wayland-server.c similarity index 99% rename from wayland.c rename to wayland-server.c index 78059d43..81c28af3 100644 --- a/wayland.c +++ b/wayland-server.c @@ -34,7 +34,7 @@ #include #include -#include "wayland.h" +#include "wayland-server.h" #include "wayland-server-protocol.h" #include "connection.h" diff --git a/wayland.h b/wayland-server.h similarity index 100% rename from wayland.h rename to wayland-server.h