Qt4: simplify Makefile

configure.ac

@@ -3695,8 +3695,6 @@ AS_IF([test "${enable_qt}" != "no"], [
 ])
 AS_IF([test "${enable_qt}" != "no"], [
   VLC_ADD_PLUGIN([qt4])
-  VLC_ADD_LIBS([qt4],[${QT_LIBS}])
-  VLC_ADD_CXXFLAGS([qt4],[${QT_CFLAGS}])
   ALIASES="${ALIASES} qvlc"
 
   AC_LANG_PUSH([C++])
@@ -3711,8 +3709,6 @@ AS_IF([test "${enable_qt}" != "no"], [
 #endif
   ])], [
     AC_MSG_RESULT([yes])
-    VLC_ADD_LIBS([qt4],[${X_LIBS} ${X_PRE_LIBS} -lX11])
-    VLC_ADD_CXXFLAGS([qt4],[${X_CFLAGS}])
   ], [
     AC_MSG_RESULT([no])
   ])
@@ -3720,13 +3716,6 @@ AS_IF([test "${enable_qt}" != "no"], [
   VLC_RESTORE_FLAGS
   AC_LANG_POP([C++])
 
-  AS_IF([test "${SYS}" = "mingw32"], [
-      VLC_ADD_LIBS([qt4],[-lole32])
-  ])
-  AS_IF([test "${SYS}" = "darwin" ],[
-       VLC_ADD_LIBS([qt4], [-Wl,-framework,Cocoa])
-  ])
-
   QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)"
   AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
   AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])

modules/gui/qt4/Modules.am → modules/gui/qt4/Makefile.am

-# vim:syntax=automake
+basedir = gui
+
+include $(top_srcdir)/modules/common.am
+
 ## Howto
 # For each Q_OBJECT:
-#   - Add the .moc.cpp to BUILT_SOURCES and nodist_SOURCES_qt4
-#   - Add the .cpp to SOURCES_qt4
-#   - Add the .hpp to EXTRA_DIST
+#   - Add *.moc.cpp to nodist_..._SOURCES
+#   - Add *.cpp to ..._SOURCES
+#   - Add *.hpp to ..._SOURCES
 # For each UI
-#   - Add it to EXTRA_DIST
-#   - Add the .h to nodist_SOURCES_qt4
+#   - Add *.ui to ..._UI
+#   - Add *.h to nodist_..._SOURCES
 # For each ressource (icon, png, ...)
 #   - Add it to DEPS_res
 
 AUTOMAKE_OPTIONS = subdir-objects
-MOSTLYCLEANFILES = $(UIH)
 SUFFIXES = .ui .h .hpp .moc.cpp
 
-nodist_SOURCES_qt4 = \
+libqt4_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS)
+libqt4_plugin_la_LIBADD = $(AM_LIBADD) $(QT_LIBS)
+libqt4_plugin_la_LDFLAGS = $(AM_LDFLAGS)
+if HAVE_WIN32
+libqt4_plugin_la_LIBADD += -lole32
+else
+libqt4_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIB) -lX11
+endif
+if HAVE_DARWIN
+libqt4_plugin_la_LDFLAGS += -Wl,-framework,Cocoa
+endif
+
+libvlc_LTLIBRARIES =  $(LTLIBqt4)
+EXTRA_LTLIBRARIES = libqt4_plugin.la
+
+libqt4_plugin_la_SOURCES = \
+	qt4.cpp qt4.hpp \
+	menus.cpp menus.hpp \
+	main_interface.cpp main_interface.hpp \
+	dialogs_provider.cpp dialogs_provider.hpp \
+	input_manager.cpp input_manager.hpp \
+	actions_manager.cpp actions_manager.hpp \
+	extensions_manager.cpp extensions_manager.hpp \
+	recents.cpp recents.hpp \
+	adapters/seekpoints.cpp adapters/seekpoints.hpp \
+	adapters/chromaprint.cpp adapters/chromaprint.hpp \
+	adapters/variables.cpp adapters/variables.hpp \
+	dialogs/playlist.cpp dialogs/playlist.hpp \
+	dialogs/bookmarks.cpp dialogs/bookmarks.hpp \
+	dialogs/preferences.cpp dialogs/preferences.hpp \
+	dialogs/mediainfo.cpp dialogs/mediainfo.hpp \
+	dialogs/ml_configuration.cpp dialogs/ml_configuration.hpp \
+	dialogs/epg.cpp dialogs/epg.hpp \
+	dialogs/extended.cpp dialogs/extended.hpp \
+	dialogs/messages.cpp dialogs/messages.hpp \
+	dialogs/errors.cpp dialogs/errors.hpp \
+	dialogs/external.cpp dialogs/external.hpp \
+	dialogs/plugins.cpp dialogs/plugins.hpp \
+	dialogs/sout.cpp dialogs/sout.hpp \
+	dialogs/convert.cpp dialogs/convert.hpp \
+	dialogs/help.cpp dialogs/help.hpp \
+	dialogs/gototime.cpp dialogs/gototime.hpp \
+	dialogs/toolbar.cpp dialogs/toolbar.hpp \
+	dialogs/open.cpp dialogs/open.hpp \
+	dialogs/openurl.cpp dialogs/openurl.hpp \
+	dialogs/vlm.cpp dialogs/vlm.hpp \
+	dialogs/firstrun.cpp dialogs/firstrun.hpp \
+	dialogs/podcast_configuration.cpp dialogs/podcast_configuration.hpp \
+	dialogs/extensions.cpp dialogs/extensions.hpp \
+	dialogs/fingerprintdialog.cpp dialogs/fingerprintdialog.hpp \
+	components/extended_panels.cpp components/extended_panels.hpp \
+	components/info_panels.cpp components/info_panels.hpp \
+	components/info_widgets.cpp components/info_widgets.hpp \
+	components/preferences_widgets.cpp components/preferences_widgets.hpp \
+	components/complete_preferences.cpp \
+		components/complete_preferences.hpp \
+	components/simple_preferences.cpp components/simple_preferences.hpp \
+	components/open_panels.cpp components/open_panels.hpp \
+	components/interface_widgets.cpp components/interface_widgets.hpp \
+	components/controller.cpp components/controller.hpp \
+	components/controller_widget.cpp components/controller_widget.hpp \
+	components/epg/EPGChannels.cpp components/epg/EPGChannels.hpp \
+	components/epg/EPGItem.cpp components/epg/EPGItem.hpp \
+	components/epg/EPGRuler.cpp components/epg/EPGRuler.hpp \
+	components/epg/EPGView.cpp components/epg/EPGView.hpp \
+	components/epg/EPGWidget.cpp components/epg/EPGWidget.hpp \
+	components/playlist/views.cpp components/playlist/views.hpp \
+	components/playlist/ml_item.cpp components/playlist/ml_item.hpp \
+	components/playlist/ml_model.cpp components/playlist/ml_model.hpp \
+	components/playlist/vlc_model.cpp components/playlist/vlc_model.hpp \
+	components/playlist/playlist_model.cpp \
+		components/playlist/playlist_model.hpp \
+	components/playlist/playlist_item.cpp \
+		components/playlist/playlist_item.hpp \
+	components/playlist/standardpanel.cpp \
+		components/playlist/standardpanel.hpp \
+	components/playlist/playlist.cpp components/playlist/playlist.hpp \
+	components/playlist/selector.cpp components/playlist/selector.hpp \
+		components/playlist/sorting.h \
+	components/sout/profile_selector.cpp \
+		components/sout/profile_selector.hpp \
+	components/sout/sout_widgets.cpp components/sout/sout_widgets.hpp \
+		components/sout/profiles.hpp \
+	util/input_slider.cpp util/input_slider.hpp \
+	util/timetooltip.cpp util/timetooltip.hpp \
+	util/customwidgets.cpp util/customwidgets.hpp \
+	util/searchlineedit.cpp util/searchlineedit.hpp \
+	util/registry.cpp util/registry.hpp \
+	util/qmenuview.cpp util/qmenuview.hpp \
+	util/qt_dirs.cpp util/qt_dirs.hpp \
+	util/pictureflow.cpp util/pictureflow.hpp \
+	util/buttons/BrowseButton.cpp util/buttons/BrowseButton.hpp \
+	util/buttons/DeckButtonsLayout.cpp util/buttons/DeckButtonsLayout.hpp \
+	util/buttons/RoundButton.cpp util/buttons/RoundButton.hpp \
+		util/qvlcframe.hpp \
+		util/qvlcapp.hpp \
+		util/singleton.hpp \
+	styles/seekstyle.cpp styles/seekstyle.hpp
+if HAVE_WIN32
+libqt4_plugin_la_SOURCES += main_interface_win32.cpp
+endif
+
+# Meta-object compilation
+
+moc_verbose = $(moc_verbose_$(V))
+moc_verbose_ = $(moc_verbose__$(AM_DEFAULT_VERBOSITY))
+moc_verbose_0 = @echo "  MOC   " $@;
+moc_verbose__0 = $(moc_verbose_0)
+
+.hpp.moc.cpp:
+	$(moc_verbose)$(MOC) $(MOC_CPPFLAGS) -o $@ $<
+
+# These MOC files depend on the configure settings:
+dialogs_provider.moc.cpp dialogs/vlm.moc.cpp: $(top_builddir)/config.h
+
+nodist_libqt4_plugin_la_SOURCES = \
 	main_interface.moc.cpp \
 	menus.moc.cpp \
 	dialogs_provider.moc.cpp \
