diff options
| author | Dave Robillard <dave@drobilla.net> | 2009-08-09 00:14:27 -0400 |
|---|---|---|
| committer | Dave Robillard <dave@drobilla.net> | 2009-08-09 00:14:27 -0400 |
| commit | dd5afbf0c6557ad89994cbfd91e4117e8503b81a (patch) | |
| tree | 4f18322a717c6dbe64b8b38194e302b1668dcb3d /ext/Makefile.am | |
| parent | 5d9d4a7b518c42bda88c7f6c87ce7c3c01233562 (diff) | |
| parent | 6115e0cb0ef3ae85397297c7e30c2e9b4a0a181e (diff) | |
| download | gst-plugins-bad-dd5afbf0c6557ad89994cbfd91e4117e8503b81a.tar.gz gst-plugins-bad-dd5afbf0c6557ad89994cbfd91e4117e8503b81a.tar.bz2 gst-plugins-bad-dd5afbf0c6557ad89994cbfd91e4117e8503b81a.zip | |
Merge branch 'master' of git://anongit.freedesktop.org/gstreamer/gst-plugins-bad into fdo
Diffstat (limited to 'ext/Makefile.am')
| -rw-r--r-- | ext/Makefile.am | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/ext/Makefile.am b/ext/Makefile.am index fafa1146..31dd00a4 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -11,7 +11,7 @@ ASSRENDER_DIR = endif if USE_AMRWB -AMRWB_DIR = amrwb +AMRWB_DIR = amrwbenc else AMRWB_DIR = endif @@ -307,11 +307,17 @@ SOUNDTOUCH_DIR= endif if USE_SPC -SPC_DIR=spc +SPC_DIR=gme else SPC_DIR= endif +if USE_GME +GME_DIR=gme +else +GME_DIR= +endif + if USE_SWFDEC #SWFDEC_DIR=swfdec else @@ -392,6 +398,7 @@ SUBDIRS=\ $(SMOOTHWAVE_DIR) \ $(SNDFILE_DIR) \ $(SOUNDTOUCH_DIR) \ + $(GME_DIR) \ $(SPC_DIR) \ $(SWFDEC_DIR) \ $(TARKIN_DIR) \ @@ -402,7 +409,7 @@ SUBDIRS=\ DIST_SUBDIRS = \ alsaspdif \ - amrwb \ + amrwbenc \ assrender \ apexsink \ bz2 \ @@ -440,6 +447,7 @@ DIST_SUBDIRS = \ sndfile \ soundtouch \ spc \ + gme \ swfdec \ theora \ timidity \ |