Rename wayland-system-compositor back to just compositor
diff --git a/Makefile b/Makefile
index afee0c3..74c3799 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,8 @@
subdirs = clients
libs = libwayland-server.so libwayland.so
-compositors = wayland-system-compositor
-all : $(libs) $(compositors) subdirs
+all : $(libs) compositor subdirs
libwayland-server.so : \
wayland.o \
@@ -26,19 +25,19 @@
$(libs) :
gcc -shared $^ $(LDLIBS) -o $@
-wayland-system-compositor : \
- wayland-system-compositor.o \
+compositor : \
+ compositor.o \
evdev.o \
cairo-util.o \
wayland-util.o
-wayland-system-compositor : CFLAGS += $(EGL_COMPOSITOR_CFLAGS)
-wayland-system-compositor : LDLIBS += ./libwayland-server.so $(EGL_COMPOSITOR_LIBS) -rdynamic -lrt -lEGL
+compositor : CFLAGS += $(COMPOSITOR_CFLAGS)
+compositor : LDLIBS += ./libwayland-server.so $(COMPOSITOR_LIBS) -rdynamic -lrt -lEGL
subdirs-all subdirs-clean :
for f in $(subdirs); do $(MAKE) -C $$f $(@:subdirs-%=%); done
-install : $(libs) $(compositors)
+install : $(libs) compositor
install -d $(libdir) $(libdir)/pkgconfig ${udev_rules_dir}
install $(libs) $(libdir)
install wayland-server.pc wayland.pc $(libdir)/pkgconfig
@@ -46,7 +45,7 @@
install 70-wayland.rules ${udev_rules_dir}
clean : subdirs-clean
- rm -f $(compositors) *.o *.so
+ rm -f compositor *.o *.so
config.mk : config.mk.in
./config.status
diff --git a/wayland-system-compositor.c b/compositor.c
similarity index 99%
rename from wayland-system-compositor.c
rename to compositor.c
index e8e46c2..8242b1a 100644
--- a/wayland-system-compositor.c
+++ b/compositor.c
@@ -46,7 +46,7 @@
#include "wayland.h"
#include "wayland-protocol.h"
#include "cairo-util.h"
-#include "wayland-system-compositor.h"
+#include "compositor.h"
#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
diff --git a/wayland-system-compositor.h b/compositor.h
similarity index 100%
rename from wayland-system-compositor.h
rename to compositor.h
diff --git a/configure.ac b/configure.ac
index bf3c669..b01eb7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
PKG_PROG_PKG_CONFIG()
PKG_CHECK_MODULES(FFI, [libffi])
-PKG_CHECK_MODULES(EGL_COMPOSITOR,
+PKG_CHECK_MODULES(COMPOSITOR,
[egl gl libpng cairo gdk-pixbuf-2.0 libudev >= 136 libdrm >= 2.4.17])
PKG_CHECK_MODULES(EGL_CLIENT, [egl gl cairo glib-2.0 libudev])
PKG_CHECK_MODULES(CAIRO_CLIENT, [cairo-drm glib-2.0])
diff --git a/evdev.c b/evdev.c
index d79db8f..d934aa6 100644
--- a/evdev.c
+++ b/evdev.c
@@ -25,7 +25,7 @@
#include <linux/input.h>
#include "wayland.h"
-#include "wayland-system-compositor.h"
+#include "compositor.h"
struct evdev_input_device {
struct wlsc_input_device *device;