codec: avoid genmf

configure.ac

@@ -604,7 +604,7 @@ AC_CHECK_FUNCS([if_nameindex if_nametoindex])
 VLC_RESTORE_FLAGS
 
 AS_IF([test -n "$SOCKET_LIBS"], [
-  VLC_ADD_LIBS([access_rtmp access_output_udp access_output_shout sap stream_out_standard stream_out_rtp stream_out_raop vod_rtsp rtp oldrc netsync gnutls ts audioscrobbler lua remoteosd zvbi audiobargraph_a],[${SOCKET_LIBS}])
+  VLC_ADD_LIBS([access_rtmp access_output_udp access_output_shout sap stream_out_standard stream_out_rtp stream_out_raop vod_rtsp rtp oldrc netsync gnutls ts audioscrobbler lua remoteosd audiobargraph_a],[${SOCKET_LIBS}])
 ])
 AC_SUBST(SOCKET_LIBS)
 
@@ -653,7 +653,7 @@ AC_CHECK_FUNC(getopt_long,, [
 AC_SUBST(GNUGETOPT_LIBS)
 
 AC_CHECK_LIB(m,cos,[
-  VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom rotate noise grain scene kate lua chorus_flanger freetype swscale postproc faad twolame equalizer spatializer param_eq samplerate freetype mpc dmo quicktime qt4 compressor headphone_channel_mixer normvol audiobargraph_a audiobargraph_v speex opus mono colorthres extract ball hotkeys mosaic gaussianblur x262 x26410b hqdn3d anaglyph oldrc ncurses oldmovie glspectrum],[-lm])
+  VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom rotate noise grain scene lua chorus_flanger freetype swscale postproc equalizer spatializer param_eq samplerate freetype mpc qt4 compressor headphone_channel_mixer normvol audiobargraph_a audiobargraph_v mono colorthres extract ball hotkeys mosaic gaussianblur x262 x26410b hqdn3d anaglyph oldrc ncurses oldmovie glspectrum],[-lm])
   LIBM="-lm"
 ], [
   LIBM=""
@@ -2658,7 +2658,6 @@ if test "${enable_tremor}" = "yes"
 then
   AC_CHECK_HEADERS(tremor/ivorbiscodec.h, [
     VLC_ADD_PLUGIN([tremor])
-    VLC_ADD_LIBS([tremor],[-lvorbisidec -logg])
    ],[])
 fi
 
@@ -2706,7 +2705,6 @@ AC_CHECK_HEADERS(png.h, [
   VLC_SAVE_FLAGS
   LDFLAGS="${LDFLAGS} -lz $LIBM"
   AC_CHECK_LIB(png, png_set_rows, [
-    VLC_ADD_LIBS([png],[-lpng -lz $LIBM])
     VLC_ADD_PLUGIN([png])
   ], [], [-lz $LIBM])
   VLC_RESTORE_FLAGS
@@ -2875,7 +2873,7 @@ fi
 dnl
 dnl Intel QuickSync (aka MediaSDK) H264/H262 encoder
 dnl
-PKG_ENABLE_MODULES_VLC([QUICKSYNC], [qsv], [libmfx], [Intel QuickSync MPEG4-Part10/MPEG2 (aka H.264/H.262) encoder], [auto])
+PKG_ENABLE_MODULES_VLC([MFX], [qsv], [libmfx], [Intel QuickSync MPEG4-Part10/MPEG2 (aka H.264/H.262) encoder], [auto])
 
 dnl
 dnl libfluidsynth (MIDI synthetizer) plugin
@@ -2898,11 +2896,6 @@ AC_ARG_ENABLE(telx,
 AS_IF( [test "${enable_zvbi}" != "no"],[
     PKG_CHECK_MODULES(ZVBI, [zvbi-0.2 >= 0.2.28],
         [
-          VLC_ADD_LIBS([zvbi],[$ZVBI_LIBS])
-          if test "${SYS}" = "mingw32"; then
-              VLC_ADD_LIBS([zvbi],[ -lpthreadGC2])
-          fi
-          VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS])
           VLC_ADD_PLUGIN([zvbi])
           AC_DEFINE(ZVBI_COMPILED, 1, [Define if the zvbi module is built])
           AS_IF( [test "${enable_telx}" = "yes"],[
@@ -2924,8 +2917,6 @@ AC_ARG_ENABLE(libass,
 AS_IF( [test "${enable_libass}" != "no"], [
   PKG_CHECK_MODULES(LIBASS, [libass >= 0.9.8],
       [
-        VLC_ADD_LIBS([libass],[$LIBASS_LIBS])
-        VLC_ADD_CFLAGS([libass],[$LIBASS_CFLAGS])
         VLC_ADD_PLUGIN([libass])
 
         AC_CHECK_HEADERS(fontconfig/fontconfig.h,
@@ -2949,9 +2940,7 @@ AC_ARG_ENABLE(tiger,
 [  --enable-tiger          Tiger rendering library for Kate streams (default auto)])
 AS_IF([test "${enable_tiger}" != "no"], [
   PKG_CHECK_MODULES(TIGER,[tiger >= 0.3.1], [
-      AC_DEFINE(HAVE_TIGER, 1, [Define if libtiger is available.])
-      VLC_ADD_CFLAGS([kate],[$TIGER_CFLAGS])
-      VLC_ADD_LIBS([kate],[$TIGER_LIBS]) ],[
+      AC_DEFINE(HAVE_TIGER, 1, [Define if libtiger is available.])],[
         AS_IF([test -n "${enable_tiger}"], [
           AC_MSG_ERROR([${TIGER_PKG_ERRORS}.])
         ])
@@ -3132,9 +3121,7 @@ then
       # SDL_image
       AS_IF([ test "${enable_sdl_image}" != "no"],[
         PKG_CHECK_MODULES(SDL_IMAGE, [SDL_image >= 1.2.10], [
-          VLC_ADD_PLUGIN([sdl_image])
-          VLC_ADD_LIBS([sdl_image],[${SDL_IMAGE_LIBS}])
-          VLC_ADD_CFLAGS([sdl_image], [${SDL_IMAGE_CFLAGS}])],
+          VLC_ADD_PLUGIN([sdl_image])],
           [ AC_MSG_WARN([${SDL_IMAGE_PKG_ERRORS}. You should install it alongside your SDL package.])
           ])
       ])
@@ -4154,10 +4141,6 @@ AS_IF([test "${with_kde_solid}" != "no"], [
 AC_SUBST(soliddatadir)
 AM_CONDITIONAL(KDE_SOLID, [test "x${soliddatadir}" != "x"])
 
-dnl
-dnl  DMO codec
-AS_IF([test "${SYS}" = "mingw32"], [VLC_ADD_PLUGIN([dmo]) VLC_ADD_LIBS([dmo],[-lole32 -luuid]) ])
-
 EXTEND_HELP_STRING([Components:])
 
 dnl

modules/codec/.gitignore

-Makefile.am

modules/codec/Modules.am → modules/codec/Makefile.am

+include ../common.am
+codecdir = $(pluginsdir)/codec
+codec_LTLIBRARIES =
+EXTRA_LTLIBRARIES =
 noinst_HEADERS =
 noinst_LTLIBRARIES =
 
-SOURCES_flac = flac.c
-SOURCES_vorbis = vorbis.c
-SOURCES_theora = theora.c
-SOURCES_tremor = vorbis.c
-SOURCES_speex = speex.c
-SOURCES_opus = opus.c opus_header.c opus_header.h
-SOURCES_shine = shine/shine_mod.c shine/enc_base.h
-EXTRA_DIST += shine/shine.c
-SOURCES_wma_fixed = \
-	wmafixed/asf.h wmafixed/bswap.h \
-	wmafixed/fft.c wmafixed/fft.h \
-	wmafixed/mdct.c wmafixed/mdct.h \
-	wmafixed/wma.c wmafixed/wmadeci.c \
-	wmafixed/bitstream.c wmafixed/bitstream.h \
-	wmafixed/wmadata.h wmafixed/wmadec.h \
-	wmafixed/wmafixed.c wmafixed/wmafixed.h
-SOURCES_libmpeg2 = libmpeg2.c
-SOURCES_rawvideo = rawvideo.c
-SOURCES_quicktime = quicktime.c
-SOURCES_faad = faad.c
-SOURCES_dvbsub = dvbsub.c
-SOURCES_telx = telx.c
-SOURCES_x264 = x264.c
-SOURCES_x262 = x264.c
-SOURCES_x26410b = x264.c
-SOURCES_twolame = twolame.c
-SOURCES_dirac = dirac.c
-SOURCES_png = png.c
-SOURCES_svcdsub = svcdsub.c
-SOURCES_cvdsub = cvdsub.c
-SOURCES_sdl_image = sdl_image.c
-SOURCES_zvbi = zvbi.c
-SOURCES_cdg = cdg.c
-SOURCES_fluidsynth = fluidsynth.c
-SOURCES_cc = cc.c cc.h substext.h
-SOURCES_kate = kate.c
-SOURCES_schroedinger = schroedinger.c
-SOURCES_libass = libass.c
-SOURCES_subsdec = subsdec.c substext.h
-SOURCES_subsusf = subsusf.c
-SOURCES_t140 = t140.c
-SOURCES_crystalhd = crystalhd.c h264_nal.h
-SOURCES_spudec = spudec/spudec.c spudec/parse.c spudec/spudec.h
-SOURCES_stl = stl.c
-SOURCES_dmo = dmo/dmo.c dmo/dmo.h dmo/buffer.c
-SOURCES_ddummy = ddummy.c
-SOURCES_edummy = edummy.c
-SOURCES_fdkaac = fdkaac.c
-SOURCES_scte27 = scte27.c
-SOURCES_qsv = qsv.c
-
-codec_LTLIBRARIES += \
-	libcc_plugin.la \
-	libcdg_plugin.la \
-	libcvdsub_plugin.la \
-	libddummy_plugin.la \
-	libdvbsub_plugin.la \
-	librawvideo_plugin.la \
-	libspudec_plugin.la \
-	libsvcdsub_plugin.la \
-	libsubsdec_plugin.la \
-	libsubsusf_plugin.la \
-	libstl_plugin.la \
-	libscte27_plugin.la \
-	$(NULL)
+libddummy_plugin_la_SOURCES = ddummy.c
+codec_LTLIBRARIES += libddummy_plugin.la
 
+libedummy_plugin_la_SOURCES = edummy.c
 if ENABLE_SOUT
-codec_LTLIBRARIES += \
-	libt140_plugin.la \
-	libedummy_plugin.la
+codec_LTLIBRARIES += libedummy_plugin.la
 endif
 
+
 ### Audio codecs ###
 
 liba52_plugin_la_SOURCES = a52.c a52.h
+codec_LTLIBRARIES += liba52_plugin.la
 
 libadpcm_plugin_la_SOURCES = adpcm.c
+codec_LTLIBRARIES += libadpcm_plugin.la
 
 libaes3_plugin_la_SOURCES = aes3.c
+codec_LTLIBRARIES += libaes3_plugin.la
 
 libaraw_plugin_la_SOURCES = araw.c
+codec_LTLIBRARIES += libaraw_plugin.la
 
 libdts_plugin_la_SOURCES = dts.c
 libdts_plugin_la_LIBADD = libvlc_dts_header.la
+codec_LTLIBRARIES += libdts_plugin.la
 
 libvlc_dts_header_la_SOURCES = dts_header.c dts_header.h
 libvlc_dts_header_la_LDFLAGS = -static
 noinst_LTLIBRARIES += libvlc_dts_header.la
 
+libfaad_plugin_la_SOURCES = faad.c
+libfaad_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_faad)
+libfaad_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+libfaad_plugin_la_LIBADD = $(LIBS_faad) $(LIBM)
+EXTRA_LTLIBRARIES += libfaad_plugin.la
+codec_LTLIBRARIES += $(LTLIBfaad)
+
 libg711_plugin_la_SOURCES = g711.c
+codec_LTLIBRARIES += libg711_plugin.la
+
+libfluidsynth_plugin_la_SOURCES = fluidsynth.c
+libfluidsynth_plugin_la_CFLAGS = $(AM_CFLAGS) $(FLUIDSYNTH_CFLAGS)
+libfluidsynth_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+libfluidsynth_plugin_la_LIBADD = $(FLUIDSYNTH_LIBS)
+EXTRA_LTLIBRARIES += libfluidsynth_plugin.la
+codec_LTLIBRARIES += $(LTLIBfluidsynth)
 
 liblpcm_plugin_la_SOURCES = lpcm.c
+codec_LTLIBRARIES += liblpcm_plugin.la
 
 libmpeg_audio_plugin_la_SOURCES = mpeg_audio.c
+codec_LTLIBRARIES += libmpeg_audio_plugin.la
 
 libuleaddvaudio_plugin_la_SOURCES = uleaddvaudio.c
+codec_LTLIBRARIES += libuleaddvaudio_plugin.la
+
+libwma_fixed_plugin_la_SOURCES = \
+	wmafixed/asf.h wmafixed/bswap.h \
+	wmafixed/fft.c wmafixed/fft.h \
+	wmafixed/mdct.c wmafixed/mdct.h \
+	wmafixed/wma.c wmafixed/wmadeci.c \
+	wmafixed/bitstream.c wmafixed/bitstream.h \
+	wmafixed/wmadata.h wmafixed/wmadec.h \
+	wmafixed/wmafixed.c wmafixed/wmafixed.h
+libwma_fixed_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+libwma_fixed_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+EXTRA_LTLIBRARIES += libwma_fixed_plugin.la
+codec_LTLIBRARIES += $(LTLIBwma_fixed)
+
+
+### Video codecs ###
+
+libcdg_plugin_la_SOURCES = cdg.c
+codec_LTLIBRARIES += libcdg_plugin.la
+
+liblibmpeg2_plugin_la_SOURCES = libmpeg2.c
+liblibmpeg2_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_libmpeg2)
+liblibmpeg2_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+liblibmpeg2_plugin_la_LIBADD = $(LIBS_libmpeg2)
+EXTRA_LTLIBRARIES += liblibmpeg2_plugin.la
+codec_LTLIBRARIES += $(LTLIBlibmpeg2)
+
+librawvideo_plugin_la_SOURCES = rawvideo.c
+codec_LTLIBRARIES += librawvideo_plugin.la
+
+libschroedinger_plugin_la_SOURCES = schroedinger.c
+libschroedinger_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_schroedinger)
+libschroedinger_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+libschroedinger_plugin_la_LIBADD = $(LIBS_schroedinger)
+EXTRA_LTLIBRARIES += libschroedinger_plugin.la
+codec_LTLIBRARIES += $(LTLIBschroedinger)
+
+
+### Image codecs ###
+
+libpng_plugin_la_SOURCES = png.c
+libpng_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+libpng_plugin_la_LIBADD = -lpng -lz $(LIBM)
+EXTRA_LTLIBRARIES += libpng_plugin.la
+codec_LTLIBRARIES += $(LTLIBpng)
+
+libsdl_image_plugin_la_SOURCES = sdl_image.c
+libsdl_image_plugin_la_CFLAGS = $(AM_CFLAGS) $(SDL_IMAGE_CFLAGS)
+libsdl_image_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+libsdl_image_plugin_la_LIBADD = $(SDL_IMAGE_LIBS)
+EXTRA_LTLIBRARIES += libsdl_image_plugin.la
+codec_LTLIBRARIES += $(LTLIBsdl_image)
+
+libxwd_plugin_la_SOURCES = xwd.c
+libxwd_plugin_la_CFLAGS = $(AM_CFLAGS) $(XPROTO_CFLAGS)
+libxwd_plugin_la_LIBADD = $(XPROTO_LIBS)
+libxwd_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+codec_LTLIBRARIES += $(LTLIBxwd)
+EXTRA_LTLIBRARIES += libxwd_plugin.la
+
+
+### SPU ###
+
+liblibass_plugin_la_SOURCES = libass.c
+liblibass_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_libass)
+liblibass_plugin_la_CFLAGS = $(AM_CFLAGS) $(LIBASS_CFLAGS)
+liblibass_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+liblibass_plugin_la_LIBADD = $(LIBASS_LIBS) $(LIBS_libass)
+EXTRA_LTLIBRARIES += liblibass_plugin.la
+codec_LTLIBRARIES += $(LTLIBlibass)
+
+libcc_plugin_la_SOURCES = cc.c cc.h substext.h
+codec_LTLIBRARIES += libcc_plugin.la
+
+libcvdsub_plugin_la_SOURCES = cvdsub.c
+codec_LTLIBRARIES += libcvdsub_plugin.la
+
+libdvbsub_plugin_la_SOURCES = dvbsub.c
+codec_LTLIBRARIES += libdvbsub_plugin.la
+
+libscte27_plugin_la_SOURCES = scte27.c
+codec_LTLIBRARIES += libscte27_plugin.la
+
+libspudec_plugin_la_SOURCES = spudec/spudec.c spudec/parse.c spudec/spudec.h
+libspudec_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+codec_LTLIBRARIES += libspudec_plugin.la
+
+libstl_plugin_la_SOURCES = stl.c
+codec_LTLIBRARIES += libstl_plugin.la
+
+libsubsdec_plugin_la_SOURCES = subsdec.c substext.h
+codec_LTLIBRARIES += libsubsdec_plugin.la
+
+libsubsusf_plugin_la_SOURCES = subsusf.c
+codec_LTLIBRARIES += libsubsusf_plugin.la
+
+libsvcdsub_plugin_la_SOURCES = svcdsub.c
+codec_LTLIBRARIES += libsvcdsub_plugin.la
+
+libt140_plugin_la_SOURCES = t140.c
+if ENABLE_SOUT
+codec_LTLIBRARIES += libt140_plugin.la
+endif
+
+libtelx_plugin_la_SOURCES = telx.c
+libtelx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+EXTRA_LTLIBRARIES += libtelx_plugin.la
+codec_LTLIBRARIES += $(LTLIBtelx)
+
+libzvbi_plugin_la_SOURCES = zvbi.c
+libzvbi_plugin_la_CFLAGS = $(AM_CFLAGS) $(ZVBI_CFLAGS) $(CFLAGS_zvbi)
+libzvbi_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+libzvbi_plugin_la_LIBADD = $(ZVBI_LIBS) $(SOCKET_LIBS)
+if HAVE_WIN32
+libzvbi_plugin_la_LIBADD += -lpthreadGC2
+endif
+EXTRA_LTLIBRARIES += libzvbi_plugin.la
+codec_LTLIBRARIES += $(LTLIBzvbi)
+
+
+### Xiph ###
+
+libflac_plugin_la_SOURCES = flac.c
+libflac_plugin_la_CFLAGS = $(AM_CFLAGS) $(FLAC_CFLAGS)
+libflac_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+libflac_plugin_la_LIBADD = $(FLAC_LIBS)
+EXTRA_LTLIBRARIES += libflac_plugin.la
+codec_LTLIBRARIES += $(LTLIBflac)
+
+libkate_plugin_la_SOURCES = kate.c
+libkate_plugin_la_CFLAGS = $(AM_CFLAGS) $(TIGER_CFLAGS) $(KATE_CFLAGS)
+libkate_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+libkate_plugin_la_LIBADD = $(TIGER_LIBS) $(KATE_LIBS) $(LIBM)
+EXTRA_LTLIBRARIES += libkate_plugin.la
+codec_LTLIBRARIES += $(LTLIBkate)
+
+libopus_plugin_la_SOURCES = opus.c opus_header.c opus_header.h
+libopus_plugin_la_CFLAGS = $(AM_CFLAGS) $(OPUS_CFLAGS)
+libopus_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+libopus_plugin_la_LIBADD = $(OPUS_LIBS) $(LIBM)
+EXTRA_LTLIBRARIES += libopus_plugin.la
+codec_LTLIBRARIES += $(LTLIBopus)
+
+libspeex_plugin_la_SOURCES = speex.c
+libspeex_plugin_la_CFLAGS = $(AM_CFLAGS) $(SPEEX_CFLAGS)
+libspeex_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+libspeex_plugin_la_LIBADD = $(SPEEX_LIBS) $(LIBM)
+EXTRA_LTLIBRARIES += libspeex_plugin.la
+codec_LTLIBRARIES += $(LTLIBspeex)
+
+libtheora_plugin_la_SOURCES = theora.c
+libtheora_plugin_la_CFLAGS = $(AM_CFLAGS) $(THEORA_CFLAGS)
+libtheora_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+libtheora_plugin_la_LIBADD = $(THEORA_LIBS)
+EXTRA_LTLIBRARIES += libtheora_plugin.la
+codec_LTLIBRARIES += $(LTLIBtheora)
+
+libtremor_plugin_la_SOURCES = vorbis.c
+libtremor_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_tremor
+libtremor_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+libtremor_plugin_la_LIBADD = -lvorbisdec -logg
+EXTRA_LTLIBRARIES += libtremor_plugin.la
+codec_LTLIBRARIES += $(LTLIBtremor)
+
+libvorbis_plugin_la_SOURCES = vorbis.c
+libvorbis_plugin_la_CFLAGS = $(AM_CFLAGS) $(VORBIS_CFLAGS)
+libvorbis_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+libvorbis_plugin_la_LIBADD = $(VORBIS_LIBS)
+EXTRA_LTLIBRARIES += libvorbis_plugin.la
+codec_LTLIBRARIES += $(LTLIBvorbis)
 
-codec_LTLIBRARIES += \
-	liba52_plugin.la \
-	libadpcm_plugin.la \
-	libaes3_plugin.la \
-	libaraw_plugin.la \
-	libdts_plugin.la \
-	libg711_plugin.la \
-	liblpcm_plugin.la \
-	libmpeg_audio_plugin.la \
-	libuleaddvaudio_plugin.la
 
 ### FFmpeg/libav ###
+
 libavcodec_plugin_la_SOURCES = \
 	avcodec/avcommon_compat.h \
 	avcodec/avcommon.h \
@@ -188,15 +313,9 @@ if HAVE_WIN32
 libhwdummy_plugin_la_DEPENDENCIES = libhwdummy_plugin.rc.o
 endif
 
-### XWD ###
-libxwd_plugin_la_SOURCES = xwd.c
-libxwd_plugin_la_CFLAGS = $(AM_CFLAGS) $(XPROTO_CFLAGS)
-libxwd_plugin_la_LIBADD = $(XPROTO_LIBS)
-libxwd_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
-codec_LTLIBRARIES += $(LTLIBxwd)
-EXTRA_LTLIBRARIES += libxwd_plugin.la
 
 ### OpenMAX ###
+
 noinst_HEADERS += \
 	omxil/OMX_Broadcom.h \
 	omxil/OMX_Component.h \
@@ -235,3 +354,94 @@ EXTRA_LTLIBRARIES += libomxil_plugin.la libomxil_vout_plugin.la
 if HAVE_ANDROID
 codec_LTLIBRARIES += libiomx_plugin.la libmediacodec_plugin.la
 endif
+
+
+### X26x encoders ###
+
+libx262_plugin_la_SOURCES = x264.c
+libx262_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_x262
+libx262_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_x262)
+libx262_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_x262)
+libx262_plugin_la_LIBADD = $(LIBS_x262)
+EXTRA_LTLIBRARIES += libx262_plugin.la
+codec_LTLIBRARIES += $(LTLIBx262)
+
+libx264_plugin_la_SOURCES = x264.c
+libx264_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_x264) -DMODULE_NAME_IS_x264
+libx264_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_x264)
+libx264_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_x264)
+libx264_plugin_la_LIBADD = $(LIBS_x264)
+EXTRA_LTLIBRARIES += libx264_plugin.la
+codec_LTLIBRARIES += $(LTLIBx264)
+
+libx26410b_plugin_la_SOURCES = x264.c
+libx26410b_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_x26410b
+libx26410b_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_x26410b)
+libx26410b_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_x26410b)
+libx26410b_plugin_la_LIBADD = $(LIBS_x26410b)
+EXTRA_LTLIBRARIES += libx26410b_plugin.la
+codec_LTLIBRARIES += $(LTLIBx26410b)
+
+
+### Misc encoders ###
+
+libdirac_plugin_la_SOURCES = dirac.c
+libdirac_plugin_la_CFLAGS = $(AM_CFLAGS) $(DIRAC_CFLAGS)
+libdirac_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+libdirac_plugin_la_LIBADD = $(DIRAC_LIBS)
+EXTRA_LTLIBRARIES += libdirac_plugin.la
+codec_LTLIBRARIES += $(LTLIBdirac)
+
+libfdkaac_plugin_la_SOURCES = fdkaac.c
+libfdkaac_plugin_la_CFLAGS = $(AM_CFLAGS) $(FDKAAC_CFLAGS)
+libfdkaac_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+libfdkaac_plugin_la_LIBADD = $(FDKAAC_LIBS)
+EXTRA_LTLIBRARIES += libfdkaac_plugin.la
+codec_LTLIBRARIES += $(LTLIBfdkaac)
+
+libshine_plugin_la_SOURCES = shine/shine_mod.c shine/enc_base.h
+EXTRA_libshine_plugin_la_SOURCES = shine/shine.c
+libshine_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+EXTRA_LTLIBRARIES += libshine_plugin.la
+codec_LTLIBRARIES += $(LTLIBshine)
+
+libtwolame_plugin_la_SOURCES = twolame.c
+libtwolame_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+libtwolame_plugin_la_CFLAGS = $(AM_CFLAGS) $(TWOLAME_CFLAGS)
+libtwolame_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+libtwolame_plugin_la_LIBADD = $(TWOLAME_LIBS) $(LIBM)
+EXTRA_LTLIBRARIES += libtwolame_plugin.la
+codec_LTLIBRARIES += $(LTLIBtwolame)
+
+
+### Hardware encoders ###
+
+libcrystalhd_plugin_la_SOURCES = crystalhd.c h264_nal.h
+libcrystalhd_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+libcrystalhd_plugin_la_LIBADD = $(LIBS_crystalhd)
+EXTRA_LTLIBRARIES += libcrystalhd_plugin.la
+codec_LTLIBRARIES += $(LTLIBcrystalhd)
+
+libqsv_plugin_la_SOURCES = qsv.c
+libqsv_plugin_la_CFLAGS = $(AM_CFLAGS) $(MFX_CFLAGS)
+libqsv_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+libqsv_plugin_la_LIBADD = $(MFX_LIBS)
+EXTRA_LTLIBRARIES += libqsv_plugin.la
+codec_LTLIBRARIES += $(LTLIBqsv)
+
+
+### External frameworks ###
+
+libdmo_plugin_la_SOURCES = dmo/dmo.c dmo/dmo.h dmo/buffer.c
+libqsv_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+libdmo_plugin_la_LIBADD = $(LIBM)
+if HAVE_WIN32
+libdmo_plugin_la_LIBADD += -lole32 -luuid
+codec_LTLIBRARIES += libdmo_plugin.la
+endif
+
+libquicktime_plugin_la_SOURCES = quicktime.c
+libquicktime_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdirt)'
+libquicktime_plugin_la_LIBADD = $(LIBM)
+EXTRA_LTLIBRARIES += libquicktime_plugin.la
+codec_LTLIBRARIES += $(LTLIBquicktime)