X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=ext%2FMakefile.am;h=6f001825218c0b5ddcffb9565924691f89b00e59;hb=0f719af3077b788f9e0d87066fdcfd19c36eca49;hp=791fe002543a6411d427ccdba22a3a9081e5b1a4;hpb=225e98d62349b94aed9e4e8158b62626ca3b1218;p=platform%2Fupstream%2Fgst-plugins-good.git diff --git a/ext/Makefile.am b/ext/Makefile.am index 791fe00..6f00182 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -4,12 +4,6 @@ else AALIB_DIR = endif -if USE_ANNODEX -ANNODEX_DIR = annodex -else -ANNODEX_DIR = -endif - if USE_CAIRO CAIRO_DIR = cairo else @@ -52,24 +46,12 @@ else LIBDV_DIR = endif -# if USE_LIBMNG -# LIBMNG_DIR = libmng -# else -LIBMNG_DIR = -# endif - if USE_LIBPNG LIBPNG_DIR = libpng else LIBPNG_DIR = endif -# if USE_MIKMOD -# MIKMOD_DIR = mikmod -# else -MIKMOD_DIR = -# endif - if USE_DV1394 DV1394_DIR = raw1394 else @@ -107,6 +89,12 @@ else TAGLIB_DIR = endif +if USE_VPX +VPX_DIR=vpx +else +VPX_DIR= +endif + if USE_WAVPACK WAVPACK_DIR=wavpack else @@ -115,7 +103,6 @@ endif SUBDIRS = \ $(AALIB_DIR) \ - $(ANNODEX_DIR) \ $(CAIRO_DIR) \ $(DV1394_DIR) \ $(FLAC_DIR) \ @@ -126,17 +113,16 @@ SUBDIRS = \ $(LIBDV_DIR) \ $(LIBMNG_DIR) \ $(LIBPNG_DIR) \ - $(MIKMOD_DIR) \ $(PULSE_DIR) \ $(SHOUT2_DIR) \ $(SOUP_DIR) \ $(SPEEX_DIR) \ $(TAGLIB_DIR) \ + $(VPX_DIR) \ $(WAVPACK_DIR) DIST_SUBDIRS = \ aalib \ - annodex \ cairo \ dv \ flac \ @@ -151,6 +137,7 @@ DIST_SUBDIRS = \ soup \ speex \ taglib \ + vpx \ wavpack include $(top_srcdir)/common/parallel-subdirs.mak