Commit 73f81994 authored by Jean-Philippe André's avatar Jean-Philippe André

Qt: fix Modules.am for the media library

MOC files should not be created if the ML is not built
parent 90b6e3dc
......@@ -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
......
......@@ -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 \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment