videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-09-16 16:02:54 +02:00
Code Releases Activity

qt: do not build sources if Qt is disabled/absent

Browse Source
This commit is contained in:
Rémi Denis-Courmont 2017-05-14 22:58:17 +03:00
parent 46f8b2a469
commit c50926d771
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -3718,7 +3718,6 @@ AS_IF([test "${enable_qt}" != "no"], [
])
])
AS_IF([test "${enable_qt}" != "no"], [
VLC_ADD_PLUGIN([qt])
ALIASES="${ALIASES} qvlc"
])
AC_SUBST(QT_VERSION)

6
modules/gui/qt/Makefile.am
View File

@ -39,9 +39,6 @@ if UPDATE_CHECK
libqt_plugin_la_CPPFLAGS += -DUPDATE_CHECK
endif
gui_LTLIBRARIES += $(LTLIBqt)
EXTRA_LTLIBRARIES += libqt_plugin.la
libqt_plugin_la_SOURCES = \
gui/qt/qt.cpp gui/qt/qt.hpp \
gui/qt/menus.cpp gui/qt/menus.hpp \
@ -449,4 +446,7 @@ nodist_libqt_plugin_la_SOURCES += gui/qt/resources.cpp
gui/qt/resources.cpp: gui/qt/vlc.qrc $(libqt_plugin_la_RES)
$(AM_V_GEN)$(RCC) -name vlc -o $@ $<
if ENABLE_QT
gui_LTLIBRARIES += libqt_plugin.la
BUILT_SOURCES += $(nodist_libqt_plugin_la_SOURCES)
endif