summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorMatt Messier <mmessier@grapetv.org>2007-05-08 16:34:45 -0400
committerMatt Messier <mmessier@grapetv.org>2007-05-08 16:34:45 -0400
commitff308c044bab7e8b8b55f70853925ac44a2001ad (patch)
tree4a20234dfa77450463110a0031b0e062dc0609c5 /src/input
parentc8f3f69be6bd2a6ce361e2433f174abd57b77911 (diff)
downloadxine-lib-ff308c044bab7e8b8b55f70853925ac44a2001ad.tar.gz
xine-lib-ff308c044bab7e8b8b55f70853925ac44a2001ad.tar.bz2
More configure.ac cleanups
-- Revisit NLS stuff. Not much changed, remove the REVISIT tag -- Change XDG_BASEDIR_CFLAGS to XDG_BASEDIR_CPPFLAGS, because it only includes a -I, which is a CPPFLAGS option, not CFLAGS -- Move XDG stuff up to library checks -- Cleanup and move zlib checks -- Move X11 checks up to checks for system services -- Break audio out plugin stuff into m4/audio_out.m4 -- Break video out plugin stuff into m4/video_out.m4 -- Move libdir name stuff into m4/libFLAC.m4 since that's the only thing that uses it.
Diffstat (limited to 'src/input')
-rw-r--r--src/input/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index ce8c2fe33..e5b6926dc 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -104,7 +104,7 @@ xineplug_inp_pnm_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS)
xineplug_inp_dvb_la_SOURCES = input_dvb.c net_buf_ctrl.c
xineplug_inp_dvb_la_DEPS = $(XDG_BASEDIR_DEPS)
xineplug_inp_dvb_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(XDG_BASEDIR_LIBS)
-xineplug_inp_dvb_la_CFLAGS = $(AM_CFLAGS) $(XDG_BASEDIR_CFLAGS)
+xineplug_inp_dvb_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS)
xineplug_inp_rtsp_la_SOURCES = input_rtsp.c net_buf_ctrl.c
xineplug_inp_rtsp_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) libreal/libreal.la librtsp/librtsp.la
@@ -112,7 +112,7 @@ xineplug_inp_rtsp_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) libreal/libreal.la lib
xineplug_inp_cdda_la_SOURCES = input_cdda.c media_helper.c sha1.c sha1.h base64.c base64.h
xineplug_inp_cdda_la_DEPS = $(XDG_BASEDIR_DEPS)
xineplug_inp_cdda_la_LIBADD = $(XINE_LIB) $(XDG_BASEDIR_LIBS)
-xineplug_inp_cdda_la_CFLAGS = $(AM_CFLAGS) $(XDG_BASEDIR_CFLAGS)
+xineplug_inp_cdda_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS)
xineplug_inp_v4l_la_SOURCES = input_v4l.c
xineplug_inp_v4l_la_LIBADD = $(ALSA_LIBS) $(XINE_LIB)