From 5b9f9f8fc43404b401805f1f6d5fe2017b5fd1a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Mon, 27 Jan 2014 21:40:28 -0800
Subject: [PATCH] build: Move data/Makefile.am into Makefile.am

---
 Makefile.am      | 14 +++++++++++++-
 configure.ac     |  1 -
 data/Makefile.am | 12 ------------
 3 files changed, 13 insertions(+), 14 deletions(-)
 delete mode 100644 data/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f22c5429..e6ef979d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,6 @@ SUBDIRS =					\
 	$(xwayland_subdir)			\
 	desktop-shell				\
 	clients					\
-	data					\
 	protocol				\
 	tests					\
 	$(wcap_subdir)				\
@@ -32,3 +31,16 @@ weston.ini : $(srcdir)/weston.ini.in
 all-local : weston.ini
 
 CLEANFILES = weston.ini
+
+
+westondatadir = $(datadir)/weston
+dist_westondata_DATA =				\
+	data/wayland.svg			\
+	data/wayland.png			\
+	data/pattern.png			\
+	data/terminal.png			\
+	data/border.png				\
+	data/icon_window.png			\
+	data/sign_close.png			\
+	data/sign_maximize.png			\
+	data/sign_minimize.png
diff --git a/configure.ac b/configure.ac
index dd2639f1..b05ca2fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -493,7 +493,6 @@ AC_CONFIG_FILES([Makefile
 		 src/weston.pc
 		 clients/Makefile
 		 wcap/Makefile
-		 data/Makefile
 		 protocol/Makefile
 		 man/Makefile
 		 tests/Makefile])
diff --git a/data/Makefile.am b/data/Makefile.am
deleted file mode 100644
index 84a2a538..00000000
--- a/data/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-westondatadir = $(datadir)/weston
-
-dist_westondata_DATA =				\
-	wayland.svg				\
-	wayland.png				\
-	pattern.png				\
-	terminal.png				\
-	border.png				\
-	icon_window.png				\
-	sign_close.png				\
-	sign_maximize.png			\
-	sign_minimize.png