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/combined | |
| parent | fe2112a1ac52fbf65e2624b978f9d33f04b6af56 (diff) | |
| parent | adebccc0fc011b6d1abe2f682bbfc866dffee73e (diff) | |
| download | xine-lib-b0607c580af756ff0ccd1229d91b4b6a97c76d24.tar.gz xine-lib-b0607c580af756ff0ccd1229d91b4b6a97c76d24.tar.bz2 | |
Merge -newbuild.
Diffstat (limited to 'src/combined')
| -rw-r--r-- | src/combined/Makefile.am | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/combined/Makefile.am b/src/combined/Makefile.am index 884fcf0cc..ed513cd4d 100644 --- a/src/combined/Makefile.am +++ b/src/combined/Makefile.am @@ -1,21 +1,23 @@ include $(top_srcdir)/misc/Makefile.common -if HAVE_WAVPACK +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_LDFLAGS = $(xineplug_ldflags) + +if ENABLE_WAVPACK xineplug_wavpack = xineplug_wavpack.la endif -if HAVE_LIBFLAC +if ENABLE_LIBFLAC xineplug_flac = xineplug_flac.la endif xineplug_LTLIBRARIES = $(xineplug_wavpack) $(xineplug_flac) xineplug_wavpack_la_SOURCES = demux_wavpack.c decoder_wavpack.c combined_wavpack.c combined_wavpack.h -xineplug_wavpack_la_CFLAGS = $(VISIBILITY_FLAG) $(WAVPACK_CFLAGS) -I$(srcdir)/../demuxers xineplug_wavpack_la_LIBADD = $(XINE_LIB) $(WAVPACK_LIBS) -xineplug_wavpack_la_LDFLAGS = $(xineplug_ldflags) +xineplug_wavpack_la_CFLAGS = $(AM_CFLAGS) $(WAVPACK_CFLAGS) +xineplug_wavpack_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/demuxers xineplug_flac_la_SOURCES = demux_flac.c decoder_flac.c demux_flac.h -xineplug_flac_la_CFLAGS = $(VISIBILITY_FLAG) $(LIBFLAC_CFLAGS) xineplug_flac_la_LIBADD = $(XINE_LIB) $(LIBFLAC_LIBS) -xineplug_flac_la_LDFLAGS = $(xineplug_ldflags) +xineplug_flac_la_CFLAGS = $(AM_CFLAGS) $(LIBFLAC_CFLAGS) |