Bunch of new stuff: simple compositor, cairo+gem use in client, events.

1 files changed, 13 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index 661cd6f..44a0b04 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,24 @@
-CFLAGS = -Wall -g $(shell pkg-config --cflags libffi)
-LDLIBS = $(shell pkg-config --libs libffi)
+CFLAGS +=  -Wall -g $(shell pkg-config --cflags libffi libdrm)
+LDLIBS += $(shell pkg-config --libs libffi libdrm)
 
 all : wayland client
 
-wayland_objs = wayland.o event-loop.o hash.o
+wayland_objs = wayland.o event-loop.o hash.o compositor.o
 
 wayland : $(wayland_objs)
 	gcc -o $@ $(wayland_objs) $(LDLIBS)
 
+libwayland_objs = wayland-client.o
+
+libwayland.so : $(libwayland_objs)
+	gcc -o $@ $(libwayland_objs) -shared
+
 client_objs = client.o
+client : CFLAGS += $(shell pkg-config --cflags cairo)
+client : LDLIBS += $(shell pkg-config --libs cairo)
 
-client : $(client_objs)
-	gcc -o $@ $(client_objs)
+client : $(client_objs) libwayland.so
+	gcc -o $@ -L. -lwayland $(LDLIBS) $(client_objs)
 
 clean :
-	rm client wayland *.o
\ No newline at end of file
+	rm -f client wayland *.o libwayland.so
\ No newline at end of file