Commit 92185f0b authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

visualization: remove Makefile recursion

parent 8e0cc7ed
......@@ -699,7 +699,7 @@ AC_CHECK_FUNC(getopt_long,, [
AC_SUBST(GNUGETOPT_LIBS)
AC_CHECK_LIB(m,cos,[
VLC_ADD_LIBS([x264 goom swscale mpc qt4 x262 x26410b glspectrum smooth],[-lm])
VLC_ADD_LIBS([x264 swscale mpc qt4 x262 x26410b glspectrum smooth],[-lm])
LIBM="-lm"
], [
LIBM=""
......@@ -3868,8 +3868,6 @@ AS_IF([test "${enable_vsxu}" != "no"],
PKG_CHECK_MODULES(VSXU, libvsxu,
[
VLC_ADD_PLUGIN([vsxu])
VLC_ADD_CXXFLAGS([vsxu],[$VSXU_CFLAGS])
VLC_ADD_LIBS([vsxu],[$VSXU_LIBS])
],[
AC_MSG_WARN([${VSXU_PKG_ERRORS}.])
])
......@@ -3887,17 +3885,6 @@ AS_IF([test "${enable_atmo}" != no], [
])
])
dnl
dnl glSpectrum
dnl
AC_ARG_ENABLE(glspectrum,
[ --enable-glspectrum 3D OpenGL spectrum visualization (default auto)])
if test "${enable_glspectrum}" != "no" && test "${have_gl}" = "yes"
then
VLC_ADD_PLUGIN([glspectrum])
VLC_ADD_LIBS([glspectrum],[$GL_LIBS])
fi
EXTEND_HELP_STRING([Service Discovery plugins:])
dnl
dnl Bonjour services discovery
......@@ -4138,7 +4125,6 @@ AC_CONFIG_FILES([
modules/gui/qt4/Makefile
modules/gui/skins2/Makefile
modules/stream_out/Makefile
modules/visualization/Makefile
modules/hw/mmal/Makefile
])
......
......@@ -3,15 +3,13 @@ noinst_HEADERS =
check_PROGRAMS =
EXTRA_DIST =
BASE_SUBDIRS = \
visualization
EXTRA_SUBDIRS = \
access_output \
stream_out \
hw/mmal
SUBDIRS = . $(BASE_SUBDIRS)
DIST_SUBDIRS = . $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
SUBDIRS = .
DIST_SUBDIRS = . $(EXTRA_SUBDIRS)
if ENABLE_SOUT
SUBDIRS += access_output stream_out
endif
......@@ -50,6 +48,7 @@ include video_chroma/Makefile.am
include video_filter/Makefile.am
include video_splitter/Makefile.am
include video_output/Makefile.am
include visualization/Makefile.am
if ENABLE_SOUT
include mux/Makefile.am
endif
......
visudir = $(pluginsdir)/visualization
visu_LTLIBRARIES =
libglspectrum_plugin_la_SOURCES = \
visualization/glspectrum.c \
visualization/visual/fft.c visualization/visual/fft.h \
visualization/visual/window.c visualization/visual/window.h \
visualization/visual/window_presets.h
libglspectrum_plugin_la_LIBADD = $(GL_LIBS) $(LIBM)
if HAVE_GL
visu_LTLIBRARIES += libglspectrum_plugin.la
endif
libgoom_plugin_la_SOURCES = visualization/goom.c
libgoom_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(GOOM_CFLAGS)
libgoom_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(visudir)'
libgoom_plugin_la_LIBADD = $(GOOM_LIBS) $(LIBM)
EXTRA_LTLIBRARIES += libgoom_plugin.la
visu_LTLIBRARIES += $(LTLIBgoom)
libprojectm_plugin_la_SOURCES = visualization/projectm.cpp
libprojectm_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(PROJECTM_CFLAGS)
libprojectm_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(visudir)'
libprojectm_plugin_la_LIBADD = $(PROJECTM_LIBS) $(LIBPTHREAD)
EXTRA_LTLIBRARIES += libprojectm_plugin.la
visu_LTLIBRARIES += $(LTLIBprojectm)
libvisual_plugin_la_SOURCES = \
visualization/visual/visual.c visualization/visual/visual.h \
visualization/visual/effects.c \
visualization/visual/fft.c visualization/visual/fft.h \
visualization/visual/window.c visualization/visual/window.h \
visualization/visual/window_presets.h
libvisual_plugin_la_LIBADD = $(LIBM)
visu_LTLIBRARIES += libvisual_plugin.la
libvsxu_plugin_la_SOURCES = visualization/vsxu.cpp visualization/cyclic_buffer.h
libvsxu_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(VSXU_CFLAGS)
libvsxu_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(visudir)'
libvsxu_plugin_la_LIBADD = $(VSXU_LIBS) $(LIBM)
EXTRA_LTLIBRARIES += libvsxu_plugin.la
visu_LTLIBRARIES += $(LTLIBvsxu)
SOURCES_goom = goom.c
libprojectm_plugin_la_SOURCES = projectm.cpp
libprojectm_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(PROJECTM_CFLAGS)
libprojectm_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(visualizationdir)'
libprojectm_plugin_la_LIBADD = $(PROJECTM_LIBS) $(LIBPTHREAD)
EXTRA_LTLIBRARIES += libprojectm_plugin.la
visualization_LTLIBRARIES += $(LTLIBprojectm)
libvisual_plugin_la_SOURCES = \
visual/visual.c visual/visual.h \
visual/effects.c \
visual/fft.c visual/fft.h \
visual/window.c visual/window.h visual/window_presets.h
libvisual_plugin_la_LIBADD = $(LIBM)
visualization_LTLIBRARIES += libvisual_plugin.la
SOURCES_vsxu = vsxu.cpp cyclic_buffer.h
SOURCES_glspectrum = glspectrum.c visual/fft.c visual/fft.h \
visual/window.c visual/window.h visual/window_presets.h
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment