Commit bb5344ee authored by Kristian Høgsberg's avatar Kristian Høgsberg
Browse files

build: Move protocol/ Makefile.am into toplevel Makefile.am

A small step towards non-recursive build system for wayland too.
parent 6292fe2a
...@@ -2,11 +2,14 @@ if BUILD_DOCS ...@@ -2,11 +2,14 @@ if BUILD_DOCS
doc_subdir = doc doc_subdir = doc
endif endif
SUBDIRS = protocol src $(doc_subdir) tests cursor SUBDIRS = src $(doc_subdir) tests cursor
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
aclocaldir = $(datadir)/aclocal aclocaldir = $(datadir)/aclocal
dist_aclocal_DATA = wayland-scanner.m4 dist_aclocal_DATA = wayland-scanner.m4
dist_pkgdata_DATA = wayland-scanner.mk dist_pkgdata_DATA = \
wayland-scanner.mk \
protocol/wayland.xml \
protocol/wayland.dtd
...@@ -142,6 +142,5 @@ AC_CONFIG_FILES([Makefile ...@@ -142,6 +142,5 @@ AC_CONFIG_FILES([Makefile
src/wayland-client.pc src/wayland-client.pc
src/wayland-scanner.pc src/wayland-scanner.pc
src/wayland-version.h src/wayland-version.h
protocol/Makefile
tests/Makefile]) tests/Makefile])
AC_OUTPUT AC_OUTPUT
dist_pkgdata_DATA = wayland.xml wayland.dtd
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment