[vlc-devel] [PATCH] qt: Simplify custom uic handling

[Marvin Scholz]

---
 modules/gui/qt/Makefile.am | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 1503a93000..dc28362f22 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -305,29 +305,6 @@ if HAVE_WIN32
 nodist_libqt_plugin_la_SOURCES += gui/qt/main_interface_win32.moc.cpp
 endif
 
-nodist_libqt_plugin_la_SOURCES += \
-	gui/qt/ui/equalizer.h \
-	gui/qt/ui/video_effects.h \
-	gui/qt/ui/open_file.h \
-	gui/qt/ui/open_disk.h \
-	gui/qt/ui/open_net.h \
-	gui/qt/ui/open_capture.h \
-	gui/qt/ui/open.h \
-	gui/qt/ui/vlm.h \
-	gui/qt/ui/podcast_configuration.h \
-	gui/qt/ui/profiles.h \
-	gui/qt/ui/sprefs_audio.h \
-	gui/qt/ui/sprefs_input.h \
-	gui/qt/ui/sprefs_interface.h \
-	gui/qt/ui/sprefs_subtitles.h \
-	gui/qt/ui/sprefs_video.h \
-	gui/qt/ui/streampanel.h \
-	gui/qt/ui/messages_panel.h \
-	gui/qt/ui/about.h \
-	gui/qt/ui/update.h \
-	gui/qt/ui/fingerprintdialog.h \
-	gui/qt/ui/sout.h
-
 # User interface compilation
 
 uic_verbose = $(uic_verbose_$(V))
@@ -367,14 +344,15 @@ libqt_plugin_la_UI = \
 	gui/qt/ui/sout.ui \
 	gui/qt/ui/vlm.ui \
 	gui/qt/ui/fingerprintdialog.ui
-EXTRA_DIST += $(libqt_plugin_la_UI)
+
+libqt_plugin_la_SOURCES += $(libqt_plugin_la_UI)
 
 .ui.h:
 	$(AM_V_at)mkdir -p -- gui/qt/ui
 	$(AM_V_at)rm -f $@ $@.tmp
 	$(AM_V_at)echo "#define Q_(a,b) QString::fromUtf8(_(a))" > $@.tmp
 	$(uic_verbose)$(UIC) -tr "Q_" $< >> $@.tmp
-	$(AM_V_at)sed -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.tmp >$@
+	$(AM_V_at)sed -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.tmp > $@
 	$(AM_V_at)rm -f $@.tmp
 
 # Resources
@@ -640,6 +618,7 @@ vlc_qt_check_LDADD = $(QT_LIBS)
 if ENABLE_QT
 gui_LTLIBRARIES += libqt_plugin.la
 BUILT_SOURCES += $(nodist_libqt_plugin_la_SOURCES)
+BUILT_SOURCES += $(libqt_plugin_la_UI:.ui=.h)
 if !HAVE_WIN32
 if !HAVE_OS2
 pkglibexec_PROGRAMS += vlc-qt-check
-- 
2.20.1 (Apple Git-117)