@@ -47,6 +164,7 @@ nodist_SOURCES_qt4 = \
 	dialogs/firstrun.moc.cpp \
 	dialogs/extensions.moc.cpp \
 	dialogs/fingerprintdialog.moc.cpp \
+	dialogs/ml_configuration.moc.cpp \
 	components/extended_panels.moc.cpp \
 	components/info_panels.moc.cpp \
 	components/info_widgets.moc.cpp \
@@ -67,6 +185,7 @@ nodist_SOURCES_qt4 = \
 	components/playlist/playlist.moc.cpp \
 	components/playlist/standardpanel.moc.cpp \
 	components/playlist/selector.moc.cpp \
+	components/playlist/ml_model.moc.cpp \
 	components/sout/profile_selector.moc.cpp \
 	components/sout/sout_widgets.moc.cpp \
 	util/input_slider.moc.cpp \
@@ -79,7 +198,9 @@ nodist_SOURCES_qt4 = \
 	util/buttons/RoundButton.moc.cpp \
 	util/buttons/DeckButtonsLayout.moc.cpp \
 	util/buttons/BrowseButton.moc.cpp \
-		resources.cpp \
+	styles/seekstyle.moc.cpp
+
+nodist_libqt4_plugin_la_SOURCES += \
 	ui/equalizer.h \
 	ui/video_effects.h \
 	ui/open_file.h \
@@ -100,11 +221,59 @@ nodist_SOURCES_qt4 = \
 	ui/about.h \
 	ui/update.h \
 	ui/fingerprintdialog.h \
-		styles/seekstyle.moc.cpp \
-		dialogs/ml_configuration.moc.cpp \
-		components/playlist/ml_model.moc.cpp \
 	ui/sout.h
 
+# User interface compilation
+
+uic_verbose = $(uic_verbose_$(V))
+uic_verbose_ = $(uic_verbose__$(AM_DEFAULT_VERBOSITY))
+uic_verbose_0 = @echo "  UIC   " $@;
+uic_verbose__0 = $(uic_verbose_0)
+
+MOC_CPPFLAGS = $(DEFS) \
+	-I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) \
+	$(libqt4_plugin_la_CPPFLAGS)
+if HAVE_DARWIN
+MOC_CPPFLAGS += -DQ_WS_MAC
+endif
+if HAVE_WIN32
+MOC_CPPFLAGS += -D_WIN32
+endif
+
+libqt4_plugin_la_UI = \
+	ui/equalizer.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/podcast_configuration.ui \
+	ui/profiles.ui \
+	ui/sprefs_audio.ui \
+	ui/sprefs_input.ui \
+	ui/sprefs_interface.ui \
+	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 \
+	ui/fingerprintdialog.ui
+EXTRA_DIST = $(libqt4_plugin_la_UI)
+
+.ui.h:
+	$(AM_V_at)mkdir -p -- 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)rm -f $@.tmp
+
+# Resources
+
 DEPS_res = \
 	pixmaps/arrow_down_dark.png \
 	pixmaps/clear.png \
