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

27 files changed, 47 insertions, 61 deletions

diff --git a/src/audio_out/Makefile.am b/src/audio_out/Makefile.am
index 3c535a7ae..ddd57c0c9 100644
--- a/src/audio_out/Makefile.am
+++ b/src/audio_out/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = @CFLAGS@ -DXINE_COMPILE $(ALSA_CFLAGS) $(ESD_CFLAGS) $(IRIXAL_CFLAGS) $(ARTS_CFLAGS)
+AM_CFLAGS = -DXINE_COMPILE $(ALSA_CFLAGS) $(ESD_CFLAGS) $(IRIXAL_CFLAGS) $(ARTS_CFLAGS)
 
 EXTRA_DIST = audio_alsa_out.c \
 	audio_arts_out.c \
@@ -65,7 +65,6 @@ xineplug_ao_out_esd_la_LIBADD = $(ESD_LIBS)
 xineplug_ao_out_esd_la_LDFLAGS = -avoid-version -module
 
 xineplug_ao_out_sun_la_SOURCES = audio_sun_out.c
-xineplug_ao_out_sun_la_LIBADD = 
 xineplug_ao_out_sun_la_LDFLAGS = -avoid-version -module
 
 xineplug_ao_out_irixal_la_SOURCES = audio_irixal_out.c 
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index 2795c3d50..b2e972e4c 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = @CFLAGS@ $(OGG_CFLAGS)
+AM_CFLAGS = $(OGG_CFLAGS)
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
@@ -70,7 +70,6 @@ xineplug_dmx_mpeg_elem_la_LDFLAGS = -avoid-version -module
 
 xineplug_dmx_qt_la_SOURCES = demux_qt.c qtpalette.h
 xineplug_dmx_qt_la_LDFLAGS = -avoid-version -module
-xineplug_dmx_qt_la_LIBADD = -lz $(top_builddir)/src/xine-engine/libxine.la
 
 xineplug_dmx_asf_la_SOURCES = demux_asf.c
 xineplug_dmx_asf_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am
index 966048bc5..d00a53ef2 100644
--- a/src/dxr3/Makefile.am
+++ b/src/dxr3/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = @CFLAGS@ $(X_CFLAGS)
+AM_CFLAGS = $(X_CFLAGS)
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
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
 
diff --git a/src/liba52/Makefile.am b/src/liba52/Makefile.am
index f71d26f07..36225ab3e 100644
--- a/src/liba52/Makefile.am
+++ b/src/liba52/Makefile.am
@@ -1,7 +1,6 @@
-AM_CFLAGS = @CFLAGS@ $(LIBA52_CFLAGS)
+AM_CFLAGS = $(LIBA52_CFLAGS)
 DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(LIBA52_CFLAGS)
 
-
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
 libdir = $(XINE_PLUGINDIR)
diff --git a/src/libffmpeg/libavcodec/Makefile.am b/src/libffmpeg/libavcodec/Makefile.am
index f98fc716d..de1ca8227 100644
--- a/src/libffmpeg/libavcodec/Makefile.am
+++ b/src/libffmpeg/libavcodec/Makefile.am
@@ -6,9 +6,7 @@ SUBDIRS = armv4l i386 mlib alpha
 
 EXTRA_DIST = fdctref.c imgresample.c
 
-#CFLAGS = -D_FILE_OFFSET_BITS=64 @CFLAGS@
-
-AM_CFLAGS = @CFLAGS@ $(LIBFFMPEG_CFLAGS)
+AM_CFLAGS = $(LIBFFMPEG_CFLAGS)
 ASFLAGS =
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
diff --git a/src/libffmpeg/libavcodec/armv4l/Makefile.am b/src/libffmpeg/libavcodec/armv4l/Makefile.am
index 0cff3a2a4..833d96068 100644
--- a/src/libffmpeg/libavcodec/armv4l/Makefile.am
+++ b/src/libffmpeg/libavcodec/armv4l/Makefile.am
@@ -2,8 +2,6 @@
 ## Process this file with automake to produce Makefile.in
 ##
 
-#CFLAGS = @CFLAGS@ @LIBFFMPEG_CFLAGS@
-
 AM_CFLAGS = -O2 $(LIBFFMPEG_CFLAGS)
 ASFLAGS =
 
diff --git a/src/libffmpeg/libavcodec/i386/Makefile.am b/src/libffmpeg/libavcodec/i386/Makefile.am
index 1d36c1da8..15bec161e 100644
--- a/src/libffmpeg/libavcodec/i386/Makefile.am
+++ b/src/libffmpeg/libavcodec/i386/Makefile.am
@@ -2,8 +2,6 @@
 ## Process this file with automake to produce Makefile.in
 ##
 
