X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2FModules.am;h=90a0220e21fe0eafcda942cd72faff06074e1079;hb=9b14cc45a965d7d662e596993cc1951758b94f43;hp=95473c43b29e9180d789be2868b909f2efde4323;hpb=be0f7096d3b923c98e69c23851bbd56523d4228f;p=vlc

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 95473c43b2..90a0220e21 100644
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -1,66 +1,17 @@
-# vim:syntax=make
+# vim:syntax=automake
 ## Howto
 # For each Q_OBJECT:
-#   - Add it without extension to TOMOC
-#   - Add the moc.cpp to BUILT_SOURCES and nodist_SOURCES_qt4
-#   - Add the cpp to SOURCES_qt4
-#   - Add the hpp to EXTRA_DIST
+#   - Add the .moc.cpp to BUILT_SOURCES and nodist_SOURCES_qt4
+#   - Add the .cpp to SOURCES_qt4
+#   - Add the .hpp to EXTRA_DIST
 # For each UI
-#   - Add it without extension to TOUI
 #   - Add it to EXTRA_DIST
+#   - Add the .h to nodist_SOURCES_qt4
 
 AUTOMAKE_OPTIONS = subdir-objects
-
-TOUI = 	\
-	ui/equalizer \
-	ui/video_effects \
-	ui/open_file \
-	ui/open_disk \
-	ui/open_net \
-	ui/open_capture \
-	ui/open \
-	ui/main_interface \
-	ui/sprefs_audio \
-	ui/sprefs_input \
-	ui/sprefs_interface \
-	ui/sprefs_playlist \
-	ui/sprefs_subtitles \
-	ui/sprefs_video \
-	ui/sprefs_hotkeys \
-	ui/streampanel \
-	ui/sout
-
-
-UIH = $(TOUI:%=%.h)
-
-TOMOC = main_interface \
-	menus \
-	dialogs_provider \
-	input_manager \
-	playlist_model \
-	dialogs/playlist \
-	dialogs/prefs_dialog \
-	dialogs/messages \
-	dialogs/errors \
-	dialogs/mediainfo \
-	dialogs/extended \
-	dialogs/interaction \
-	dialogs/sout \
-	dialogs/help \
-	dialogs/gototime \
-	dialogs/open \
-	components/extended_panels \
-	components/infopanels \
-	components/preferences_widgets \
-	components/preferences \
-	components/simple_preferences \
-	components/open \
-	components/interface_widgets \
-	components/playlist/panels \
-	components/playlist/selector \
-	util/input_slider \
-	util/customwidgets
-MOCCPP = $(TOMOC:%=%.moc.cpp)
+MOSTLYCLEANFILES = $(UIH)
+CLEANFILES += dialogs/about.hpp
+SUFFIXES += .ui .h .hpp .moc.cpp
 
 nodist_SOURCES_qt4 = \
 		main_interface.moc.cpp \
@@ -73,16 +24,17 @@ nodist_SOURCES_qt4 = \
 		dialogs/extended.moc.cpp \
 		dialogs/messages.moc.cpp \
 		dialogs/errors.moc.cpp \
-		dialogs/prefs_dialog.moc.cpp \
+		dialogs/preferences.moc.cpp \
 		dialogs/interaction.moc.cpp \
 		dialogs/sout.moc.cpp \
 		dialogs/help.moc.cpp \
 		dialogs/gototime.moc.cpp \
 		dialogs/open.moc.cpp \
+		dialogs/podcast_configuration.moc.cpp \
 		components/extended_panels.moc.cpp \
 		components/infopanels.moc.cpp \
 	 	components/preferences_widgets.moc.cpp \
-	 	components/preferences.moc.cpp \
+	 	components/complete_preferences.moc.cpp \
 		components/simple_preferences.moc.cpp \
 		components/open.moc.cpp \
 		components/interface_widgets.moc.cpp \
@@ -90,27 +42,58 @@ nodist_SOURCES_qt4 = \
 		components/playlist/selector.moc.cpp \
 		util/input_slider.moc.cpp \
 		util/customwidgets.moc.cpp \
-		resources.cpp
+		resources.cpp \
+		ui/equalizer.h \
+		ui/spatializer.h \
+		ui/video_effects.h \
+		ui/open_file.h \
+		ui/open_disk.h \
+		ui/open_net.h \
+		ui/open_capture.h \
+		ui/open.h \
+		ui/podcast_configuration.h \
+		ui/sprefs_audio.h \
+		ui/sprefs_input.h \
+		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 += $(UIH) $(nodist_SOURCES_qt4)
+BUILT_SOURCES += $(nodist_SOURCES_qt4) dialogs/about.hpp
 endif
 
 resources.cpp: res.qrc
 	$(RCC) -name vlc -o $@ $<
 
