cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=0a7b6682493aab89d29a20324e6f76a33831ba5e
commit 0a7b6682493aab89d29a20324e6f76a33831ba5e Author: Cedric BAIL <[email protected]> Date: Thu Jun 2 10:43:29 2016 -0700 emotion: properly fix build of vlc generic player. --- configure.ac | 4 +--- src/Makefile_Emotion.am | 8 ++++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index e348bc8..a1d1f88 100644 --- a/configure.ac +++ b/configure.ac @@ -4996,9 +4996,7 @@ fi ### Check availability ## Generic player -EFL_DEPEND_PKG([GENERIC_VLC], [VLC], [libvlc >= 2.0]) -EFL_INTERNAL_DEPEND_PKG([GENERIC_VLC], [eina]) -EFL_INTERNAL_DEPEND_PKG([GENERIC_VLC], [ecore]) +EMOTION_GENERIC_PLAYER([GENERIC_VLC], [VLC], [libvlc >= 2.0]) EFL_ADD_FEATURE([EMOTION], [generic_vlc], [${with_generic_vlc}]) EFL_LIB_END([Emotion]) diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am index 8e6a443..a4746c7 100644 --- a/src/Makefile_Emotion.am +++ b/src/Makefile_Emotion.am @@ -365,6 +365,10 @@ if HAVE_GENERIC_VLC emotiongenericplayers_PROGRAMS += generic/emotion/vlc/vlc generic_emotion_vlc_vlc_SOURCES = generic/emotion/vlc/emotion_generic_vlc.c generic_emotion_vlc_vlc_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/efl \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/modules/emotion/generic \ -I$(top_builddir)/src/lib/efl \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ @@ -373,6 +377,6 @@ generic_emotion_vlc_vlc_CPPFLAGS = \ -DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \ -DEMOTION_GENERIC_PLAYERS_DIR=\"$(libdir)/emotion/generic_players/$(MODULE_ARCH)\" \ @GENERIC_VLC_CFLAGS@ -generic_emotion_vlc_vlc_LDADD = @GENERIC_VLC_LIBS@ - +generic_emotion_vlc_vlc_LDADD = @GENERIC_VLC_LIBS@ @USE_EINA_LIBS@ @USE_ECORE_LIBS@ +generic_emotion_vlc_vlc_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_ECORE_INTERNAL_LIBS@ endif --
