diff options
| author | Stephen Torri <storri@users.sourceforge.net> | 2002-10-09 05:13:38 +0000 |
|---|---|---|
| committer | Stephen Torri <storri@users.sourceforge.net> | 2002-10-09 05:13:38 +0000 |
| commit | 174abfc85ddc0220efecd4b7cda27816ef999c10 (patch) | |
| tree | bea33d1e79ecede96198db8ea09966e0537831ad /src/input | |
| parent | 64090090df11d9179eac3f19b784f544cdb7cce5 (diff) | |
| download | xine-lib-174abfc85ddc0220efecd4b7cda27816ef999c10.tar.gz xine-lib-174abfc85ddc0220efecd4b7cda27816ef999c10.tar.bz2 | |
configure.ac:
- OpenGL header GL/gl.h is checked to see if its exists with wrong
header name (GL/GL.h). Test failed despite the file required by
src/video_out/video_out_opengl.c was GL/gl.h
- Ascii-Art library version incorrect. Required version is 1.4
(contains aalib-config)
m4/aa.m4:
- Changed aalib version to 1.4
src/audio_out/Makefile.am:
src/demuxers/Makefile.am:
src/dxr3/Makefile.am:
src/input/Makefile.am:
src/input/libdvdnav/Makefile.am:
src/input/libdvdread/Makefile.am:
src/libffmpeg/libavcodec/Makefile.am:
src/libffmpeg/libavcodec/i386/Makefile.am:
src/libffmpeg/libavcodec/mlib/Makefile.am:
src/libmad/Makefile.am:
src/libmpeg2/Makefile.am:
src/libvorbis/Makefile.am:
src/libw32dll/Makefile.am:
src/libw32dll/wine/Makefile.am:
src/libxineadec/Makefile.am:
src/libxvid/Makefile.am:
src/video_out/Makefile.am:
src/video_out/libdha/Makefile.am:
src/video_out/vidix/Makefile.am:
src/xine-engine/Makefile.am:
src/xine-utils/Makefile.am:
- Removed @CFLAGS@ from all AM_CFLAGS. @CFLAGS@ are added in Makefile.in.
Adding it here was redundant. Thanks to Mike and others for pointing this
out.
CVS patchset: 2805
CVS date: 2002/10/09 05:13:38
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/Makefile.am | 3 | ||||
| -rw-r--r-- | src/input/libdvdnav/Makefile.am | 2 | ||||
| -rw-r--r-- | src/input/libdvdread/Makefile.am | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/input/Makefile.am b/src/input/Makefile.am index b6c594a9e..1cd0900fd 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -37,7 +37,7 @@ DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \ link_dvdnav = libdvdnav/libdvdnav.la libdvdread/libdvdread.la endif -AM_CFLAGS = @CFLAGS@ $(DVD_CFLAGS) +AM_CFLAGS = $(DVD_CFLAGS) DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(DVD_CFLAGS) lib_LTLIBRARIES = \ @@ -51,7 +51,6 @@ lib_LTLIBRARIES = \ xineplug_inp_rtp.la \ xineplug_inp_stdin_fifo.la - xineplug_inp_file_la_SOURCES = input_file.c xineplug_inp_file_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la xineplug_inp_file_la_LDFLAGS = -avoid-version -module diff --git a/src/input/libdvdnav/Makefile.am b/src/input/libdvdnav/Makefile.am index 559563aa6..d5cabf2dc 100644 --- a/src/input/libdvdnav/Makefile.am +++ b/src/input/libdvdnav/Makefile.am @@ -1,7 +1,7 @@ DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \ -I$(top_srcdir)/src/input/libdvdread/ -AM_CFLAGS = @CFLAGS@ $(DVD_CFLAGS) +AM_CFLAGS = $(DVD_CFLAGS) noinst_LTLIBRARIES = libdvdnav.la diff --git a/src/input/libdvdread/Makefile.am b/src/input/libdvdread/Makefile.am index 590cf8030..0970438c1 100644 --- a/src/input/libdvdread/Makefile.am +++ b/src/input/libdvdread/Makefile.am @@ -1,6 +1,6 @@ DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -AM_CFLAGS = @CFLAGS@ $(DVD_CFLAGS) +AM_CFLAGS = $(DVD_CFLAGS) noinst_LTLIBRARIES = libdvdread.la |