-$(MOCCPP): %.moc.cpp: %.hpp
-	@echo "$(MOC) $< -> $@"
+.hpp.moc.cpp:
 	$(MOC) -o $@ $<
 
-$(UIH): %.h: %.ui
+.ui.h:
 	mkdir -p -- ui
-	@echo "$(UIC) $< -> $@"
-	rm -f $@
-	echo "#define Q_(a,b) QString::fromUtf8(_(a))" > $@
-	$(UIC) -tr "Q_" $< >> $@
-	sed -i -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@
+	rm -f $@ $@.tmp
+	echo "#define Q_(a,b) QString::fromUtf8(_(a))" > $@.tmp
+	$(UIC) -tr "Q_" $< >> $@.tmp
+	sed -i -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.tmp
+	mv -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 \
@@ -119,7 +102,7 @@ SOURCES_qt4 = 	qt4.cpp \
 		input_manager.cpp \
 		playlist_model.cpp \
 		dialogs/playlist.cpp \
-		dialogs/prefs_dialog.cpp \
+		dialogs/preferences.cpp \
 		dialogs/mediainfo.cpp \
 		dialogs/extended.cpp \
 		dialogs/messages.cpp \
@@ -129,42 +112,43 @@ SOURCES_qt4 = 	qt4.cpp \
 		dialogs/help.cpp \
 		dialogs/gototime.cpp \
 		dialogs/open.cpp \
+		dialogs/podcast_configuration.cpp \
 		components/extended_panels.cpp \
 		components/infopanels.cpp \
 		components/preferences_widgets.cpp \
-		components/preferences.cpp \
+		components/complete_preferences.cpp \
 		components/simple_preferences.cpp \
 		components/open.cpp \
 		components/interface_widgets.cpp \
 		components/playlist/standardpanel.cpp \
 		components/playlist/selector.cpp \
 		util/input_slider.cpp \
-		util/customwidgets.cpp \
-		$(NULL)
+		util/customwidgets.cpp
 
-EXTRA_DIST += \
+noinst_HEADERS = \
 	qt4.hpp \
 	menus.hpp \
 	main_interface.hpp \
 	dialogs_provider.hpp \
 	input_manager.hpp \
 	playlist_model.hpp \
-	res.qrc \
 	dialogs/playlist.hpp \
 	dialogs/mediainfo.hpp \
 	dialogs/extended.hpp \
 	dialogs/messages.hpp \
 	dialogs/errors.hpp \
-	dialogs/prefs_dialog.hpp \
+	dialogs/preferences.hpp \
 	dialogs/interaction.hpp \
 	dialogs/sout.hpp \
+        dialogs/about.hpp \
 	dialogs/help.hpp \
 	dialogs/gototime.hpp \
 	dialogs/open.hpp \
+	dialogs/podcast_configuration.hpp \
 	components/extended_panels.hpp \
 	components/infopanels.hpp \
 	components/preferences_widgets.hpp \
-	components/preferences.hpp \
+	components/complete_preferences.hpp \
 	components/simple_preferences.hpp \
 	components/open.hpp \
 	components/interface_widgets.hpp \
@@ -173,19 +157,22 @@ EXTRA_DIST += \
 	util/input_slider.hpp \
 	util/directslider.hpp \
 	util/customwidgets.hpp \
-	util/qvlcframe.hpp \
+	util/qvlcframe.hpp
+
+EXTRA_DIST += \
+	res.qrc \
 	ui/equalizer.ui \
+	ui/spatializer.ui \
 	ui/video_effects.ui \
 	ui/open_file.ui \
 	ui/open_disk.ui \
 	ui/open_net.ui \
 	ui/open_capture.ui \
 	ui/open.ui \
-	ui/main_interface.ui \
+	ui/podcast_configuration.ui \
 	ui/sprefs_audio.ui \
 	ui/sprefs_input.ui \
 	ui/sprefs_interface.ui \
-	ui/sprefs_playlist.ui \
 	ui/sprefs_hotkeys.ui \
 	ui/sprefs_subtitles.ui \
 	ui/sprefs_video.ui \
@@ -198,10 +185,47 @@ EXTRA_DIST += \
 	pixmaps/type_net.xpm \
 	pixmaps/type_playlist.xpm \
 	pixmaps/video.xpm \
-	pixmaps/hotkeys_50x50.xpm \
-	pixmaps/audio_50x50.xpm \
-	pixmaps/input_and_codecs_50x50.xpm \
-	pixmaps/interface_50x50.xpm \
-	pixmaps/playlist_50x50.xpm \
-	pixmaps/subtitles_50x50.xpm \
-	pixmaps/video_50x50.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/go-next.png \
+	pixmaps/next.png \
+	pixmaps/noart.png \
+	pixmaps/playlist_icon.png \
+	pixmaps/play.png \
+	pixmaps/previous.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.png \
+	pixmaps/volume-high.png \
+	pixmaps/volume-low.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