-#CFLAGS = @CFLAGS@ @LIBFFMPEG_CFLAGS@
-
 # we must not use CFLAGS here, gcc optimizations produce
 # bad code if we do so.
 AM_CFLAGS = -O2 $(LIBFFMPEG_CFLAGS)
diff --git a/src/libffmpeg/libavcodec/mlib/Makefile.am b/src/libffmpeg/libavcodec/mlib/Makefile.am
index 68311e35c..e3c632577 100644
--- a/src/libffmpeg/libavcodec/mlib/Makefile.am
+++ b/src/libffmpeg/libavcodec/mlib/Makefile.am
@@ -2,9 +2,7 @@
 ## Process this file with automake to produce Makefile.in
 ##
 
-#CFLAGS = -D_FILE_OFFSET_BITS=64 @CFLAGS@
-
-AM_CFLAGS = @CFLAGS@ $(LIBFFMPEG_CFLAGS)
+AM_CFLAGS = $(LIBFFMPEG_CFLAGS)
 ASFLAGS =
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
diff --git a/src/libffmpeg/libavcodec/ppc/Makefile.am b/src/libffmpeg/libavcodec/ppc/Makefile.am
index 34d885c6d..8ffd8121c 100644
--- a/src/libffmpeg/libavcodec/ppc/Makefile.am
+++ b/src/libffmpeg/libavcodec/ppc/Makefile.am
@@ -2,11 +2,9 @@
 ## Process this file with automake to produce Makefile.in
 ##
 
-#CFLAGS = @CFLAGS@ @LIBFFMPEG_CFLAGS@
-
 # we must not use CFLAGS here, gcc optimizations produce
 # bad code if we do so.
-CFLAGS = -O2 $(LIBFFMPEG_CFLAGS)
+AM_CFLAGS = $(LIBFFMPEG_CFLAGS)
 
 ASFLAGS =
 
diff --git a/src/libmad/Makefile.am b/src/libmad/Makefile.am
index c5e88383f..665f1f9b3 100644
--- a/src/libmad/Makefile.am
+++ b/src/libmad/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS = @CFLAGS@ -DOPT_SPEED
+AM_CFLAGS = -DOPT_SPEED
 
 EXTRA_DIST = imdct_l_arm.S
 
diff --git a/src/libmpeg2/Makefile.am b/src/libmpeg2/Makefile.am
index e091b833c..161a86780 100644
--- a/src/libmpeg2/Makefile.am
+++ b/src/libmpeg2/Makefile.am
@@ -1,5 +1,5 @@
-CFLAGS = @CFLAGS@ $(LIBMPEG2_CFLAGS)
-DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(LIBMPEG2_CFLAGS)
+AM_CFLAGS = $(LIBMPEG2_CFLAGS)
+#DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(LIBMPEG2_CFLAGS)
 
 EXTRA_DIST = idct_mlib.c idct_mlib.h motion_comp_mlib.c
 
diff --git a/src/libvorbis/Makefile.am b/src/libvorbis/Makefile.am
index 2afa15af1..a359f4b40 100644
--- a/src/libvorbis/Makefile.am
+++ b/src/libvorbis/Makefile.am
@@ -2,7 +2,7 @@
 ## Process this file with automake to produce Makefile.in
 ##
 
-AM_CFLAGS = @CFLAGS@ $(VORBIS_CFLAGS)
+AM_CFLAGS = $(VORBIS_CFLAGS)
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
@@ -19,7 +19,8 @@ xineplug_decode_vorbis_la_LIBADD = $(VORBIS_LIBS)
 xineplug_decode_vorbis_la_LDFLAGS = -avoid-version -module
 
 debug:
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS)"
+#	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS)"
+	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
 
 install-debug: debug
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
diff --git a/src/libw32dll/DirectShow/Makefile.am b/src/libw32dll/DirectShow/Makefile.am
index 6a6526639..688060d88 100644
--- a/src/libw32dll/DirectShow/Makefile.am
+++ b/src/libw32dll/DirectShow/Makefile.am
@@ -1,13 +1,13 @@
 
-CFLAGS = @CFLAGS@ $(X_CFLAGS) -fno-omit-frame-pointer \
+AM_CFLAGS = $(X_CFLAGS) -fno-omit-frame-pointer \
 	-Wmissing-prototypes -Wimplicit-function-declaration \
 	-DWIN32_PATH=\"@w32_path@\" -DNOAVIFILE_HEADERS \
 	-I$(srcdir)/.. -I$(srcdir)/../wine
 
-DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(X_CFLAGS) -fno-omit-frame-pointer \
-	-Wmissing-prototypes -Wimplicit-function-declaration \
-	-DWIN32_PATH=\\\"@w32_path@\\\" -DNOAVIFILE_HEADERS \
-	-I$(srcdir)/.. -I$(srcdir)/../wine
+#DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(X_CFLAGS) -fno-omit-frame-pointer \
+#	-Wmissing-prototypes -Wimplicit-function-declaration \
+#	-DWIN32_PATH=\\\"@w32_path@\\\" -DNOAVIFILE_HEADERS \
+#	-I$(srcdir)/.. -I$(srcdir)/../wine
 
 if HAVE_W32DLL
 ds_filter_lib = libds_filter.la
diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am
index 10cfcd4a7..aa7990bdb 100644
--- a/src/libw32dll/Makefile.am
+++ b/src/libw32dll/Makefile.am
@@ -1,6 +1,6 @@
-CFLAGS = @CFLAGS@ -I$(srcdir)/wine
+AM_CFLAGS = -I$(srcdir)/wine
 
-DEBUG_CFLAGS = @DEBUG_CFLAGS@ -I$(srcdir)/wine
+#DEBUG_CFLAGS = @DEBUG_CFLAGS@ -I$(srcdir)/wine
 
 SUBDIRS = wine DirectShow
 
diff --git a/src/libw32dll/wine/Makefile.am b/src/libw32dll/wine/Makefile.am
index ef6665398..ecae2cdaa 100644
--- a/src/libw32dll/wine/Makefile.am
+++ b/src/libw32dll/wine/Makefile.am
@@ -4,15 +4,15 @@ noinst_LTLIBRARIES = $(wine_lib)
 
 ##
 ##
-CFLAGS = @CFLAGS@ $(X_CFLAGS) -fno-omit-frame-pointer \
+AM_CFLAGS = $(X_CFLAGS) -fno-omit-frame-pointer \
 	-Wmissing-prototypes -Wimplicit-function-declaration \
 	-DWIN32_PATH=\"@w32_path@\" -I$(srcdir)/.. -D__WINE__ \
 	-Ddbg_printf=__vprintf -DTRACE=__vprintf -fno-omit-frame-pointer
 
-DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(X_CFLAGS) -fno-omit-frame-pointer \
-	-Wmissing-prototypes -Wimplicit-function-declaration \
-	-DWIN32_PATH=\\\"@w32_path@\\\" -I$(srcdir)/.. -D__WINE__ \
-	-Ddbg_printf=__vprintf -DTRACE=__vprintf -fno-omit-frame-pointer
+#DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(X_CFLAGS) -fno-omit-frame-pointer \
+#	-Wmissing-prototypes -Wimplicit-function-declaration \
+#	-DWIN32_PATH=\\\"@w32_path@\\\" -I$(srcdir)/.. -D__WINE__ \
+#	-Ddbg_printf=__vprintf -DTRACE=__vprintf -fno-omit-frame-pointer
 
 
 if HAVE_W32DLL
diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am
index 3cf0d36a7..4f9b69b3e 100644
--- a/src/libxineadec/Makefile.am
+++ b/src/libxineadec/Makefile.am
@@ -2,6 +2,7 @@
 # the Makefile for the native xine audio decoders
 #
 
+
 libdir = $(XINE_PLUGINDIR)
 
 lib_LTLIBRARIES = \
diff --git a/src/libxinevdec/Makefile.am b/src/libxinevdec/Makefile.am
index 4c0b68ff9..f7fd2d4d9 100644
--- a/src/libxinevdec/Makefile.am
+++ b/src/libxinevdec/Makefile.am
@@ -1,6 +1,3 @@
-CFLAGS = @CFLAGS@
-DEBUG_CFLAGS = @DEBUG_CFLAGS@
-
 EXTRA_DIST = foovideo.c
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
diff --git a/src/libxvid/Makefile.am b/src/libxvid/Makefile.am
index f96609875..8e90a78de 100644
--- a/src/libxvid/Makefile.am
+++ b/src/libxvid/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS = @CFLAGS@ @XVID_CFLAGS@
+AM_CFLAGS = @XVID_CFLAGS@
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index 86769e5ae..8e7a246de 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -3,11 +3,13 @@ SUBDIRS = libdha vidix
 VIDIX_CFLAGS = -I$(top_builddir)/src/video_out/vidix \
 	-I$(top_srcdir)/src/video_out/vidix
 
-CFLAGS = @CFLAGS@ $(X_CFLAGS) $(LIBMPEG2_CFLAGS) \
-	-DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS)
+AM_CFLAGS = $(X_CFLAGS) $(LIBMPEG2_CFLAGS) \
+	-DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS) \
+	$(AALIB_CFLAGS)
 
 DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(X_CFLAGS) $(LIBMPEG2_CFLAGS) \
-	-DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS)
+	-DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS) \
+	$(AALIB_CFLAGS)
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
@@ -77,28 +79,28 @@ xineplug_vo_out_xshm_la_LDFLAGS = -avoid-version -module
 #xineplug_vo_out_opengl_la_LIBADD =  $(OPENGL_LIBS) $(GLUT_LIBS) $(GLU_LIBS) $(X_LIBS) \
 #	$(top_builddir)/src/xine-engine/libxine.la
 #xineplug_vo_out_opengl_la_LDFLAGS = -avoid-version -module
