Merge branch 'master' of git://git.videolan.org/vlc

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

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 01fd039f894ba416100e618048d166f102895a5b..60355813d170af0e7ddbcff828cb421d2cec8ca7 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -69,7 +69,6 @@ nodist_SOURCES_qt4 = \
                util/qvlcapp.moc.cpp \
                resources.cpp \
                ui/equalizer.h \
-               ui/v4l2.h \
                ui/video_effects.h \
                ui/open_file.h \
                ui/open_disk.h \
@@ -85,6 +84,9 @@ nodist_SOURCES_qt4 = \
                ui/sprefs_subtitles.h \
                ui/sprefs_video.h \
                ui/streampanel.h \
+               ui/messages_panel.h \
+               ui/about.h \
+               ui/update.h \
                ui/sout.h
 
 DEPS_res = \
@@ -206,7 +208,7 @@ resources.cpp: vlc.qrc $(DEPS_res)
        $(AM_V_GEN)$(RCC) -name vlc -o $@ $<
 
 .hpp.moc.cpp:
-       $(moc_verbose)$(MOC) $(DEFS) $(CPPFLAGS) -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
+       $(moc_verbose)$(MOC) $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
 
 .ui.h:
        $(AM_V_at)mkdir -p -- ui
@@ -341,7 +343,6 @@ noinst_HEADERS = \
 EXTRA_DIST += \
        vlc.qrc \
        ui/equalizer.ui \
-       ui/v4l2.ui \
        ui/video_effects.ui \
        ui/open_file.ui \
        ui/open_disk.ui \
@@ -356,6 +357,9 @@ EXTRA_DIST += \
        ui/sprefs_subtitles.ui \
        ui/sprefs_video.ui \
        ui/streampanel.ui \
+       ui/messages_panel.ui \
+       ui/about.ui \
+       ui/update.ui \
        ui/sout.ui \
        ui/vlm.ui \
        $(DEPS_res)