]> git.sesse.net Git - vlc/commitdiff
video_filter: clean up and sort build rules
authorRémi Denis-Courmont <remi@remlab.net>
Tue, 10 Feb 2015 16:45:18 +0000 (18:45 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Tue, 10 Feb 2015 21:25:48 +0000 (23:25 +0200)
configure.ac
modules/video_filter/Modules.am

index 3edee2b9ed4102a1aa78e5ed44b128d55edd5680..9292df7af8756790630d4c3d293ed25f4348f284 100644 (file)
@@ -699,7 +699,7 @@ AC_CHECK_FUNC(getopt_long,, [
 AC_SUBST(GNUGETOPT_LIBS)
 
 AC_CHECK_LIB(m,cos,[
-  VLC_ADD_LIBS([adjust wave ripple psychedelic gradient x264 goom noise grain scene swscale postproc mpc qt4 audiobargraph_v colorthres extract ball mosaic gaussianblur x262 x26410b hqdn3d anaglyph ncurses oldmovie glspectrum smooth],[-lm])
+  VLC_ADD_LIBS([x264 goom noise swscale mpc qt4 x262 x26410b ncurses glspectrum smooth],[-lm])
   LIBM="-lm"
 ], [
   LIBM=""
@@ -2523,8 +2523,6 @@ then
       CFLAGS="${CFLAGS} ${POSTPROC_CFLAGS}"
       AC_CHECK_HEADERS(postproc/postprocess.h)
       VLC_ADD_PLUGIN([postproc])
-      VLC_ADD_LIBS([postproc],[$POSTPROC_LIBS $AVUTIL_LIBS])
-      VLC_ADD_CFLAGS([postproc],[$POSTPROC_CFLAGS $AVUTIL_CFLAGS])
       VLC_RESTORE_FLAGS
     ],[
       AC_MSG_WARN([${POSTPROC_PKG_ERRORS}.])
index c93a33d3a0c9c9333022db811a006b72ae6333da..1e6646d00e0c78326bd1780c14ef8db591d33f74 100644 (file)
@@ -1,54 +1,43 @@
-SOURCES_mosaic = mosaic.c mosaic.h
-SOURCES_transform = transform.c
-SOURCES_invert = invert.c
-SOURCES_mirror = mirror.c
-SOURCES_adjust = adjust.c adjust_sat_hue.c adjust_sat_hue.h
-SOURCES_motionblur = motionblur.c
-SOURCES_logo = logo.c
-SOURCES_audiobargraph_v = audiobargraph_v.c
-SOURCES_blend = blend.cpp
-SOURCES_scale = scale.c
-SOURCES_marq = marq.c
-SOURCES_rss = rss.c
-SOURCES_fps = fps.c
-SOURCES_motiondetect = motiondetect.c
-
-libdeinterlace_plugin_la_SOURCES = \
-       deinterlace/deinterlace.c deinterlace/deinterlace.h \
-       deinterlace/mmx.h deinterlace/common.h \
-       deinterlace/merge.c deinterlace/merge.h \
-       deinterlace/helpers.c deinterlace/helpers.h \
-       deinterlace/algo_basic.c deinterlace/algo_basic.h \
-       deinterlace/algo_x.c deinterlace/algo_x.h \
-       deinterlace/algo_yadif.c deinterlace/algo_yadif.h \
-       deinterlace/yadif.h deinterlace/yadif_template.h \
-       deinterlace/algo_phosphor.c deinterlace/algo_phosphor.h \
-       deinterlace/algo_ivtc.c deinterlace/algo_ivtc.h
-# inline ASM doesn't build with -O0
-libdeinterlace_plugin_la_CFLAGS = $(AM_CFLAGS) -O2
-if HAVE_NEON
-libdeinterlace_plugin_la_SOURCES += deinterlace/merge_arm.S
-libdeinterlace_plugin_la_CFLAGS += -DCAN_COMPILE_ARM
-endif
-video_filter_LTLIBRARIES += libdeinterlace_plugin.la
-
-libdynamicoverlay_plugin_la_SOURCES = \
-       dynamicoverlay/dynamicoverlay_buffer.c \
-       dynamicoverlay/dynamicoverlay_queue.c \
-       dynamicoverlay/dynamicoverlay_list.c \
-       dynamicoverlay/dynamicoverlay_commands.c \
-       dynamicoverlay/dynamicoverlay.c dynamicoverlay/dynamicoverlay.h
-if !HAVE_WIN32
-video_filter_LTLIBRARIES += libdynamicoverlay_plugin.la
-endif
-
-libremoteosd_plugin_la_SOURCES = remoteosd.c remoteosd_rfbproto.h
-libremoteosd_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS)
-libremoteosd_plugin_la_LIBADD = $(GCRYPT_LIBS) $(LIBS_remoteosd) $(LIBPTHREAD)
-if HAVE_GCRYPT
-video_filter_LTLIBRARIES += libremoteosd_plugin.la
-endif
+noinst_HEADERS = filter_picture.h
 
+# video filters
+libadjust_plugin_la_SOURCES = adjust.c adjust_sat_hue.c adjust_sat_hue.h
+libadjust_plugin_la_LIBADD = $(LIBM)
+libalphamask_plugin_la_SOURCES = alphamask.c
+libanaglyph_plugin_la_SOURCES = anaglyph.c
+libantiflicker_plugin_la_SOURCES = antiflicker.c
+libball_plugin_la_SOURCES = ball.c
+libball_plugin_la_LIBADD = $(LIBM)
+libblendbench_plugin_la_SOURCES = blendbench.c
+libbluescreen_plugin_la_SOURCES = bluescreen.c
+libcanvas_plugin_la_SOURCES = canvas.c
+libcolorthres_plugin_la_SOURCES = colorthres.c
+libcolorthres_plugin_la_LIBADD = $(LIBM)
+libcroppadd_plugin_la_SOURCES = croppadd.c
+liberase_plugin_la_SOURCES = erase.c
+libextract_plugin_la_SOURCES = extract.c
+libextract_plugin_la_LIBADD = $(LIBM)
+libfps_plugin_la_SOURCES = fps.c
+libfreeze_plugin_la_SOURCES = freeze.c
+libgaussianblur_plugin_la_SOURCES = gaussianblur.c
+libgaussianblur_plugin_la_LIBADD = $(LIBM)
+libgradfun_plugin_la_SOURCES = gradfun.c gradfun.h
+libgradient_plugin_la_SOURCES = gradient.c
+libgradient_plugin_la_LIBADD = $(LIBM)
+libgrain_plugin_la_SOURCES = grain.c
+libgrain_plugin_la_LIBADD = $(LIBM)
+libhqdn3d_plugin_la_SOURCES = hqdn3d.c hqdn3d.h
+libhqdn3d_plugin_la_LIBADD = $(LIBM)
+libinvert_plugin_la_SOURCES = invert.c
+libmagnify_plugin_la_SOURCES = magnify.c
+libmirror_plugin_la_SOURCES = mirror.c
+libmotionblur_plugin_la_SOURCES = motionblur.c
+libmotiondetect_plugin_la_SOURCES = motiondetect.c
+liboldmovie_plugin_la_SOURCES = oldmovie.c
+liboldmovie_plugin_la_LIBADD = $(LIBM)
+libposterize_plugin_la_SOURCES = posterize.c
+libpsychedelic_plugin_la_SOURCES = psychedelic.c
+libpsychedelic_plugin_la_LIBADD = $(LIBM)
 libpuzzle_plugin_la_SOURCES = \
        puzzle.c puzzle.h \
        puzzle_bezier.c puzzle_bezier.h \
@@ -56,78 +45,29 @@ libpuzzle_plugin_la_SOURCES = \
        puzzle_mgt.c puzzle_mgt.h \
        puzzle_pce.c puzzle_pce.h
 libpuzzle_plugin_la_LIBADD = $(LIBM)
-video_filter_LTLIBRARIES += libpuzzle_plugin.la
-
-SOURCES_magnify = magnify.c
-SOURCES_wave = wave.c
-SOURCES_ripple = ripple.c
-SOURCES_posterize = posterize.c
-SOURCES_psychedelic = psychedelic.c
-SOURCES_gradient = gradient.c
-SOURCES_ball = ball.c
-SOURCES_opencv_wrapper = opencv_wrapper.c
-SOURCES_opencv_example = opencv_example.cpp filter_event_info.h
-
+libripple_plugin_la_SOURCES = ripple.c
+libripple_plugin_la_LIBADD = $(LIBM)
 librotate_plugin_la_SOURCES = rotate.c
 librotate_plugin_la_LIBADD = ../libvlc_motion.la $(LIBM)
 librotate_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)'
 if HAVE_DARWIN
 librotate_plugin_la_LDFLAGS += -Wl,-framework,IOKit,-framework,CoreFoundation
 endif
-video_filter_LTLIBRARIES += librotate_plugin.la
-
-SOURCES_colorthres = colorthres.c
-SOURCES_extract = extract.c
-SOURCES_sharpen = sharpen.c
-SOURCES_erase = erase.c
-SOURCES_bluescreen = bluescreen.c
-SOURCES_alphamask = alphamask.c
-SOURCES_gaussianblur = gaussianblur.c
-SOURCES_grain = grain.c
-SOURCES_croppadd = croppadd.c
-SOURCES_canvas = canvas.c
-SOURCES_blendbench = blendbench.c
-SOURCES_postproc = postproc.c
-SOURCES_scene = scene.c
-SOURCES_sepia = sepia.c
-SOURCES_yuvp = yuvp.c
-SOURCES_antiflicker = antiflicker.c
-SOURCES_atmo = atmo/atmo.cpp \
-       atmo/AtmoDefs.h \
-       atmo/AtmoCalculations.cpp atmo/AtmoCalculations.h \
-       atmo/AtmoConfig.cpp atmo/AtmoConfig.h \
-       atmo/AtmoConnection.cpp atmo/AtmoConnection.h \
-       atmo/AtmoDynData.cpp atmo/AtmoDynData.h \
-       atmo/AtmoExternalCaptureInput.cpp atmo/AtmoExternalCaptureInput.h \
-       atmo/AtmoInput.cpp atmo/AtmoInput.h \
-       atmo/AtmoLiveView.cpp atmo/AtmoLiveView.h \
-       atmo/AtmoOutputFilter.cpp atmo/AtmoOutputFilter.h \
-       atmo/AtmoThread.cpp atmo/AtmoThread.h \
-       atmo/AtmoTools.cpp atmo/AtmoTools.h \
-       atmo/AtmoZoneDefinition.cpp atmo/AtmoZoneDefinition.h \
-       atmo/AtmoChannelAssignment.cpp atmo/AtmoChannelAssignment.h \
-       atmo/AtmoClassicConnection.cpp atmo/AtmoClassicConnection.h \
-       atmo/AtmoDmxSerialConnection.cpp atmo/AtmoDmxSerialConnection.h \
-       atmo/DmxTools.cpp atmo/DmxTools.h \
-       atmo/AtmoMultiConnection.cpp atmo/AtmoMultiConnection.h \
-       atmo/MoMoConnection.cpp atmo/MoMoConnection.h \
-       atmo/FnordlichtConnection.cpp atmo/FnordlichtConnection.h \
-       atmo/AtmoPacketQueue.cpp atmo/AtmoPacketQueue.h
-SOURCES_gradfun = gradfun.c gradfun.h
-SOURCES_subsdelay = subsdelay.c
-SOURCES_hqdn3d = hqdn3d.c hqdn3d.h
-SOURCES_anaglyph = anaglyph.c
-SOURCES_oldmovie = oldmovie.c
-SOURCES_vhs = vhs.c
-SOURCES_freeze = freeze.c
-noinst_HEADERS = filter_picture.h
+libscale_plugin_la_SOURCES = scale.c
+libscene_plugin_la_SOURCES = scene.c
+libscene_plugin_la_LIBADD = $(LIBM)
+libsepia_plugin_la_SOURCES = sepia.c
+libsharpen_plugin_la_SOURCES = sharpen.c
+libtransform_plugin_la_SOURCES = transform.c
+libvhs_plugin_la_SOURCES = vhs.c
+libwave_plugin_la_SOURCES = wave.c
+libwave_plugin_la_LIBADD = $(LIBM)
+libyuvp_plugin_la_SOURCES = yuvp.c
 
 video_filter_LTLIBRARIES += \
        libadjust_plugin.la \
        libalphamask_plugin.la \
-       libaudiobargraph_v_plugin.la \
        libball_plugin.la \
-       libblend_plugin.la \
        libblendbench_plugin.la \
        libbluescreen_plugin.la \
        libcanvas_plugin.la \
@@ -139,22 +79,17 @@ video_filter_LTLIBRARIES += \
        libgrain_plugin.la \
        libgaussianblur_plugin.la \
        libinvert_plugin.la \
-       liblogo_plugin.la \
        libmagnify_plugin.la \
-       libmarq_plugin.la \
        libmirror_plugin.la \
-       libmosaic_plugin.la \
        libmotionblur_plugin.la \
        libmotiondetect_plugin.la \
        libposterize_plugin.la \
        libpsychedelic_plugin.la \
        libripple_plugin.la \
-       librss_plugin.la \
        libscale_plugin.la \
        libscene_plugin.la \
        libsepia_plugin.la \
        libsharpen_plugin.la \
-       libsubsdelay_plugin.la \
        libtransform_plugin.la \
        libwave_plugin.la \
        libgradfun_plugin.la \
@@ -165,5 +100,112 @@ video_filter_LTLIBRARIES += \
        liboldmovie_plugin.la \
        libvhs_plugin.la \
        libfps_plugin.la \
-       libfreeze_plugin.la
+       libfreeze_plugin.la \
+       libpuzzle_plugin.la \
+       librotate_plugin.la
+
+libatmo_plugin_la_SOURCES = atmo/atmo.cpp \
+       atmo/AtmoDefs.h \
+       atmo/AtmoCalculations.cpp atmo/AtmoCalculations.h \
+       atmo/AtmoConfig.cpp atmo/AtmoConfig.h \
+       atmo/AtmoConnection.cpp atmo/AtmoConnection.h \
+       atmo/AtmoDynData.cpp atmo/AtmoDynData.h \
+       atmo/AtmoExternalCaptureInput.cpp atmo/AtmoExternalCaptureInput.h \
+       atmo/AtmoInput.cpp atmo/AtmoInput.h \
+       atmo/AtmoLiveView.cpp atmo/AtmoLiveView.h \
+       atmo/AtmoOutputFilter.cpp atmo/AtmoOutputFilter.h \
+       atmo/AtmoThread.cpp atmo/AtmoThread.h \
+       atmo/AtmoTools.cpp atmo/AtmoTools.h \
+       atmo/AtmoZoneDefinition.cpp atmo/AtmoZoneDefinition.h \
+       atmo/AtmoChannelAssignment.cpp atmo/AtmoChannelAssignment.h \
+       atmo/AtmoClassicConnection.cpp atmo/AtmoClassicConnection.h \
+       atmo/AtmoDmxSerialConnection.cpp atmo/AtmoDmxSerialConnection.h \
+       atmo/DmxTools.cpp atmo/DmxTools.h \
+       atmo/AtmoMultiConnection.cpp atmo/AtmoMultiConnection.h \
+       atmo/MoMoConnection.cpp atmo/MoMoConnection.h \
+       atmo/FnordlichtConnection.cpp atmo/FnordlichtConnection.h \
+       atmo/AtmoPacketQueue.cpp atmo/AtmoPacketQueue.h
+libatmo_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)'
+video_filter_LTLIBRARIES += $(LTLIBatmo)
+EXTRA_LTLIBRARIES += libatmo_plugin.la
+
+libdeinterlace_plugin_la_SOURCES = \
+       deinterlace/deinterlace.c deinterlace/deinterlace.h \
+       deinterlace/mmx.h deinterlace/common.h \
+       deinterlace/merge.c deinterlace/merge.h \
+       deinterlace/helpers.c deinterlace/helpers.h \
+       deinterlace/algo_basic.c deinterlace/algo_basic.h \
+       deinterlace/algo_x.c deinterlace/algo_x.h \
+       deinterlace/algo_yadif.c deinterlace/algo_yadif.h \
+       deinterlace/yadif.h deinterlace/yadif_template.h \
+       deinterlace/algo_phosphor.c deinterlace/algo_phosphor.h \
+       deinterlace/algo_ivtc.c deinterlace/algo_ivtc.h
+# inline ASM doesn't build with -O0
+libdeinterlace_plugin_la_CFLAGS = $(AM_CFLAGS) -O2
+if HAVE_NEON
+libdeinterlace_plugin_la_SOURCES += deinterlace/merge_arm.S
+libdeinterlace_plugin_la_CFLAGS += -DCAN_COMPILE_ARM
+endif
+video_filter_LTLIBRARIES += libdeinterlace_plugin.la
+
+libdynamicoverlay_plugin_la_SOURCES = \
+       dynamicoverlay/dynamicoverlay_buffer.c \
+       dynamicoverlay/dynamicoverlay_queue.c \
+       dynamicoverlay/dynamicoverlay_list.c \
+       dynamicoverlay/dynamicoverlay_commands.c \
+       dynamicoverlay/dynamicoverlay.c dynamicoverlay/dynamicoverlay.h
+if !HAVE_WIN32
+video_filter_LTLIBRARIES += libdynamicoverlay_plugin.la
+endif
+
+libopencv_wrapper_plugin_la_SOURCES = opencv_wrapper.c
+libopencv_wrapper_plugin_la_CPPAGS = $(AM_CPPFLAGS) $(OPENCV_CFLAGS)
+libopencv_wrapper_plugin_la_LIBADD = $(OPENCV_LIBS)
+libopencv_wrapper_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)'
+video_filter_LTLIBRARIES += $(LTLIBopencv_wrapper)
+EXTRA_LTLIBRARIES += libopencv_wrapper_plugin.la
+
+libpostproc_plugin_la_SOURCES = postproc.c
+libpostproc_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(POSTPROC_CFLAGS) $(AVUTIL_CFLAGS)
+libpostproc_plugin_la_LIBADD = $(LIBM) $(POSTPROC_LIBS) $(AVUTIL_LIBS)
+libpostproc_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)'
+video_filter_LTLIBRARIES += $(LTLIBpostproc)
+EXTRA_LTLIBRARIES += libpostproc_plugin.la
+
+# sub filters
+libsubsdelay_plugin_la_SOURCES = subsdelay.c
+video_filter_LTLIBRARIES += libsubsdelay_plugin.la
+
+# sub sources
+libaudiobargraph_v_plugin_la_SOURCES = audiobargraph_v.c
+libaudiobargraph_v_plugin_la_LIBADD = $(LIBM)
+liblogo_plugin_la_SOURCES = logo.c
+libmarq_plugin_la_SOURCES = marq.c
+libmosaic_plugin_la_SOURCES = mosaic.c mosaic.h
+libmosaic_plugin_la_LIBADD = $(LIBM)
+librss_plugin_la_SOURCES = rss.c
+
+video_filter_LTLIBRARIES += \
+       libaudiobargraph_v_plugin.la \
+       liblogo_plugin.la \
+       libmarq_plugin.la \
+       libmosaic_plugin.la \
+       librss_plugin.la
+
+libremoteosd_plugin_la_SOURCES = remoteosd.c remoteosd_rfbproto.h
+libremoteosd_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS)
+libremoteosd_plugin_la_LIBADD = $(GCRYPT_LIBS) $(LIBS_remoteosd) $(LIBPTHREAD)
+if HAVE_GCRYPT
+video_filter_LTLIBRARIES += libremoteosd_plugin.la
+endif
+
+# misc
+libblend_plugin_la_SOURCES = blend.cpp
+video_filter_LTLIBRARIES += libblend_plugin.la
 
+libopencv_example_plugin_la_SOURCES = opencv_example.cpp filter_event_info.h
+libopencv_example_plugin_la_CPPAGS = $(AM_CPPFLAGS) $(OPENCV_CFLAGS)
+libopencv_example_plugin_la_LIBADD = $(OPENCV_LIBS)
+libopencv_example_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)'
+video_filter_LTLIBRARIES += $(LTLIBopencv_example)
+EXTRA_LTLIBRARIES += libopencv_example_plugin.la