diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2014-02-18 14:55:09 -0800 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2014-02-18 14:55:09 -0800 |
| commit | bb5344ee6d404095ddb70195b0b4f749d460d989 (patch) | |
| tree | ae82e475387c308a50086b2ac7455d1a80d7256d | |
| parent | 6292fe2af6a45decb7fd39090e74dd87bc4e22b2 (diff) | |
build: Move protocol/ Makefile.am into toplevel Makefile.am
A small step towards non-recursive build system for wayland too.
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | protocol/Makefile.am | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 99607b0..f6ee810 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,11 +2,14 @@ if BUILD_DOCS doc_subdir = doc endif -SUBDIRS = protocol src $(doc_subdir) tests cursor +SUBDIRS = src $(doc_subdir) tests cursor ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} aclocaldir = $(datadir)/aclocal dist_aclocal_DATA = wayland-scanner.m4 -dist_pkgdata_DATA = wayland-scanner.mk +dist_pkgdata_DATA = \ + wayland-scanner.mk \ + protocol/wayland.xml \ + protocol/wayland.dtd diff --git a/configure.ac b/configure.ac index 7be5d8f..d75dc09 100644 --- a/configure.ac +++ b/configure.ac @@ -142,6 +142,5 @@ AC_CONFIG_FILES([Makefile src/wayland-client.pc src/wayland-scanner.pc src/wayland-version.h - protocol/Makefile tests/Makefile]) AC_OUTPUT diff --git a/protocol/Makefile.am b/protocol/Makefile.am deleted file mode 100644 index 9dca324..0000000 --- a/protocol/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -dist_pkgdata_DATA = wayland.xml wayland.dtd |