@@ -238,222 +407,12 @@ DEPS_res = \
 	pixmaps/valid.png \
 	pixmaps/search_clear.png \
 	pixmaps/lock.png
+EXTRA_DIST += vlc.qrc $(DEPS_res)
 
-BUILT_SOURCES += $(nodist_SOURCES_qt4)
-
-moc_verbose = $(moc_verbose_$(V))
-moc_verbose_ = $(moc_verbose__$(AM_DEFAULT_VERBOSITY))
-moc_verbose_0 = @echo "  MOC   " $@;
-moc_verbose__0 = $(moc_verbose_0)
-
-uic_verbose = $(uic_verbose_$(V))
-uic_verbose_ = $(uic_verbose__$(AM_DEFAULT_VERBOSITY))
-uic_verbose_0 = @echo "  UIC   " $@;
-uic_verbose__0 = $(uic_verbose_0)
+nodist_libqt4_plugin_la_SOURCES += resources.cpp
 
 resources.cpp: vlc.qrc $(DEPS_res)
 	$(AM_V_GEN)$(RCC) -name vlc -o $@ $<
 
-.hpp.moc.cpp:
-if HAVE_DARWIN
-	$(moc_verbose)$(MOC) -DQ_WS_MAC $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) $(CPPFLAGS_qt4) -o $@ $<
-else
-if HAVE_WIN32
-	$(moc_verbose)$(MOC) -D_WIN32 $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) $(CPPFLAGS_qt4) -o $@ $<
-else
-	$(moc_verbose)$(MOC) $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) $(CPPFLAGS_qt4) -o $@ $<
-endif
-endif
-
-# These MOC files depend on the configure settings:
-dialogs_provider.moc.cpp dialogs/vlm.moc.cpp: $(top_builddir)/config.h
-
-.ui.h:
-	$(AM_V_at)mkdir -p -- 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)rm -f $@.tmp
-
-SOURCES_qt4 = 	qt4.cpp \
-		menus.cpp \
-		main_interface.cpp \
-		dialogs_provider.cpp \
-		input_manager.cpp \
-		actions_manager.cpp \
-		extensions_manager.cpp \
-		recents.cpp \
-		adapters/seekpoints.cpp \
-		adapters/chromaprint.cpp \
-		adapters/variables.cpp \
-		dialogs/playlist.cpp \
-		dialogs/bookmarks.cpp \
-		dialogs/preferences.cpp \
-		dialogs/mediainfo.cpp \
-		dialogs/ml_configuration.cpp \
-		dialogs/epg.cpp \
-		dialogs/extended.cpp \
-		dialogs/messages.cpp \
-		dialogs/errors.cpp \
-		dialogs/external.cpp \
-		dialogs/plugins.cpp \
-		dialogs/sout.cpp \
-		dialogs/convert.cpp \
-		dialogs/help.cpp \
-		dialogs/gototime.cpp \
-		dialogs/toolbar.cpp \
-		dialogs/open.cpp \
-		dialogs/openurl.cpp \
-		dialogs/vlm.cpp \
-		dialogs/firstrun.cpp \
-		dialogs/podcast_configuration.cpp \
-		dialogs/extensions.cpp \
-		dialogs/fingerprintdialog.cpp \
-		components/extended_panels.cpp \
-		components/info_panels.cpp \
-		components/info_widgets.cpp \
-		components/preferences_widgets.cpp \
-		components/complete_preferences.cpp \
-		components/simple_preferences.cpp \
-		components/open_panels.cpp \
-		components/interface_widgets.cpp \
-		components/controller.cpp \
-		components/controller_widget.cpp \
-		components/epg/EPGChannels.cpp \
-		components/epg/EPGItem.cpp \
-		components/epg/EPGRuler.cpp \
-		components/epg/EPGView.cpp \
-		components/epg/EPGWidget.cpp \
-		components/playlist/views.cpp \
-		components/playlist/ml_item.cpp \
-		components/playlist/ml_model.cpp \
-		components/playlist/vlc_model.cpp \
-		components/playlist/playlist_model.cpp \
-		components/playlist/playlist_item.cpp \
-		components/playlist/standardpanel.cpp \
-		components/playlist/playlist.cpp \
-		components/playlist/selector.cpp \
-		components/sout/profile_selector.cpp \
-		components/sout/sout_widgets.cpp \
-		util/input_slider.cpp \
- 		util/timetooltip.cpp \
-		util/customwidgets.cpp \
-		util/searchlineedit.cpp \
-		util/registry.cpp \
-		util/qmenuview.cpp \
-		util/qt_dirs.cpp \
-		util/pictureflow.cpp \
-		util/buttons/BrowseButton.cpp \
-		util/buttons/DeckButtonsLayout.cpp \
-		util/buttons/RoundButton.cpp \
-		styles/seekstyle.cpp
-
-if HAVE_WIN32
-SOURCES_qt4 += main_interface_win32.cpp
-endif
 
