Don't recurse to python, ax and mozilla directories if not needed

diff --git a/Makefile.am b/Makefile.am
index 452a1f6117e81b18c38669acbd014a7ba2d3dc4a..2f12b663875d59e388c5ad122fe14a0cd380f541 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,9 +7,21 @@
 # which have makefiles with distribution information.
 #  - src (libvlc) is nedeed by modules, mozilla and bindings
 #  - libs/* are needed by modules
-SUBDIRS = po libs/loader libs/srtp src modules \
-               projects/mozilla bindings projects/activex share doc test
-DIST_SUBDIRS = $(SUBDIRS) m4  extras/package/ipkg
+EXTRA_SUBDIRS = m4 extras/package/ipkg \
+       bindings/python \
+       projects/mozilla projects/activex
+SUBDIRS = po libs/loader libs/srtp src modules share doc test
+DIST_SUBDIRS = $(SUBDIRS) $(EXTRA_SUBDIRS)
+
+if BUILD_MOZILLA
+SUBDIRS += projects/mozilla
+endif
+if BUILD_ACTIVEX
+SUBDIRS += projects/activex
+endif
+if BUILD_PYTHON
+SUBDIRS += bindings/python
+endif
 
 EXTRA_DIST = \
        HACKING \