[vlc-devel] commit: Avoid useless recursion into GUI directories ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Sun May  4 15:57:04 2008 +0300| [48dd75b1d37ad9895c447e7a7fe779fce353030d]

Avoid useless recursion into GUI directories

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=48dd75b1d37ad9895c447e7a7fe779fce353030d
---

 modules/gui/Modules.am     |   25 ++++++++++++++++++++++++-
 modules/gui/qt4/Modules.am |    2 --
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/modules/gui/Modules.am b/modules/gui/Modules.am
index d596a16..79b703b 100644
--- 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 b1fd45a..e317a7c 100644
--- 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 $@ $<