[vlc-commits] commit: Qt: fix Modules.am for the media library ( =?UTF-8?Q?Jean=2DPhilippe=20Andr=C3=A9=20?=)

[git at videolan.org]

vlc | branch: master | Jean-Philippe André <jpeg at videolan.org> | Mon Jan 17 14:11:09 2011 +0100| [73f8199479634d2a85ab87fe4202f3c8c739c2cd] | committer: Jean-Philippe André 

Qt: fix Modules.am for the media library

MOC files should not be created if the ML is not built

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

 configure.ac               |    1 +
 modules/gui/qt4/Modules.am |   14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index e0a59d5..a16d008 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4222,6 +4222,7 @@ if test "${enable_media_library}" == "yes"; then
        VLC_ADD_PLUGIN([media_library])
     fi
 fi
+AM_CONDITIONAL([ENABLE_MEDIA_LIBRARY], [test "${enable_media_library}" != "no"])
 
 dnl
 dnl  Endianness check
diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index cb7d4e4..b2d7e65 100644
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -26,7 +26,6 @@ nodist_SOURCES_qt4 = \
 		dialogs/playlist.moc.cpp \
 		dialogs/bookmarks.moc.cpp \
 		dialogs/mediainfo.moc.cpp \
-		dialogs/ml_configuration.moc.cpp \
 		dialogs/extended.moc.cpp \
 		dialogs/messages.moc.cpp \
 		dialogs/epg.moc.cpp \
@@ -60,8 +59,6 @@ nodist_SOURCES_qt4 = \
 		components/epg/EPGWidget.moc.cpp \
 		components/playlist/views.moc.cpp \
 		components/playlist/vlc_model.moc.cpp \
-		components/playlist/ml_item.moc.cpp \
-		components/playlist/ml_model.moc.cpp \
 		components/playlist/playlist_model.moc.cpp \
 		components/playlist/playlist.moc.cpp \
 		components/playlist/standardpanel.moc.cpp \
@@ -95,6 +92,13 @@ nodist_SOURCES_qt4 = \
 		ui/update.h \
 		ui/sout.h
 
+if ENABLE_MEDIA_LIBRARY
+nodist_SOURCES_qt4 +=
+		dialogs/ml_configuration.moc.cpp \
+		components/playlist/ml_item.moc.cpp \
+		components/playlist/ml_model.moc.cpp
+endif
+
 DEPS_res = \
 	pixmaps/arrow_down_dark.png \
 	pixmaps/clear.png \
@@ -347,8 +351,8 @@ noinst_HEADERS = \
 	components/epg/EPGView.hpp \
 	components/epg/EPGWidget.hpp \
 	components/playlist/views.hpp \
-    components/playlist/ml_item.hpp \
-    components/playlist/ml_model.hpp \
+	components/playlist/ml_item.hpp \
+	components/playlist/ml_model.hpp \
 	components/playlist/vlc_model.hpp \
 	components/playlist/playlist_model.hpp \
 	components/playlist/playlist_item.hpp \