diff options
| author | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2011-09-04 00:07:41 +0000 |
|---|---|---|
| committer | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2011-09-04 00:07:41 +0000 |
| commit | 7ed3fcc96b500d8b7ae23308cb74579512415142 (patch) | |
| tree | 5bf1e3d7b6dfee3368a6ceacb0f43b660716e621 /src | |
| parent | e2864f2a30651e2dd4a3bfa1983ec5b8dee263db (diff) | |
| download | emotion_generic_players-7ed3fcc96b500d8b7ae23308cb74579512415142.tar.gz | |
remove old vlc, fix build bugs and introduce m4 for generic players.
Previous commit to disable VLC messed everything, so this one fixes it doing:
- remove old src/modules/vlc and related.
- add EMOTION_CHECK_GENERIC_PLAYER() m4 macro
- change previous EMOTION_BUILD_VLC to EMOTION_BUILD_GENERIC_VLC
SVN revision: 63140
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/vlc/Makefile.am | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 7d1f5d8..bbdd8c3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,6 +3,6 @@ MAINTAINERCLEANFILES = Makefile.in SUBDIRS = -#if EMOTION_BUILD_VLC -#SUBDIRS += vlc -#endif +if EMOTION_BUILD_GENERIC_VLC +SUBDIRS += vlc +endif diff --git a/src/vlc/Makefile.am b/src/vlc/Makefile.am index c32906e..6d6a9f2 100644 --- a/src/vlc/Makefile.am +++ b/src/vlc/Makefile.am @@ -8,11 +8,11 @@ AM_CPPFLAGS = \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ -@VLC_CFLAGS@ +@GENERIC_VLC_CFLAGS@ internal_bindir = $(libdir)/emotion/utils internal_bin_PROGRAMS = em_generic_vlc em_generic_vlc_SOURCES = emotion_generic_vlc.c em_generic_vlc_DEPENDENCIES = $(top_srcdir)/src/modules/generic/Emotion_Generic_Plugin.h -em_generic_vlc_LDADD = @VLC_LIBS@ +em_generic_vlc_LDADD = @GENERIC_VLC_LIBS@ |