From 8a4087164587b48ae34e421b5b3f90b5f6d4650a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Wed, 25 Aug 2010 13:38:40 -0400 Subject: [PATCH] A few makefile/autoconf fixes --- Makefile | 2 +- clients/Makefile | 2 +- config.mk.in | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bf53de2..0746855 100644 --- a/Makefile +++ b/Makefile @@ -71,7 +71,7 @@ install : $(libs) compositor subdirs-install install 70-wayland.rules ${udev_rules_dir} clean : subdirs-clean - rm -f compositor scanner *.o *.so + rm -f compositor scanner *.o *.so .*.deps rm -f wayland-protocol.c \ wayland-server-protocol.h wayland-client-protocol.h diff --git a/clients/Makefile b/clients/Makefile index 9e73182..85c6d4b 100644 --- a/clients/Makefile +++ b/clients/Makefile @@ -9,7 +9,7 @@ cairo_clients = flower screenshot terminal image view dnd all : $(egl_clients) $(cairo_clients) clean : - rm -f $(egl_clients) $(cairo_clients) *.o + rm -f $(egl_clients) $(cairo_clients) *.o .*.deps flower : flower.o window.o wayland-glib.o cairo-util.o gears : gears.o window.o wayland-glib.o cairo-util.o diff --git a/config.mk.in b/config.mk.in index c8659e1..8c59e15 100644 --- a/config.mk.in +++ b/config.mk.in @@ -7,6 +7,7 @@ udev_rules_dir = @sysconfdir@/udev/rules.d libdir = @libdir@ includedir = @includedir@ datadir = @datadir@ +datarootdir = @datarootdir@ COMPOSITOR_CFLAGS = @COMPOSITOR_CFLAGS@ COMPOSITOR_LIBS = @COMPOSITOR_LIBS@ -- 2.7.4