projects
/
platform
/
upstream
/
gst-plugins-good.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jack: don't wait for callbacks if the jack server shut down
[platform/upstream/gst-plugins-good.git]
/
ext
/
Makefile.am
diff --git
a/ext/Makefile.am
b/ext/Makefile.am
index
c78d14c
..
6f00182
100644
(file)
--- a/
ext/Makefile.am
+++ b/
ext/Makefile.am
@@
-4,50
+4,28
@@
else
AALIB_DIR =
endif
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_CAIRO
CAIRO_DIR = cairo
else
CAIRO_DIR =
endif
-if USE_ESD
-ESD_DIR = esd
-else
-ESD_DIR =
-endif
-
if USE_FLAC
FLAC_DIR = flac
else
FLAC_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
if USE_GDK_PIXBUF
GDK_PIXBUF_DIR = gdk_pixbuf
else
-if USE_GDK_PIXBUF3
-GDK_PIXBUF_DIR = gdk_pixbuf
-else
GDK_PIXBUF_DIR =
endif
GDK_PIXBUF_DIR =
endif
-endif
-if USE_
HAL
-HAL_DIR = hal
+if USE_
JACK
+JACK_DIR=jack
else
else
-
HAL_DIR
=
+
JACK_DIR
=
endif
if USE_JPEG
endif
if USE_JPEG
@@
-68,24
+46,12
@@
else
LIBDV_DIR =
endif
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_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
if USE_DV1394
DV1394_DIR = raw1394
else
@@
-123,6
+89,12
@@
else
TAGLIB_DIR =
endif
TAGLIB_DIR =
endif
+if USE_VPX
+VPX_DIR=vpx
+else
+VPX_DIR=
+endif
+
if USE_WAVPACK
WAVPACK_DIR=wavpack
else
if USE_WAVPACK
WAVPACK_DIR=wavpack
else
@@
-131,37
+103,31
@@
endif
SUBDIRS = \
$(AALIB_DIR) \
SUBDIRS = \
$(AALIB_DIR) \
- $(ANNODEX_DIR) \
$(CAIRO_DIR) \
$(DV1394_DIR) \
$(CAIRO_DIR) \
$(DV1394_DIR) \
- $(ESD_DIR) \
$(FLAC_DIR) \
$(FLAC_DIR) \
- $(GCONF_DIR) \
$(GDK_PIXBUF_DIR) \
$(GDK_PIXBUF_DIR) \
- $(
HAL
_DIR) \
+ $(
JACK
_DIR) \
$(JPEG_DIR) \
$(LIBCACA_DIR) \
$(LIBDV_DIR) \
$(LIBMNG_DIR) \
$(LIBPNG_DIR) \
$(JPEG_DIR) \
$(LIBCACA_DIR) \
$(LIBDV_DIR) \
$(LIBMNG_DIR) \
$(LIBPNG_DIR) \
- $(MIKMOD_DIR) \
$(PULSE_DIR) \
$(SHOUT2_DIR) \
$(SOUP_DIR) \
$(SPEEX_DIR) \
$(TAGLIB_DIR) \
$(PULSE_DIR) \
$(SHOUT2_DIR) \
$(SOUP_DIR) \
$(SPEEX_DIR) \
$(TAGLIB_DIR) \
+ $(VPX_DIR) \
$(WAVPACK_DIR)
DIST_SUBDIRS = \
aalib \
$(WAVPACK_DIR)
DIST_SUBDIRS = \
aalib \
- annodex \
cairo \
dv \
cairo \
dv \
- esd \
flac \
flac \
- gconf \
gdk_pixbuf \
gdk_pixbuf \
-
hal
\
+
jack
\
jpeg \
libcaca \
libpng \
jpeg \
libcaca \
libpng \
@@
-171,6
+137,7
@@
DIST_SUBDIRS = \
soup \
speex \
taglib \
soup \
speex \
taglib \
+ vpx \
wavpack
include $(top_srcdir)/common/parallel-subdirs.mak
wavpack
include $(top_srcdir)/common/parallel-subdirs.mak