X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=ext%2FMakefile.am;h=c143fe042549fdba656e1b06f78d3e4c04bf67aa;hb=d410acf64981420c6102535c1c9ab5d5581870c8;hp=2626f65c001d00fda70f7535696c72d6542e5de7;hpb=83bedf3e0712370a55718335ddf6c1ff8f784200;p=platform%2Fupstream%2Fgst-plugins-good.git

diff --git a/ext/Makefile.am b/ext/Makefile.am
index 2626f65..c143fe0 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -4,52 +4,28 @@ else
 AALIB_DIR =
 endif
 
-if USE_ANNODEX
-ANNODEX_DIR = annodex
-else
-ANNODEX_DIR =
-endif
-
 if USE_CAIRO
 CAIRO_DIR = cairo
 else
 CAIRO_DIR =
 endif
 
-if USE_CDIO
-CDIO_DIR = cdio
-else
-CDIO_DIR =
-endif
-
-if USE_ESD
-ESD_DIR = esd
-else
-ESD_DIR =
-endif
-
 if USE_FLAC
 FLAC_DIR = flac
 else
 FLAC_DIR =
 endif
 
-if USE_GCONF
-GCONF_DIR = gconf
-else
-GCONF_DIR =
-endif
-
 if USE_GDK_PIXBUF
 GDK_PIXBUF_DIR = gdk_pixbuf
 else
 GDK_PIXBUF_DIR =
 endif
 
-if USE_HAL
-HAL_DIR = hal
+if USE_JACK
+JACK_DIR=jack
 else
-HAL_DIR =
+JACK_DIR=
 endif
 
 if USE_JPEG
@@ -58,12 +34,6 @@ else
 JPEG_DIR =
 endif
 
-if USE_LADSPA
-LADSPA_DIR = ladspa
-else
-LADSPA_DIR =
-endif
-
 if USE_LIBCACA
 LIBCACA_DIR = libcaca
 else
@@ -76,12 +46,6 @@ else
 LIBDV_DIR =
 endif
 
-# if USE_LIBMNG
-# LIBMNG_DIR = libmng
-# else
-LIBMNG_DIR =
-# endif
-
 if USE_LIBPNG
 LIBPNG_DIR = libpng
 else
@@ -100,12 +64,25 @@ else
 DV1394_DIR =
 endif
 
+if USE_PULSE
+PULSE_DIR = pulse
+else
+PULSE_DIR =
+endif
+
+
 if USE_SHOUT2
 SHOUT2_DIR = shout2
 else
 SHOUT2_DIR =
 endif
 
+if USE_SOUP
+SOUP_DIR=soup
+else
+SOUP_DIR=
+endif
+
 if USE_SPEEX
 SPEEX_DIR = speex
 else
@@ -118,44 +95,56 @@ else
 TAGLIB_DIR =
 endif
 
+if USE_VPX
+VPX_DIR=vpx
+else
+VPX_DIR=
+endif
+
+if USE_WAVPACK
+WAVPACK_DIR=wavpack
+else
+WAVPACK_DIR=
+endif
+
 SUBDIRS = \
 	$(AALIB_DIR) \
-	$(ANNODEX_DIR) \
 	$(CAIRO_DIR) \
-	$(CDIO_DIR) \
 	$(DV1394_DIR) \
-	$(ESD_DIR) \
 	$(FLAC_DIR) \
-	$(GCONF_DIR) \
 	$(GDK_PIXBUF_DIR) \
-	$(HAL_DIR) \
+	$(JACK_DIR) \
 	$(JPEG_DIR) \
-	$(LADSPA_DIR) \
 	$(LIBCACA_DIR) \
 	$(LIBDV_DIR) \
 	$(LIBMNG_DIR) \
 	$(LIBPNG_DIR) \
 	$(MIKMOD_DIR) \
+	$(PULSE_DIR) \
 	$(SHOUT2_DIR) \
+	$(SOUP_DIR) \
 	$(SPEEX_DIR) \
-	$(TAGLIB_DIR)
+	$(TAGLIB_DIR) \
+	$(VPX_DIR) \
+	$(WAVPACK_DIR)
 
 DIST_SUBDIRS = \
 	aalib \
-	annodex \
 	cairo \
-	cdio \
 	dv \
-	esd \
 	flac \
-	gconf \
 	gdk_pixbuf \
-	hal \
+	jack \
 	jpeg \
-	ladspa \
 	libcaca \
 	libpng \
+	pulse \
 	raw1394 \
 	shout2 \
+	soup \
 	speex \
-	taglib
+	taglib \
+	vpx \
+	wavpack
+
+include $(top_srcdir)/common/parallel-subdirs.mak