vlc_epg: add parental rating from ts streams.

[vlc] / modules / gui / qt4 / Modules.am

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index ae626fd3c653f79696f407932aaf259322804151..30f1f59d7743f6ea5c7ed9fe11798788be040e99 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -12,7 +12,7 @@
 
 AUTOMAKE_OPTIONS = subdir-objects
 MOSTLYCLEANFILES = $(UIH)
-SUFFIXES = .ui .h .hpp .moc.cpp .mm
+SUFFIXES = .ui .h .hpp .moc.cpp
 
 nodist_SOURCES_qt4 = \
                main_interface.moc.cpp \
@@ -47,6 +47,7 @@ nodist_SOURCES_qt4 = \
                dialogs/extensions.moc.cpp \
                components/extended_panels.moc.cpp \
                components/info_panels.moc.cpp \
+               components/info_widgets.moc.cpp \
                components/preferences_widgets.moc.cpp \
                components/complete_preferences.moc.cpp \
                components/simple_preferences.moc.cpp \
@@ -133,6 +134,27 @@ DEPS_res = \
        pixmaps/playlist/repeat_one.png \
        pixmaps/playlist/shuffle_off.png \
        pixmaps/playlist/shuffle_on.png \
+       pixmaps/playlist/dropzone.png \
+       pixmaps/playlist/sidebar-icons/capture.png \
+       pixmaps/playlist/sidebar-icons/pictures.png \
+       pixmaps/playlist/sidebar-icons/disc.png \
+       pixmaps/playlist/sidebar-icons/playlist.png \
+       pixmaps/playlist/sidebar-icons/lan.png \
+       pixmaps/playlist/sidebar-icons/podcast.png \
+       pixmaps/playlist/sidebar-icons/library.png \
+       pixmaps/playlist/sidebar-icons/screen.png \
+       pixmaps/playlist/sidebar-icons/movie.png \
+       pixmaps/playlist/sidebar-icons/mtp.png \
+       pixmaps/playlist/sidebar-icons/music.png \
+       pixmaps/playlist/sidebar-icons/network.png \
+       pixmaps/playlist/sidebar-icons/sd/appletrailers.png \
+       pixmaps/playlist/sidebar-icons/sd/icecast.png \
+       pixmaps/playlist/sidebar-icons/sd/metachannels.png \
+       pixmaps/playlist/sidebar-icons/sd/katsomo.png \
+       pixmaps/playlist/sidebar-icons/sd/fmc.png \
+       pixmaps/playlist/sidebar-icons/sd/frenchtv.png \
+       pixmaps/playlist/sidebar-icons/sd/jamendo.png \
+       pixmaps/playlist/sidebar-icons/sd/assembleenationale.png \
        pixmaps/prefs/advprefs_audio.png \
        pixmaps/prefs/advprefs_codec.png \
        pixmaps/prefs/advprefs_extended.png \
@@ -209,6 +231,7 @@ DEPS_res = \
        pixmaps/win7/win7thumbnail_next.png \
        pixmaps/win7/win7thumbnail_play.png \
        pixmaps/update.png \
+       pixmaps/valid.png \
        pixmaps/search_clear.png \
        pixmaps/lock.png
 
@@ -238,6 +261,9 @@ else
 endif
 endif
 
+# These MOC files depend on the configure settings:
+dialogs_provider.moc.cpp dialogs/vlm.moc.cpp: $(top_builddir)/config.h
+
 .ui.h:
        $(AM_V_at)mkdir -p -- ui
        $(AM_V_at)rm -f $@ $@.tmp
@@ -246,9 +272,6 @@ endif
        $(AM_V_at)sed -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.tmp >$@
        $(AM_V_at)rm -f $@.tmp
 
-.mm.lo: 
-       $(top_builddir)/libtool --verbose --mode=compile $(CXX) $(objcxxflags) -DQ_WS_MAC -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) $(CXXFLAGS_qt4) -c $< -o $@ 
-
 SOURCES_qt4 =  qt4.cpp \
                menus.cpp \
                main_interface.cpp \
@@ -283,6 +306,7 @@ SOURCES_qt4 =       qt4.cpp \
                dialogs/extensions.cpp \
                components/extended_panels.cpp \
                components/info_panels.cpp \
+               components/info_widgets.cpp \
                components/preferences_widgets.cpp \
                components/complete_preferences.cpp \
                components/simple_preferences.cpp \
@@ -319,10 +343,6 @@ SOURCES_qt4 =      qt4.cpp \
                util/buttons/RoundButton.cpp \
                styles/seekstyle.cpp
 
-if HAVE_DARWIN
-SOURCES_qt4 +=  util/searchlineedit_mac.mm
-endif
-
 if HAVE_WIN32
 SOURCES_qt4 += main_interface_win32.cpp
 endif
@@ -362,6 +382,7 @@ noinst_HEADERS = \
        dialogs/extensions.hpp \
        components/extended_panels.hpp \
        components/info_panels.hpp \
+       components/info_widgets.hpp \
        components/preferences_widgets.hpp \
        components/complete_preferences.hpp \
        components/simple_preferences.hpp \
@@ -427,4 +448,3 @@ EXTRA_DIST += \
        ui/sout.ui \
        ui/vlm.ui \
        $(DEPS_res)
-