X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2FModules.am;h=66148d7164d284f272f9d5f26ed40a5ca52e2627;hb=f8ab6a3b4687282138f4d63f125c402858f253ee;hp=581a3821d64c0032448927b6ef313a546d5aa7ea;hpb=67cb64706d328f65fc3d3793b447b014b5d62a18;p=vlc diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am index 581a3821d6..66148d7164 100644 --- a/modules/gui/qt4/Modules.am +++ b/modules/gui/qt4/Modules.am @@ -10,7 +10,6 @@ AUTOMAKE_OPTIONS = subdir-objects MOSTLYCLEANFILES = $(UIH) -CLEANFILES += dialogs/about.hpp SUFFIXES += .ui .h .hpp .moc.cpp nodist_SOURCES_qt4 = \ @@ -31,11 +30,11 @@ nodist_SOURCES_qt4 = \ dialogs/gototime.moc.cpp \ dialogs/open.moc.cpp \ dialogs/podcast_configuration.moc.cpp \ - dialogs/vlm.moc.cpp \ + dialogs/vlm.moc.cpp \ components/extended_panels.moc.cpp \ components/infopanels.moc.cpp \ - components/preferences_widgets.moc.cpp \ - components/complete_preferences.moc.cpp \ + components/preferences_widgets.moc.cpp \ + components/complete_preferences.moc.cpp \ components/simple_preferences.moc.cpp \ components/open.moc.cpp \ components/interface_widgets.moc.cpp \ @@ -45,7 +44,6 @@ nodist_SOURCES_qt4 = \ util/customwidgets.moc.cpp \ resources.cpp \ ui/equalizer.h \ - ui/spatializer.h \ ui/video_effects.h \ ui/open_file.h \ ui/open_disk.h \ @@ -64,7 +62,7 @@ nodist_SOURCES_qt4 = \ ui/sout.h if ENABLE_QT4 -BUILT_SOURCES += $(nodist_SOURCES_qt4) dialogs/about.hpp +BUILT_SOURCES += $(nodist_SOURCES_qt4) endif resources.cpp: res.qrc @@ -81,22 +79,6 @@ 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\"" }' >> 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 \ @@ -114,7 +96,7 @@ SOURCES_qt4 = qt4.cpp \ dialogs/help.cpp \ dialogs/gototime.cpp \ dialogs/open.cpp \ - dialogs/vlm.cpp \ + dialogs/vlm.cpp \ dialogs/podcast_configuration.cpp \ components/extended_panels.cpp \ components/infopanels.cpp \ @@ -143,11 +125,10 @@ 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/vlm.hpp \ dialogs/podcast_configuration.hpp \ components/extended_panels.hpp \ components/infopanels.hpp \ @@ -166,7 +147,6 @@ noinst_HEADERS = \ EXTRA_DIST += \ res.qrc \ ui/equalizer.ui \ - ui/spatializer.ui \ ui/video_effects.ui \ ui/open_file.ui \ ui/open_disk.ui \ @@ -183,62 +163,62 @@ EXTRA_DIST += \ ui/streampanel.ui \ ui/sout.ui \ ui/vlm.ui \ - pixmaps/advanced.xpm \ - pixmaps/audio.xpm \ - pixmaps/codec.xpm \ - pixmaps/intf.xpm \ - pixmaps/type_net.xpm \ - pixmaps/type_playlist.xpm \ - pixmaps/video.xpm \ - pixmaps/type_unknown.xpm \ - pixmaps/type_file.xpm \ - pixmaps/type_card.xpm \ - pixmaps/type_disc.xpm \ - pixmaps/type_cdda.xpm \ - pixmaps/type_directory.xpm \ - pixmaps/type_node.xpm \ + pixmaps/advprefs_audio.png \ + pixmaps/advprefs_codec.png \ + pixmaps/advprefs_extended.png \ + pixmaps/advprefs_intf.png \ + pixmaps/advprefs_playlist.png \ + pixmaps/advprefs_sout.png \ + pixmaps/advprefs_video.png \ + pixmaps/capture-card_16px.png \ + pixmaps/cdda_16px.png \ + pixmaps/disc_16px.png \ + pixmaps/file-asym_16px.png \ + pixmaps/file-wide_16px.png \ + pixmaps/folder-blue_16px.png \ + pixmaps/folder-grey_16px.png \ pixmaps/go-next.png \ +pixmaps/menus_help_16px.png \ + pixmaps/menus_info_16px.png \ + pixmaps/menus_messages_16px.png \ + pixmaps/menus_preferences_16px.png \ + pixmaps/menus_quit_16px.png \ + pixmaps/menus_settings_16px.png \ + pixmaps/menus_stream_16px.png \ + pixmaps/network_16px.png \ + pixmaps/next_16px.png \ pixmaps/next.png \ pixmaps/noart.png \ - pixmaps/playlist_icon.png \ - pixmaps/play.png \ + pixmaps/pause_16px.png \ pixmaps/pause.png \ + pixmaps/play_16px.png \ + pixmaps/playlist_16px.png \ + pixmaps/playlist_add.png \ + pixmaps/playlist.png \ + pixmaps/playlist_repeat_all.png \ + pixmaps/playlist_repeat_off.png \ + pixmaps/playlist_repeat_one.png \ + pixmaps/playlist_shuffle_off.png \ + pixmaps/playlist_shuffle_on.png \ + pixmaps/play.png \ + pixmaps/previous_16px.png \ pixmaps/previous.png \ + pixmaps/record_16px.png \ pixmaps/spref_cone_Audio_64.png \ pixmaps/spref_cone_Hotkeys_64.png \ pixmaps/spref_cone_Input_64.png \ pixmaps/spref_cone_Interface_64.png \ pixmaps/spref_cone_Subtitles_64.png \ pixmaps/spref_cone_Video_64.png \ + pixmaps/stop_16px.png \ pixmaps/stop.png \ + pixmaps/tape_16px.png \ + pixmaps/type_directory.png \ + pixmaps/type_file.png \ + pixmaps/type_net.png \ + pixmaps/type_node.png \ + pixmaps/type_playlist.png \ + pixmaps/type_unknown.xpm \ pixmaps/volume-high.png \ pixmaps/volume-low.png \ - pixmaps/volume-muted.png \ - pixmaps/vlc_help_16px.png \ - pixmaps/vlc_stop_16px.png \ - pixmaps/vlc_play_16px.png \ - pixmaps/vlc_pause_16px.png \ - pixmaps/vlc_messages_16px.png \ - pixmaps/vlc_network_16px.png \ - pixmaps/vlc_stream_16px.png \ - pixmaps/vlc_quit_16px.png \ - pixmaps/vlc_disc_16px.png \ - pixmaps/vlc_network_16px.png \ - pixmaps/vlc_capture-card_16px.png \ - pixmaps/vlc_preferences_16px.png \ - pixmaps/vlc_settings_16px.png \ - pixmaps/vlc_playlist_16px.png \ - pixmaps/vlc_folder-grey_16px.png \ - pixmaps/vlc_folder-blue_16px.png \ - pixmaps/vlc_tape_16px.png \ - pixmaps/vlc_file-asym_16px.png \ - pixmaps/vlc_file-wide_16px.png \ - pixmaps/vlc_info_16px.png \ - pixmaps/vlc_previous_16px.png \ - pixmaps/vlc_next_16px.png \ - pixmaps/vlc_playlist_add.png \ - pixmaps/vlc_playlist_repeat_off.png \ - pixmaps/vlc_playlist_repeat_all.png \ - pixmaps/vlc_playlist_repeat_one.png \ - pixmaps/vlc_playlist_shuffle_on.png \ - pixmaps/vlc_playlist_shuffle_off.png + pixmaps/volume-muted.png