Qt: fix Modules.am for the media library

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

diff --git a/configure.ac b/configure.ac
index e0a59d526d6d71bb2870f697c0b1667505fb8448..a16d008fcdcb1378c9f0285ac40043fc4376e717 100644 (file)
--- 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 cb7d4e4e20fda4f2960ad698f4d51742c96edac4..b2d7e6583643505a327478fffe50ec1b85677036 100644 (file)
--- 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 \