X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=ext%2FMakefile.am;h=6f001825218c0b5ddcffb9565924691f89b00e59;hb=187d8acd5ee7da17c432d7c54d8d86b97cf0b479;hp=b1a9416d7db310c52b5c22d4263fc42cd9537ed6;hpb=d59a00aa1cc792ca1437760bb10164d1eba2eae9;p=platform%2Fupstream%2Fgst-plugins-good.git

diff --git a/ext/Makefile.am b/ext/Makefile.am
index b1a9416..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
@@ -28,12 +22,6 @@ else
 GDK_PIXBUF_DIR =
 endif
 
-if USE_HAL
-HAL_DIR = hal
-else
-HAL_DIR =
-endif
-
 if USE_JACK
 JACK_DIR=jack
 else
@@ -58,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
@@ -113,6 +89,12 @@ else
 TAGLIB_DIR =
 endif
 
+if USE_VPX
+VPX_DIR=vpx
+else
+VPX_DIR=
+endif
+
 if USE_WAVPACK
 WAVPACK_DIR=wavpack
 else
@@ -121,34 +103,30 @@ endif
 
 SUBDIRS = \
 	$(AALIB_DIR) \
-	$(ANNODEX_DIR) \
 	$(CAIRO_DIR) \
 	$(DV1394_DIR) \
 	$(FLAC_DIR) \
 	$(GDK_PIXBUF_DIR) \
-	$(HAL_DIR) \
 	$(JACK_DIR) \
 	$(JPEG_DIR) \
 	$(LIBCACA_DIR) \
 	$(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 \
 	gdk_pixbuf \
-	hal \
 	jack \
 	jpeg \
 	libcaca \
@@ -159,6 +137,7 @@ DIST_SUBDIRS = \
 	soup \
 	speex \
 	taglib \
+	vpx \
 	wavpack
 
 include $(top_srcdir)/common/parallel-subdirs.mak