Merge remote-tracking branch 'upstream/master'

[ngadmin] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a759fcd757f5466681004e160d30f89ddd0d3616..8f40010e6a5bd31e2702de02d1e81df1d9e315dc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,15 @@
 
 ACLOCAL_AMFLAGS = -I .
 
-SUBDIRS = raw lib cli
+SUBDIRS = raw wireshark
+
+if ENABLE_LIB
+SUBDIRS += lib
+endif
+
+if ENABLE_CLI
+SUBDIRS += cli
+endif
 
 if ENABLE_SPY
 SUBDIRS += spy