build: Move data/Makefile.am into Makefile.am

dev
Kristian Høgsberg 11 years ago
parent 396a9bb995
commit 5b9f9f8fc4
  1. 14
      Makefile.am
  2. 1
      configure.ac
  3. 12
      data/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

@ -493,7 +493,6 @@ AC_CONFIG_FILES([Makefile
src/weston.pc
clients/Makefile
wcap/Makefile
data/Makefile
protocol/Makefile
man/Makefile
tests/Makefile])

@ -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
Loading…
Cancel
Save