mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename wayland-system-compositor back to just compositor

Browse Source
This commit is contained in:
Kristian Høgsberg
2010-06-04 21:52:02 -04:00
parent b2a432ef18
commit 8286302644
5 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+7 -8
View File
@@ -2,9 +2,8 @@ include config.mk
subdirs = clients subdirs = clients
libs = libwayland-server.so libwayland.so libs = libwayland-server.so libwayland.so
compositors = wayland-system-compositor
all : $(libs) $(compositors) subdirs all : $(libs) compositor subdirs
libwayland-server.so : \ libwayland-server.so : \
wayland.o \ wayland.o \
@@ -26,19 +25,19 @@ $(libs) : LDLIBS += $(FFI_LIBS)
$(libs) : $(libs) :
gcc -shared $^ $(LDLIBS) -o $@ gcc -shared $^ $(LDLIBS) -o $@
wayland-system-compositor : \ compositor : \
wayland-system-compositor.o \ compositor.o \
evdev.o \ evdev.o \
cairo-util.o \ cairo-util.o \
wayland-util.o wayland-util.o
wayland-system-compositor : CFLAGS += $(EGL_COMPOSITOR_CFLAGS) compositor : CFLAGS += $(COMPOSITOR_CFLAGS)
wayland-system-compositor : LDLIBS += ./libwayland-server.so $(EGL_COMPOSITOR_LIBS) -rdynamic -lrt -lEGL compositor : LDLIBS += ./libwayland-server.so $(COMPOSITOR_LIBS) -rdynamic -lrt -lEGL
subdirs-all subdirs-clean : subdirs-all subdirs-clean :
for f in $(subdirs); do $(MAKE) -C $$f $(@:subdirs-%=%); done 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 -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.pc $(libdir)/pkgconfig
@@ -46,7 +45,7 @@ install : $(libs) $(compositors)
install 70-wayland.rules ${udev_rules_dir} install 70-wayland.rules ${udev_rules_dir}
clean : subdirs-clean clean : subdirs-clean
rm -f $(compositors) *.o *.so rm -f compositor *.o *.so
config.mk : config.mk.in config.mk : config.mk.in
./config.status ./config.status
wayland-system-compositor.c → compositor.c
+1 -1
View File
@@ -46,7 +46,7 @@
#include "wayland.h" #include "wayland.h"
#include "wayland-protocol.h" #include "wayland-protocol.h"
#include "cairo-util.h" #include "cairo-util.h"
#include "wayland-system-compositor.h" #include "compositor.h"
#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0]) #define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
wayland-system-compositor.h → compositor.h
View File
configure.ac
+1 -1
View File
@@ -4,7 +4,7 @@ AC_PROG_CC
PKG_PROG_PKG_CONFIG() PKG_PROG_PKG_CONFIG()
PKG_CHECK_MODULES(FFI, [libffi]) 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]) [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(EGL_CLIENT, [egl gl cairo glib-2.0 libudev])
PKG_CHECK_MODULES(CAIRO_CLIENT, [cairo-drm glib-2.0]) PKG_CHECK_MODULES(CAIRO_CLIENT, [cairo-drm glib-2.0])
evdev.c
+1 -1
View File
@@ -25,7 +25,7 @@
#include <linux/input.h> #include <linux/input.h>
#include "wayland.h" #include "wayland.h"
#include "wayland-system-compositor.h" #include "compositor.h"
struct evdev_input_device { struct evdev_input_device {
struct wlsc_input_device *device; struct wlsc_input_device *device;