mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-03 09:01:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move cairo-util.[ch] to clients/

Browse source
This commit is contained in:
Kristian Høgsberg 2010-08-16 16:17:42 -04:00
parent 1db21f1cf5
commit b91cd10fcb
6 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -49,7 +49,6 @@ compositor : \
compositor-drm.o \ compositor-drm.o \
compositor-x11.o \ compositor-x11.o \
screenshooter.o \ screenshooter.o \
cairo-util.o \
drm.o drm.o
compositor : CFLAGS += $(COMPOSITOR_CFLAGS) compositor : CFLAGS += $(COMPOSITOR_CFLAGS)

12
clients/Makefile
View file

@ -11,12 +11,12 @@ all : $(egl_clients) $(cairo_clients)
clean : clean :
rm -f $(egl_clients) $(cairo_clients) *.o rm -f $(egl_clients) $(cairo_clients) *.o
flower : flower.o window.o wayland-glib.o ../cairo-util.o flower : flower.o window.o wayland-glib.o cairo-util.o
gears : gears.o window.o wayland-glib.o ../cairo-util.o gears : gears.o window.o wayland-glib.o cairo-util.o
screenshot : screenshot.o wayland-glib.o ../cairo-util.o screenshot : screenshot.o wayland-glib.o cairo-util.o
terminal : terminal.o window.o wayland-glib.o ../cairo-util.o terminal : terminal.o window.o wayland-glib.o cairo-util.o
image : image.o window.o wayland-glib.o ../cairo-util.o image : image.o window.o wayland-glib.o cairo-util.o
view : view.o window.o wayland-glib.o ../cairo-util.o view : view.o window.o wayland-glib.o cairo-util.o
terminal : LDLIBS += -lutil terminal : LDLIBS += -lutil
view : CFLAGS += $(POPPLER_CFLAGS) view : CFLAGS += $(POPPLER_CFLAGS)

0
cairo-util.c → clients/cairo-util.c
View file

0
cairo-util.h → clients/cairo-util.h
View file

2
clients/window.c
View file

@ -46,7 +46,7 @@
#include "wayland-util.h" #include "wayland-util.h"
#include "wayland-client.h" #include "wayland-client.h"
#include "wayland-glib.h" #include "wayland-glib.h"
#include "../cairo-util.h" #include "cairo-util.h"
#include "window.h" #include "window.h"

1
compositor.c
View file

@ -31,7 +31,6 @@
#include <linux/input.h> #include <linux/input.h>
#include "wayland-server-protocol.h" #include "wayland-server-protocol.h"
#include "cairo-util.h"
#include "compositor.h" #include "compositor.h"
const char *option_background = "background.jpg"; const char *option_background = "background.jpg";