summaryrefslogtreecommitdiff
path: root/src/combined
diff options
context:
space:
mode:
authorMatt Messier <mmessier@grapetv.org>2007-05-11 18:24:25 -0400
committerMatt Messier <mmessier@grapetv.org>2007-05-11 18:24:25 -0400
commit913f9b8ee348c91717cdf5cd4c8a4d56b9d22a5e (patch)
tree302709e5d1b4467072623bd925a460fa19daa36b /src/combined
parent00dccb98dfe1ff21e14275b09806cbe4d69a3273 (diff)
downloadxine-lib-913f9b8ee348c91717cdf5cd4c8a4d56b9d22a5e.tar.gz
xine-lib-913f9b8ee348c91717cdf5cd4c8a4d56b9d22a5e.tar.bz2
Another pass at cleaning up Makefile.am files. More to come.
Diffstat (limited to 'src/combined')
-rw-r--r--src/combined/Makefile.am8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/combined/Makefile.am b/src/combined/Makefile.am
index 64655c1eb..26277f99b 100644
--- a/src/combined/Makefile.am
+++ b/src/combined/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/misc/Makefile.common
-AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
AM_LDFLAGS = $(xineplug_ldflags)
if HAVE_WAVPACK
@@ -14,10 +14,10 @@ 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 = $(AM_CFLAGS) $(WAVPACK_CFLAGS)
-xineplug_wavpack_la_CPPFLAGS = -I$(srcdir)/../demuxers
xineplug_wavpack_la_LIBADD = $(XINE_LIB) $(WAVPACK_LIBS)
+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 = $(AM_CFLAGS) $(LIBFLAC_CFLAGS)
xineplug_flac_la_LIBADD = $(XINE_LIB) $(LIBFLAC_LIBS)
+xineplug_flac_la_CFLAGS = $(AM_CFLAGS) $(LIBFLAC_CFLAGS)