diff options
| author | Matt Messier <mmessier@grapetv.org> | 2007-05-08 16:34:45 -0400 |
|---|---|---|
| committer | Matt Messier <mmessier@grapetv.org> | 2007-05-08 16:34:45 -0400 |
| commit | ff308c044bab7e8b8b55f70853925ac44a2001ad (patch) | |
| tree | 4a20234dfa77450463110a0031b0e062dc0609c5 /src | |
| parent | c8f3f69be6bd2a6ce361e2433f174abd57b77911 (diff) | |
| download | xine-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')
| -rw-r--r-- | src/input/Makefile.am | 4 | ||||
| -rw-r--r-- | src/libw32dll/Makefile.am | 2 | ||||
| -rw-r--r-- | src/libw32dll/wine/Makefile.am | 2 | ||||
| -rw-r--r-- | src/xine-engine/Makefile.am | 4 |
4 files changed, 6 insertions, 6 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) diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am index 774cc8705..8da0e1c84 100644 --- a/src/libw32dll/Makefile.am +++ b/src/libw32dll/Makefile.am @@ -16,7 +16,7 @@ xineplug_LTLIBRARIES = $(w32dll_codec) $(qt_codec) EXTRA_DIST = common.c xineplug_decode_w32dll_la_SOURCES = w32codec.c -xineplug_decode_w32dll_la_CFLAGS = $(AM_CFLAGS) $(XDG_BASEDIR_CFLAGS) +xineplug_decode_w32dll_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS) xineplug_decode_w32dll_la_DEPS = $(XDG_BASEDIR_DEPS) xineplug_decode_w32dll_la_LIBADD = \ $(top_builddir)/src/libw32dll/wine/libwine.la \ diff --git a/src/libw32dll/wine/Makefile.am b/src/libw32dll/wine/Makefile.am index 1fd132dca..05f15f908 100644 --- a/src/libw32dll/wine/Makefile.am +++ b/src/libw32dll/wine/Makefile.am @@ -31,7 +31,7 @@ libwine_la_SOURCES = \ win32.c \ stubs.s \ wrapper.S -libwine_la_CFLAGS = $(AM_CFLAGS) $(XDG_BASEDIR_CFLAGS) +libwine_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS) noinst_HEADERS = \ avifmt.h \ diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index f64dacba1..e5a9a6cdd 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -1,8 +1,8 @@ include $(top_srcdir)/misc/Makefile.common include $(top_srcdir)/lib/Makefile.common -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(X_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(XDG_BASEDIR_CFLAGS) $(VISIBILITY_FLAG) -AM_CPPFLAGS = $(ZLIB_CPPFLAGS) -DXINE_LIBRARY_COMPILE +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(X_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(VISIBILITY_FLAG) +AM_CPPFLAGS = $(XDG_BASEDIR_CPPFLAGS) $(ZLIB_CPPFLAGS) -DXINE_LIBRARY_COMPILE lib_LTLIBRARIES = libxine.la |