-noinst_HEADERS = \
-	qt4.hpp \
-	menus.hpp \
-	main_interface.hpp \
-	dialogs_provider.hpp \
-	input_manager.hpp \
-	actions_manager.hpp \
-	extensions_manager.hpp \
-	recents.hpp \
-	adapters/seekpoints.hpp \
-	adapters/chromaprint.hpp \
-	adapters/variables.hpp \
-	dialogs/playlist.hpp \
-	dialogs/bookmarks.hpp \
-	dialogs/mediainfo.hpp \
-	dialogs/ml_configuration.hpp \
-	dialogs/extended.hpp \
-	dialogs/messages.hpp \
-	dialogs/epg.hpp \
-	dialogs/errors.hpp \
-	dialogs/external.hpp \
-	dialogs/plugins.hpp \
-	dialogs/preferences.hpp \
-	dialogs/sout.hpp \
-	dialogs/convert.hpp \
-	dialogs/help.hpp \
-	dialogs/gototime.hpp \
-	dialogs/toolbar.hpp \
-	dialogs/open.hpp \
-	dialogs/openurl.hpp \
-	dialogs/vlm.hpp \
-	dialogs/firstrun.hpp \
-	dialogs/podcast_configuration.hpp \
-	dialogs/extensions.hpp \
-	dialogs/fingerprintdialog.hpp \
-	components/extended_panels.hpp \
-	components/info_panels.hpp \
-	components/info_widgets.hpp \
-	components/preferences_widgets.hpp \
-	components/complete_preferences.hpp \
-	components/simple_preferences.hpp \
-	components/open_panels.hpp \
-	components/interface_widgets.hpp \
-	components/controller.hpp \
-	components/controller_widget.hpp \
-	components/epg/EPGChannels.hpp \
-	components/epg/EPGItem.hpp \
-	components/epg/EPGRuler.hpp \
-	components/epg/EPGView.hpp \
-	components/epg/EPGWidget.hpp \
-	components/playlist/views.hpp \
-	components/playlist/ml_item.hpp \
-	components/playlist/ml_model.hpp \
-	components/playlist/vlc_model.hpp \
-	components/playlist/playlist_model.hpp \
-	components/playlist/playlist_item.hpp \
-	components/playlist/standardpanel.hpp \
-	components/playlist/playlist.hpp \
-	components/playlist/selector.hpp \
-	components/playlist/sorting.h \
-	components/sout/profile_selector.hpp \
-	components/sout/sout_widgets.hpp \
-	components/sout/profiles.hpp \
-	util/input_slider.hpp \
-	util/timetooltip.hpp \
-	util/customwidgets.hpp \
-	util/searchlineedit.hpp \
-	util/qvlcframe.hpp \
-	util/qvlcapp.hpp \
-	util/qmenuview.hpp \
-	util/qt_dirs.hpp \
-	util/registry.hpp \
-	util/pictureflow.hpp \
-	util/singleton.hpp \
-	util/buttons/RoundButton.hpp \
-	util/buttons/DeckButtonsLayout.hpp \
-	util/buttons/BrowseButton.hpp \
-	styles/seekstyle.hpp
-
-
-EXTRA_DIST += \
-	vlc.qrc \
-	ui/equalizer.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/podcast_configuration.ui \
-	ui/profiles.ui \
-	ui/sprefs_audio.ui \
-	ui/sprefs_input.ui \
-	ui/sprefs_interface.ui \
-	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 \
-	ui/fingerprintdialog.ui \
-	$(DEPS_res)
+BUILT_SOURCES += $(nodist_libqt4_plugin_la_SOURCES)