-#
+
 #xineplug_vo_out_syncfb_la_SOURCES = alphablend.c video_out_syncfb.c 
 #xineplug_vo_out_syncfb_la_LIBADD = $(X_LIBS) $(top_builddir)/src/xine-engine/libxine.la
 #xineplug_vo_out_syncfb_la_LDFLAGS = -avoid-version -module
-#
+
 xineplug_vo_out_aa_la_SOURCES =  video_out_aa.c
 xineplug_vo_out_aa_la_LIBADD = $(AALIB_LIBS)
 xineplug_vo_out_aa_la_LDFLAGS = -avoid-version -module
-#
+
 #xineplug_vo_out_fb_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
 #	alphablend.c video_out_fb.c
 #xineplug_vo_out_fb_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
 #xineplug_vo_out_fb_la_LDFLAGS = -avoid-version -module
-#
+
 #xineplug_vo_out_directfb_la_SOURCES = alphablend.c video_out_directfb.c
 #xineplug_vo_out_directfb_la_LIBADD = $(DIRECTFB_LIBS)
 #xineplug_vo_out_directfb_la_LDFLAGS = -avoid-version -module
-#
+
 #xineplug_vo_out_sdl_la_SOURCES = alphablend.c video_out_sdl.c
 #xineplug_vo_out_sdl_la_LIBADD = $(SDL_LIBS)
 #xineplug_vo_out_sdl_la_LDFLAGS = -avoid-version -module
-#
+
 #xineplug_vo_out_vidix_la_SOURCES = alphablend.c video_out_vidix.c
 #xineplug_vo_out_vidix_la_LIBADD =  $(X_LIBS) $(top_builddir)/src/video_out/vidix/libvidix.la
 #xineplug_vo_out_vidix_la_LDFLAGS = -avoid-version -module
diff --git a/src/video_out/libdha/Makefile.am b/src/video_out/libdha/Makefile.am
index 79d9617c5..11ca3ef3c 100644
--- a/src/video_out/libdha/Makefile.am
+++ b/src/video_out/libdha/Makefile.am
@@ -2,7 +2,7 @@ EXTRA_DIST = README pci_db2c.awk
 
 SUBDIRS = bin kernelhelper oth sysdep
 
-CFLAGS = @CFLAGS@ @STATIC@
+AM_CFLAGS = @STATIC@
 
 if HAVE_VIDIX
 dha_lib = libdha.la
diff --git a/src/video_out/vidix/Makefile.am b/src/video_out/vidix/Makefile.am
index f89457457..67a0aa373 100644
--- a/src/video_out/vidix/Makefile.am
+++ b/src/video_out/vidix/Makefile.am
@@ -2,7 +2,7 @@ EXTRA_DIST = README vidix.txt
 
 SUBDIRS = drivers
 
-CFLAGS = @CFLAGS@ @STATIC@
+AM_CFLAGS = @STATIC@
 
 if HAVE_VIDIX
 vidix_lib = libvidix.la
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index 77b131abf..59e3c0899 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -2,8 +2,7 @@
 ## Process this file with automake to produce Makefile.in
 ##
 
-CFLAGS = @CFLAGS@ $(THREAD_CFLAGS) $(X_CFLAGS) -DXINE_LOGO_FILE=\"file://@XINE_DATADIR@/xine_logo.mpv\"
-
+AM_CFLAGS = $(THREAD_CFLAGS) $(X_CFLAGS) -DXINE_LOGO_FILE=\"file://@XINE_DATADIR@/xine_logo.mpv\"
 
 lib_LTLIBRARIES = libxine.la
 
diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h
index 515403807..fa955cac9 100644
--- a/src/xine-engine/video_out.h
+++ b/src/xine-engine/video_out.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out.h,v 1.62 2002/09/18 22:12:17 guenter Exp $
+ * $Id: video_out.h,v 1.63 2002/10/09 05:13:40 storri Exp $
  *
  *
  * xine version of video_out.h 
@@ -152,7 +152,7 @@ struct vo_instance_s {
 
   /* private stuff can be added here */
 
-} ;
+};
 
 /* constants for the get/set property functions */
 
diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am
index fe6811a98..0b1bf4830 100644
--- a/src/xine-utils/Makefile.am
+++ b/src/xine-utils/Makefile.am
@@ -10,7 +10,7 @@ if PPC_ARCH
 pppc_files = ppcasm_string.S 
 endif
 
-CFLAGS = @CFLAGS@ $(THREAD_CFLAGS)
+AM_CFLAGS = $(THREAD_CFLAGS)
 
 libxineutils_la_SOURCES = $(pppc_files) \
 	cpu_accel.c \