build: Move wcap/Makefile.am into top-level Makefile.am
diff --git a/Makefile.am b/Makefile.am
index e6ef979..82e21c4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,9 @@
-if BUILD_WCAP_TOOLS
-wcap_subdir = wcap
-endif
-
if ENABLE_XWAYLAND
xwayland_subdir = xwayland
endif
+bin_PROGRAMS =
+
SUBDIRS = \
shared \
src \
@@ -14,7 +12,6 @@
clients \
protocol \
tests \
- $(wcap_subdir) \
man
DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install
@@ -44,3 +41,16 @@
data/sign_close.png \
data/sign_maximize.png \
data/sign_minimize.png
+
+
+if BUILD_WCAP_TOOLS
+bin_PROGRAMS += wcap-decode
+
+wcap_decode_SOURCES = \
+ wcap/main.c \
+ wcap/wcap-decode.c \
+ wcap/wcap-decode.h
+
+wcap_decode_CFLAGS = $(GCC_CFLAGS) $(WCAP_CFLAGS)
+wcap_decode_LDADD = $(WCAP_LIBS)
+endif
diff --git a/configure.ac b/configure.ac
index b05ca2f..116a30a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -492,7 +492,6 @@
src/version.h
src/weston.pc
clients/Makefile
- wcap/Makefile
protocol/Makefile
man/Makefile
tests/Makefile])
diff --git a/wcap/Makefile.am b/wcap/Makefile.am
deleted file mode 100644
index 338208e..0000000
--- a/wcap/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-bin_PROGRAMS = wcap-decode
-
-wcap_decode_SOURCES = \
- main.c \
- wcap-decode.c \
- wcap-decode.h
-
-wcap_decode_CFLAGS = $(GCC_CFLAGS) $(WCAP_CFLAGS)
-wcap_decode_LDADD = $(WCAP_LIBS)