[PATCH weston 1/2] Makefile.am: SUBDIRS is automagic

Quentin Glidic sardemff7+wayland at sardemff7.net
Thu Feb 21 10:13:20 PST 2013


From: Quentin Glidic <sardemff7+git at sardemff7.net>

DIST_SUBDIRS should be used for corner cases only, not for conditional
SUBDIRS

Signed-off-by: Quentin Glidic <sardemff7+git at sardemff7.net>
---
 Makefile.am | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7b1b1bc..6e38688 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,10 @@
-if BUILD_WCAP_TOOLS
-wcap_subdir = wcap
-endif
 
-SUBDIRS = shared src clients data protocol tests $(wcap_subdir) man
 
-DIST_SUBDIRS = shared src clients data protocol tests wcap man
+SUBDIRS = shared src clients data protocol tests man
+
+if BUILD_WCAP_TOOLS
+SUBDIRS += wcap
+endif
 
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install
-- 
1.8.1.2



More information about the wayland-devel mailing list