Avoid useless recursion into GUI directories

diff --git a/modules/gui/Modules.am b/modules/gui/Modules.am
index d596a160aa6e9abcfc3d9dfc887b5ce5db77c3e5..79b703b960af0881902dc3e682ba29075d5708f6 100644 (file)
--- a/modules/gui/Modules.am
+++ b/modules/gui/Modules.am
@@ -1,3 +1,26 @@
-SUBDIRS = beos pda macosx minimal_macosx qnx qt4 skins2 wxwidgets wince
+DIST_SUBDIRS = beos macosx minimal_macosx pda qnx qt4 skins2 wxwidgets wince
+SUBDIRS =
+
+if HAVE_BEOS
+SUBDIRS += beos
+endif
+if HAVE_DARWIN
+SUBDIRS += macosx minimal_macosx
+endif
+if BUILD_PDA
+SUBDIRS += pda
+endif
+SUBDIRS += qnx
+if ENABLE_QT4
+SUBDIRS += qt4
+endif
+if BUILD_SKINS
+SUBDIRS += skins2
+endif
+SUBDIRS += wxwidgets
+if HAVE_WINCE
+SUBDIRS += wince
+endif
+
 SOURCES_ncurses = ncurses.c
 SOURCES_fbosd = fbosd.c

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index b1fd45aee6d33b66aa38929f06212a9de2d1fb3e..e317a7ce89ecc47341c1b48480e57f3c2cebd751 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -64,9 +64,7 @@ nodist_SOURCES_qt4 = \
                ui/streampanel.h \
                ui/sout.h
 
-if ENABLE_QT4
 BUILT_SOURCES += $(nodist_SOURCES_qt4)
-endif
 
 resources.cpp: vlc.qrc
        $(RCC) -name vlc -o $@ $<