]> git.sesse.net Git - vlc/blobdiff - modules/gui/qt4/Modules.am
Reverts [24530] & [24531] (preprocessing related) , add $(DEFS) (-DHAVE_CONFIG_H...
[vlc] / modules / gui / qt4 / Modules.am
index 28dce7d9230215778ce5cbca4a6f1ac74c111f1c..af90ecba2306f3ac1f618289a740b550a4b59e4c 100644 (file)
@@ -10,7 +10,6 @@
 
 AUTOMAKE_OPTIONS = subdir-objects
 MOSTLYCLEANFILES = $(UIH)
-CLEANFILES += dialogs/about.hpp
 SUFFIXES += .ui .h .hpp .moc.cpp
 
 nodist_SOURCES_qt4 = \
@@ -18,8 +17,8 @@ nodist_SOURCES_qt4 = \
                menus.moc.cpp \
                dialogs_provider.moc.cpp \
                input_manager.moc.cpp \
-               playlist_model.moc.cpp \
                dialogs/playlist.moc.cpp \
+               dialogs/bookmarks.moc.cpp \
                dialogs/mediainfo.moc.cpp \
                dialogs/extended.moc.cpp \
                dialogs/messages.moc.cpp \
@@ -33,18 +32,21 @@ nodist_SOURCES_qt4 = \
                dialogs/podcast_configuration.moc.cpp \
                dialogs/vlm.moc.cpp \
                components/extended_panels.moc.cpp \
-               components/infopanels.moc.cpp \
+               components/info_panels.moc.cpp \
                components/preferences_widgets.moc.cpp \
                components/complete_preferences.moc.cpp \
                components/simple_preferences.moc.cpp \
-               components/open.moc.cpp \
+               components/open_panels.moc.cpp \
                components/interface_widgets.moc.cpp \
+               components/playlist/playlist_model.moc.cpp \
+               components/playlist/playlist.moc.cpp \
                components/playlist/panels.moc.cpp \
                components/playlist/selector.moc.cpp \
                util/input_slider.moc.cpp \
                util/customwidgets.moc.cpp \
                resources.cpp \
                ui/equalizer.h \
+               ui/v4l2.h \
                ui/video_effects.h \
                ui/open_file.h \
                ui/open_disk.h \
@@ -58,19 +60,18 @@ nodist_SOURCES_qt4 = \
                ui/sprefs_interface.h \
                ui/sprefs_subtitles.h \
                ui/sprefs_video.h \
-               ui/sprefs_hotkeys.h \
                ui/streampanel.h \
                ui/sout.h
 
 if ENABLE_QT4
-BUILT_SOURCES += $(nodist_SOURCES_qt4) dialogs/about.hpp
+BUILT_SOURCES += $(nodist_SOURCES_qt4)
 endif
 
 resources.cpp: res.qrc
        $(RCC) -name vlc -o $@ $<
 
 .hpp.moc.cpp:
-       $(MOC) -o $@ $<
+       $(MOC) $(DEFS) $(CPPFLAGS) -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
 
 .ui.h:
        mkdir -p -- ui
@@ -80,29 +81,13 @@ resources.cpp: res.qrc
        sed -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.tmp >$@
        rm -f $@.tmp
 
-dialogs/help.cpp: dialogs/about.hpp
-
-dialogs/about.hpp: Modules.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS $(top_srcdir)/AUTHORS
-       mkdir -p -- dialogs
-       echo "/* Automatically generated file - DO NOT EDIT */" > dialogs/about.hpp.tmp
-       echo "static const char psz_license[] =" >> dialogs/about.hpp.tmp
-       cat $(top_srcdir)/COPYING | sed s/'"'/'\\"'/g | awk '{ print "\""$$0"\\n\"" }' >> dialogs/about.hpp.tmp
-       echo ";" >> dialogs/about.hpp.tmp
-       echo "static const char psz_thanks[] =" >> dialogs/about.hpp.tmp
-       grep -v '$$Id:'  $(top_srcdir)/THANKS | sed s/'"'/'\\"'/g | awk '{ print "\""$$0"\\n\"" }'|sed s/"<.*.> "// >> dialogs/about.hpp.tmp
-       echo ";" >> dialogs/about.hpp.tmp
-       echo "static const char psz_authors[] =" >> dialogs/about.hpp.tmp
-       grep N: $(top_srcdir)/AUTHORS | cut -d" " -f 2- | sed s/'"'/'\\"'/g | awk '{ print "\""$$0"\\n\"" }' >> dialogs/about.hpp.tmp
-       echo ";" >> dialogs/about.hpp.tmp
-       mv -f -- dialogs/about.hpp.tmp dialogs/about.hpp
-
 SOURCES_qt4 =  qt4.cpp \
                menus.cpp \
                main_interface.cpp \
                dialogs_provider.cpp \
                input_manager.cpp \
-               playlist_model.cpp \
                dialogs/playlist.cpp \
+               dialogs/bookmarks.cpp \
                dialogs/preferences.cpp \
                dialogs/mediainfo.cpp \
                dialogs/extended.cpp \
@@ -116,16 +101,19 @@ SOURCES_qt4 =     qt4.cpp \
                dialogs/vlm.cpp \
                dialogs/podcast_configuration.cpp \
                components/extended_panels.cpp \
-               components/infopanels.cpp \
+               components/info_panels.cpp \
                components/preferences_widgets.cpp \
                components/complete_preferences.cpp \
                components/simple_preferences.cpp \
-               components/open.cpp \
+               components/open_panels.cpp \
                components/interface_widgets.cpp \
+               components/playlist/playlist_model.cpp \
                components/playlist/standardpanel.cpp \
+               components/playlist/playlist.cpp \
                components/playlist/selector.cpp \
                util/input_slider.cpp \
-               util/customwidgets.cpp
+               util/customwidgets.cpp \
+               util/registry.cpp
 
 noinst_HEADERS = \
        qt4.hpp \
@@ -133,8 +121,8 @@ noinst_HEADERS = \
        main_interface.hpp \
        dialogs_provider.hpp \
        input_manager.hpp \
-       playlist_model.hpp \
        dialogs/playlist.hpp \
+       dialogs/bookmarks.hpp \
        dialogs/mediainfo.hpp \
        dialogs/extended.hpp \
        dialogs/messages.hpp \
@@ -142,29 +130,31 @@ noinst_HEADERS = \
        dialogs/preferences.hpp \
        dialogs/interaction.hpp \
        dialogs/sout.hpp \
-       dialogs/about.hpp \
        dialogs/help.hpp \
        dialogs/gototime.hpp \
        dialogs/open.hpp \
        dialogs/vlm.hpp \
        dialogs/podcast_configuration.hpp \
        components/extended_panels.hpp \
-       components/infopanels.hpp \
+       components/info_panels.hpp \
        components/preferences_widgets.hpp \
        components/complete_preferences.hpp \
        components/simple_preferences.hpp \
-       components/open.hpp \
+       components/open_panels.hpp \
        components/interface_widgets.hpp \
+       components/playlist/playlist_model.hpp \
        components/playlist/panels.hpp \
+       components/playlist/playlist.hpp \
        components/playlist/selector.hpp \
        util/input_slider.hpp \
-       util/directslider.hpp \
        util/customwidgets.hpp \
-       util/qvlcframe.hpp
+       util/qvlcframe.hpp \
+       util/registry.cpp
 
 EXTRA_DIST += \
        res.qrc \
        ui/equalizer.ui \
+       ui/v4l2.ui \
        ui/video_effects.ui \
        ui/open_file.ui \
        ui/open_disk.ui \
@@ -175,7 +165,6 @@ EXTRA_DIST += \
        ui/sprefs_audio.ui \
        ui/sprefs_input.ui \
        ui/sprefs_interface.ui \
-       ui/sprefs_hotkeys.ui \
        ui/sprefs_subtitles.ui \
        ui/sprefs_video.ui \
        ui/streampanel.ui \
@@ -196,7 +185,8 @@ EXTRA_DIST += \
        pixmaps/folder-blue_16px.png \
        pixmaps/folder-grey_16px.png \
        pixmaps/go-next.png \
-pixmaps/menus_help_16px.png \
+       pixmaps/harddisk_16px.png \
+       pixmaps/menus_help_16px.png \
        pixmaps/menus_info_16px.png \
        pixmaps/menus_messages_16px.png \
        pixmaps/menus_preferences_16px.png \
@@ -238,5 +228,9 @@ pixmaps/menus_help_16px.png \
        pixmaps/type_playlist.png \
        pixmaps/type_unknown.xpm \
        pixmaps/volume-high.png \
+       pixmaps/volume-medium.png \
        pixmaps/volume-low.png \
-       pixmaps/volume-muted.png 
+       pixmaps/volume-muted.png \
+       pixmaps/volume-slider.svg \
+       pixmaps/volume-slider-inside.png \
+       pixmaps/volume-slider-outside.png