diff options
| author | Matt Messier <mmessier@grapetv.org> | 2007-05-11 18:24:25 -0400 |
|---|---|---|
| committer | Matt Messier <mmessier@grapetv.org> | 2007-05-11 18:24:25 -0400 |
| commit | 913f9b8ee348c91717cdf5cd4c8a4d56b9d22a5e (patch) | |
| tree | 302709e5d1b4467072623bd925a460fa19daa36b /src/dxr3 | |
| parent | 00dccb98dfe1ff21e14275b09806cbe4d69a3273 (diff) | |
| download | xine-lib-913f9b8ee348c91717cdf5cd4c8a4d56b9d22a5e.tar.gz xine-lib-913f9b8ee348c91717cdf5cd4c8a4d56b9d22a5e.tar.bz2 | |
Another pass at cleaning up Makefile.am files. More to come.
Diffstat (limited to 'src/dxr3')
| -rw-r--r-- | src/dxr3/Makefile.am | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am index 836f57e6e..dc1f26743 100644 --- a/src/dxr3/Makefile.am +++ b/src/dxr3/Makefile.am @@ -1,36 +1,40 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) $(X_CFLAGS) $(LIBFAME_CFLAGS) -AM_LDFLAGS = $(xineplug_ldflags) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_CPPFLAGS = +AM_LDFLAGS = $(xineplug_ldflags) -if HAVE_DXR3 -dxr3_modules = xineplug_decode_dxr3_video.la \ - xineplug_decode_dxr3_spu.la \ - xineplug_vo_out_dxr3.la -endif if HAVE_X11 +AM_CFLAGS += $(X_CFLAGS) link_x_libs = $(X_LIBS) -lXext endif if HAVE_LIBFAME -link_fame = $(LIBFAME_LIBS) +AM_CFLAGS += $(LIBFAME_CFLAGS) +link_fame = $(LIBFAME_LIBS) endif if HAVE_LIBRTE link_rte = -lrte endif -xineplug_LTLIBRARIES = $(dxr3_modules) +noinst_HEADERS = em8300.h dxr3.h dxr3_scr.h video_out_dxr3.h + +if HAVE_DXR3 +xineplug_LTLIBRARIES = xineplug_decode_dxr3_video.la \ + xineplug_decode_dxr3_spu.la \ + xineplug_vo_out_dxr3.la +endif xineplug_decode_dxr3_video_la_SOURCES = dxr3_decode_video.c xineplug_decode_dxr3_video_la_LIBADD = $(XINE_LIB) if HAVE_DVDNAV -AM_CPPFLAGS = $(DVDNAV_CFLAGS) xineplug_decode_dxr3_spu_la_SOURCES = dxr3_decode_spu.c xineplug_decode_dxr3_spu_la_LIBADD = $(XINE_LIB) $(DVDNAV_LIBS) +xineplug_decode_dxr3_spu_la_CFLAGS = $(AM_CFLAGS) $(DVDNAV_CFLAGS) else -AM_CPPFLAGS = -I$(top_srcdir)/src/input/libdvdnav xineplug_decode_dxr3_spu_la_SOURCES = dxr3_decode_spu.c nav_read.c xineplug_decode_dxr3_spu_la_LIBADD = $(XINE_LIB) +xineplug_decode_dxr3_spu_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/input/libdvdnav endif xineplug_vo_out_dxr3_la_SOURCES = \ @@ -40,9 +44,3 @@ xineplug_vo_out_dxr3_la_SOURCES = \ video_out_dxr3.c xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs) $(XINE_LIB) $(DYNAMIC_LD_LIBS) -lm - -noinst_HEADERS = \ - em8300.h \ - dxr3.h \ - dxr3_scr.h \ - video_out_dxr3.h |