diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-05-31 14:08:52 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-05-31 14:08:52 +0100 |
| commit | b0607c580af756ff0ccd1229d91b4b6a97c76d24 (patch) | |
| tree | 27f64134720fc9dca224e6313b0505fa43cb8dd8 /src/libxinevdec | |
| parent | fe2112a1ac52fbf65e2624b978f9d33f04b6af56 (diff) | |
| parent | adebccc0fc011b6d1abe2f682bbfc866dffee73e (diff) | |
| download | xine-lib-b0607c580af756ff0ccd1229d91b4b6a97c76d24.tar.gz xine-lib-b0607c580af756ff0ccd1229d91b4b6a97c76d24.tar.bz2 | |
Merge -newbuild.
Diffstat (limited to 'src/libxinevdec')
| -rw-r--r-- | src/libxinevdec/Makefile.am | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libxinevdec/Makefile.am b/src/libxinevdec/Makefile.am index 87ee050e6..28a926a79 100644 --- a/src/libxinevdec/Makefile.am +++ b/src/libxinevdec/Makefile.am @@ -1,19 +1,19 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(VISIBILITY_FLAG) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) AM_LDFLAGS = $(xineplug_ldflags) EXTRA_DIST = foovideo.c -if HAVE_WAND +if ENABLE_IMAGEMAGICK image_module = xineplug_decode_image.la endif -if HAVE_GDK_PIXBUF +if ENABLE_GDK_PIXBUF gdkpixbuf_module = xineplug_decode_gdk_pixbuf.la endif -if HAVE_THEORA +if ENABLE_THEORA theora_module = xineplug_decode_theora.la endif @@ -34,13 +34,13 @@ xineplug_decode_yuv_la_SOURCES = yuv.c xineplug_decode_yuv_la_LIBADD = $(XINE_LIB) xineplug_decode_image_la_SOURCES = image.c -xineplug_decode_image_la_CFLAGS = $(AM_CFLAGS) $(WAND_CFLAGS) xineplug_decode_image_la_LIBADD = $(XINE_LIB) $(DYNAMIC_LD_LIBS) $(WAND_LIBS) +xineplug_decode_image_la_CFLAGS = $(AM_CFLAGS) $(WAND_CFLAGS) xineplug_decode_gdk_pixbuf_la_SOURCES = gdkpixbuf.c -xineplug_decode_gdk_pixbuf_la_CFLAGS = $(AM_CFLAGS) $(GDK_PIXBUF_CFLAGS) xineplug_decode_gdk_pixbuf_la_LIBADD = $(XINE_LIB) $(DYNAMIC_LD_LIBS) $(GDK_PIXBUF_LIBS) +xineplug_decode_gdk_pixbuf_la_CFLAGS = $(AM_CFLAGS) $(GDK_PIXBUF_CFLAGS) xineplug_decode_theora_la_SOURCES = xine_theora_decoder.c -xineplug_decode_theora_la_CFLAGS = $(AM_CFLAGS) $(OGG_CFLAGS) $(THEORA_CFLAGS) xineplug_decode_theora_la_LIBADD = $(XINE_LIB) $(OGG_LIBS) $(THEORA_LIBS) +xineplug_decode_theora_la_CFLAGS = $(AM_CFLAGS) $(OGG_CFLAGS) $(THEORA_CFLAGS) |