[xine-cvs] CVS: xine-lib/src/libffmpeg/libavcodec/i386 Makefile.am,1.4,1.5

[Daniel Caujolle-B. <f1...@us...>]

Update of /cvsroot/xine/xine-lib/src/libffmpeg/libavcodec/i386
In directory usw-pr-cvs1:/tmp/cvs-serv9309/src/libffmpeg/libavcodec/i386

Modified Files:
	Makefile.am 
Log Message:
Get rid of GLOBAL_CFLAGS, use CFLAGS instead. Note: maybe things are broken
now, so check and report, thanks.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/libavcodec/i386/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.am	12 Mar 2002 00:46:27 -0000	1.4
+++ Makefile.am	24 Mar 2002 23:31:58 -0000	1.5
@@ -2,11 +2,11 @@
 ## Process this file with automake to produce Makefile.in
 ##
 
-#CFLAGS = @GLOBAL_CFLAGS@ @LIBFFMPEG_CFLAGS@ -DCONFIG_DECODERS -DHAVE_AV_CONFIG_H
+#CFLAGS = @CFLAGS@ @LIBFFMPEG_CFLAGS@ -DCONFIG_DECODERS -DHAVE_AV_CONFIG_H
 
-# we must not use GLOBAL_CFLAGS here, gcc optimizations produce
+# we must not use CFLAGS here, gcc optimizations produce
 # bad code if we do so.
-CFLAGS = -O2 @LIBFFMPEG_CFLAGS@ -DCONFIG_DECODERS -DHAVE_AV_CONFIG_H
+CFLAGS = -O2 $(LIBFFMPEG_CFLAGS) -DCONFIG_DECODERS -DHAVE_AV_CONFIG_H
 
 ASFLAGS =
 
@@ -35,7 +35,7 @@
 	$(ASCOMPILE) -o $@ `test -f $< || echo '$(srcdir)/'`$<
 
 debug:
-	@$(MAKE) CFLAGS="@DEBUG_CFLAGS@ @LIBFFMPEG_CFLAGS@ -DCONFIG_DECODERS -DHAVE_AV_CONFIG_H"
+	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(LIBFFMPEG_CFLAGS) -DCONFIG_DECODERS -DHAVE_AV_CONFIG_H"
 
 install-debug: debug
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am