Get rid of GLOBAL_CFLAGS, use CFLAGS instead. Note: maybe things are broken

now, so check and report, thanks.

CVS patchset: 1629
CVS date: 2002/03/24 23:31:56

28 files changed, 81 insertions, 89 deletions

diff --git a/configure.in b/configure.in
index 8402387d2..1761411bd 100644
--- a/configure.in
+++ b/configure.in
@@ -40,23 +40,23 @@ AC_DEFINE_UNQUOTED(XINE_MAJOR, $XINE_MAJOR)
 AC_DEFINE_UNQUOTED(XINE_MINOR, $XINE_MINOR)
 AC_DEFINE_UNQUOTED(XINE_SUB, $XINE_SUB)
 
-## this is only for pre-1.0 releases (ie with unstable interface)
+dnl this is only for pre-1.0 releases (ie with unstable interface)
 LT_RELEASE=$XINE_MAJOR.$XINE_MINOR.$XINE_SUB
 LT_CURRENT=0
 LT_REVISION=0
 LT_AGE=0
 
-## non-devel releases should not use LT_RELEASE but something like this:
-##
-## LT_REVISION=$XINE_SUB
-## LT_CURRENT=`expr $XINE_MAJOR + $XINE_MINOR`
-## LT_AGE=$XINE_MINOR
-##
-## !! This only works if subminor releases don't have any interface changes,
-## !! minor releases _only add_ interfaces and major releases remove at least
-## !! one interface
-## otherwise, the LT_* variables must be set according to
-## <info:(libtool)Updating version info>
+dnl non-devel releases should not use LT_RELEASE but something like this:
+dnl
+dnl LT_REVISION=$XINE_SUB
+dnl LT_CURRENT=`expr $XINE_MAJOR + $XINE_MINOR`
+dnl LT_AGE=$XINE_MINOR
+dnl
+dnl !! This only works if subminor releases don't have any interface changes,
+dnl !! minor releases _only add_ interfaces and major releases remove at least
+dnl !! one interface
+dnl otherwise, the LT_* variables must be set according to
+dnl <info:(libtool)Updating version info>
 
 AC_SUBST(LT_RELEASE)
 AC_SUBST(LT_CURRENT)
@@ -70,12 +70,20 @@ AC_SUBST(TAR_NAME)
 AC_SUBST(SPEC_VERSION)
 
 
-##
+dnl
+dnl Store and reset CFLAGS
+dnl
+cflags_set=${CFLAGS+set}
+cflags_saved="$CFLAGS"
+CFLAGS=""
+
+
+dnl
 AC_CANONICAL_SYSTEM
 dnl AC_CANONICAL_HOST
 
 
-##
+dnl
 AM_INIT_AUTOMAKE("xine-lib", $XINE_MAJOR.$XINE_MINOR.$XINE_SUB$XINE_PRE)
 
 
@@ -153,7 +161,7 @@ AC_TYPE_SIZE_T
 AM_TYPE_PTRDIFF_T
 
 AC_SUBST(DEBUG_CFLAGS)
-AC_SUBST(GLOBAL_CFLAGS)
+dnl AC_SUBST(GLOBAL_CFLAGS)
 
 dnl
 dnl threads
@@ -162,7 +170,7 @@ case "$host" in
   *-*-freebsd*)
     THREAD_LIBS="-L/usr/local/lib -pthread"
     THREAD_CFLAGS="-I/usr/local/include -D_THREAD_SAFE"
-    CFLAGS="$CFLAGS -L/usr/local/lib $THREAD_CFLAGS"
+    CFLAGS="-L/usr/local/lib $THREAD_CFLAGS"
     CPPFLAGS="$CPPFLAGS -I/usr/local/include -L/usr/local/lib"
     ;;
   *)
@@ -566,8 +574,7 @@ enable_ffmmx="no"
 
 case "$host_or_hostalias" in
   i386-*-freebsd*)
-    GLOBAL_CFLAGS="$GLOBAL_CFLAGS -pipe -fomit-frame-pointer -malign-functions=4 -malign-loops=4 -malign-jumps=4 -malign-functions=4 $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions"
-    GLOBAL_CFLAGS="$GLOBAL_CFLAGS $CFLAGS"
+    CFLAGS="$CFLAGS -pipe -fomit-frame-pointer -malign-functions=4 -malign-loops=4 -malign-jumps=4 -malign-functions=4 $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions"
     DEBUG_CFLAGS="$X_CFLAGS $DEBUG_CFLAGS $CFLAGS"
     AC_DEFINE(__i386__)
     AC_DEFINE([ARCH_X86],,[x86 architecture])
@@ -594,7 +601,8 @@ case "$host_or_hostalias" in
         AC_TRY_CFLAGS("$sarchopt=athlon", k7cpu="athlon", k7cpu="i686")
 
 	dnl add x86 specific gcc CFLAGS
-	GLOBAL_CFLAGS="$GLOBAL_CFLAGS -O3 -pipe -fomit-frame-pointer -malign-functions=4 -malign-loops=4 -malign-jumps=4 -malign-functions=4 $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -funroll-all-loops -finline-functions"
+	CFLAGS="$CFLAGS -O3 -pipe -fomit-frame-pointer -malign-functions=4 -malign-loops=4 -malign-jumps=4 -malign-functions=4 $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -funroll-all-loops -finline-functions"
+
 	DEBUG_CFLAGS="$DEBUG_CFLAGS -O3"
 
 	if test x"$sarchopt" != "xno"; then
@@ -629,7 +637,7 @@ case "$host_or_hostalias" in
 	    esac
 
 	    if test x"$archopt_val" != x; then
-		GLOBAL_CFLAGS="$GLOBAL_CFLAGS $sarchopt=$archopt_val"
+		CFLAGS="$CFLAGS $sarchopt=$archopt_val"
 		DEBUG_CFLAGS="$DEBUG_CFLAGS $sarchopt=$archopt_val"
 	    fi
 	    ]
@@ -647,7 +655,7 @@ case "$host_or_hostalias" in
     	enable_ffmmx="yes"
     else
 	dnl add x86 specific cc CFLAGS
-	GLOBAL_CFLAGS="$GLOBAL_CFLAGS -O"
+	CFLAGS="$CFLAGS -O"
 	DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
     	AC_DEFINE(FPM_64BIT)
     fi
@@ -657,26 +665,26 @@ case "$host_or_hostalias" in
     ;;
 
   alphaev56-*)
-    GLOBAL_CFLAGS="$GLOBAL_CFLAGS -O3 -mcpu=ev56 -mieee"
+    CFLAGS="$CFLAGS -O3 -mcpu=ev56 -mieee"
     DEBUG_CFLAGS="$DEBUG_CFLAGS -O3 -mcpu=ev56 -mieee"
     AC_DEFINE(FPM_64BIT)
     ;;
 
   alpha*)
-    GLOBAL_CFLAGS="$GLOBAL_CFLAGS -O3 -mieee"
+    CFLAGS="$CFLAGS -O3 -mieee"
     DEBUG_CFLAGS="$DEBUG_CFLAGS -O3 -mieee"
     AC_DEFINE(FPM_64BIT)
     ;;
 
   ppc-*-linux* | powerpc-*) 
-    GLOBAL_CFLAGS="$GLOBAL_CFLAGS -O3 -pipe -fomit-frame-pointer $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -funroll-all-loops -finline-functions"
+    CFLAGS="$CFLAGS -O3 -pipe -fomit-frame-pointer $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -funroll-all-loops -finline-functions"
     DEBUG_CFLAGS="$DEBUG_CFLAGS -O3"
     AC_DEFINE(FPM_PPC)
     AC_DEFINE(ARCH_PPC)
     
     if test x$enable_altivec = xyes; then
         AC_DEFINE(ENABLE_ALTIVEC)
-        GLOBAL_CFLAGS="$GLOBAL_CFLAGS -Wa,-m7400"
+        CFLAGS="$CFLAGS -Wa,-m7400"
     fi
     ;;
 
@@ -685,7 +693,7 @@ case "$host_or_hostalias" in
     sparc-*)    cpu_cflags="-mcpu=supersparc -mtune=supersparc" ;;
     sparc64-*)  cpu_cflags="-mcpu=supersparc -mtune=ultrasparc" ;;
     esac
-    GLOBAL_CFLAGS="$GLOBAL_CFLAGS -O3 $cpu_cflags -funroll-loops -funroll-all-loops -finline-functions"
+    CFLAGS="$CFLAGS -O3 $cpu_cflags -funroll-loops -funroll-all-loops -finline-functions"
     DEBUG_CFLAGS="$DEBUG_CFLAGS -O $cpu_cflags -funroll-loops -funroll-all-loops -finline-functions"
 
     AC_DEFINE(FPM_SPARC)
@@ -707,30 +715,30 @@ case "$host_or_hostalias" in
 	cc_debug_cflags="-O"
     	AC_DEFINE(FPM_64BIT)		dnl use portable version with non-gcc
     fi
-    GLOBAL_CFLAGS="$GLOBAL_CFLAGS $cc_optimize_cflags"
+    CFLAGS="$CFLAGS $cc_optimize_cflags"
     DEBUG_CFLAGS="$DEBUG_CFLAGS $cc_debug_cflags"
     ;;
 
   mips-*)
-    GLOBAL_CFLAGS="$GLOBAL_CFLAGS -O3"
+    CFLAGS="$CFLAGS -O3"
     DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
     AC_DEFINE(FPM_MIPS)
     ;;
 
   m68k-*)
-    GLOBAL_CFLAGS="$GLOBAL_CFLAGS -O2"
+    CFLAGS="$CFLAGS -O2"
     DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
     AC_DEFINE(FPM_DEFAULT)
     ;;
 
   ia64-*)
-    GLOBAL_CFLAGS="$GLOBAL_CFLAGS -O3"
+    CFLAGS="$CFLAGS -O3"
     DEBUG_CFLAGS="$DEBUG_CFLAGS -O3"
     AC_DEFINE(FPM_64BIT)
     ;;
 
   s390-*)
-    GLOBAL_CFLAGS="$GLOBAL_CFLAGS -O3"
+    CFLAGS="$CFLAGS -O3"
     DEBUG_CFLAGS="$DEBUG_CFLAGS -O3"
     AC_DEFINE(FPM_DEFAULT)
     ;;
@@ -751,14 +759,21 @@ case "$host_or_hostalias" in
     echo "(sleeping one minute so you can read this...)"
     sleep 60
 
-    GLOBAL_CFLAGS="$GLOBAL_CFLAGS -O3"
+    CFLAGS="$CFLAGS -O3"
     DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
     AC_DEFINE(FPM_DEFAULT)
     ;;
 esac
 
 
-GLOBAL_CFLAGS="$GLOBAL_CFLAGS $COMMON_CFLAGS $ALSA_CFLAGS $ESD_CFLAGS $ARTS_CFLAGS $IRIXAL_CFLAGS"
+CFLAGS="$CFLAGS $COMMON_CFLAGS $ALSA_CFLAGS $ESD_CFLAGS $ARTS_CFLAGS $IRIXAL_CFLAGS"
+dnl
+dnl Some CFLAGS was previously defined, use them too.
+dnl
+if test "$cflags_set" = "set"; then
+  CFLAGS="$cflags_saved $CFLAGS"
+fi
+
 DEBUG_CFLAGS="$DEBUG_CFLAGS $COMMON_CFLAGS $ALSA_CFLAGS $ESD_CFLAGS $ARTS_CFLAGS $IRIXAL_CFLAGS -g -DDEBUG"
 
 AM_CONDITIONAL(HAVE_W32DLL, test x"$enable_w32dll" = "xyes")
diff --git a/src/audio_out/Makefile.am b/src/audio_out/Makefile.am
index 777710993..b66fd42e6 100644
--- a/src/audio_out/Makefile.am
+++ b/src/audio_out/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS = @GLOBAL_CFLAGS@ -DXINE_COMPILE $(ALSA_CFLAGS) $(ESD_CFLAGS) $(IRIXAL_CFLAGS) $(ARTS_CFLAGS)
+CFLAGS = @CFLAGS@ -DXINE_COMPILE $(ALSA_CFLAGS) $(ESD_CFLAGS) $(IRIXAL_CFLAGS) $(ARTS_CFLAGS)
 
 EXTRA_DIST = audio_alsa_out.c audio_esd_out.c \
 	     audio_sun_out.c audio_arts_out.c audio_irixal_out.c
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index fc121d011..6654f244b 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS = @GLOBAL_CFLAGS@ @OGG_CFLAGS@
+CFLAGS = @CFLAGS@ $(OGG_CFLAGS)
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
@@ -29,7 +29,7 @@ lib_LTLIBRARIES = $(ogg_module) $(qt_modules) $(asf_module) xineplug_dmx_avi.la
 	xineplug_dmx_cda.la
 
 xineplug_dmx_ogg_la_SOURCES = demux_ogg.c
-xineplug_dmx_ogg_la_LIBADD = @OGG_LIBS@
+xineplug_dmx_ogg_la_LIBADD = $(OGG_LIBS)
 xineplug_dmx_ogg_la_LDFLAGS = -avoid-version -module
 
 xineplug_dmx_avi_la_SOURCES = demux_avi.c
diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am
index eaff0136f..8e19c4868 100644
--- a/src/dxr3/Makefile.am
+++ b/src/dxr3/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS = @GLOBAL_CFLAGS@ @X_CFLAGS@ $(LINUX_INCLUDE)
+CFLAGS = @CFLAGS@ $(X_CFLAGS) $(LINUX_INCLUDE)
 
 EXTRA_DIST = dxr3_decoder.c dxr3_vo_core.c dxr3_video_out.c nav_read.c
 
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index cd966234e..4d0ee3699 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -2,8 +2,6 @@
 ## Process this file with automake to produce Makefile.in
 ##
 
-CFLAGS = @GLOBAL_CFLAGS@
-
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
 libdir = $(XINE_PLUGINDIR)
diff --git a/src/liba52/Makefile.am b/src/liba52/Makefile.am
index 81e457c54..ccd8bd557 100644
--- a/src/liba52/Makefile.am
+++ b/src/liba52/Makefile.am
@@ -1,5 +1,5 @@
-CFLAGS = @LIBA52_CFLAGS@ @GLOBAL_CFLAGS@ 
-DEBUG_CFLAGS = @LIBA52_CFLAGS@ @DEBUG_CFLAGS@
+CFLAGS = @CFLAGS@ $(LIBA52_CFLAGS)
+DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(LIBA52_CFLAGS)
 
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
diff --git a/src/libdivx4/Makefile.am b/src/libdivx4/Makefile.am
index 7cd8b7b56..27040f524 100644
--- a/src/libdivx4/Makefile.am
+++ b/src/libdivx4/Makefile.am
@@ -2,8 +2,6 @@
 ## Process this file with automake to produce Makefile.in
 ##
 
-CFLAGS = @GLOBAL_CFLAGS@
-
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
 libdir = $(XINE_PLUGINDIR)
diff --git a/src/libdts/Makefile.am b/src/libdts/Makefile.am
index e92c32413..f718cd2ad 100644
--- a/src/libdts/Makefile.am
+++ b/src/libdts/Makefile.am
@@ -1,4 +1,3 @@
-CFLAGS = @GLOBAL_CFLAGS@ 
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am
index ebcf60fbb..e2e528356 100644
--- a/src/libffmpeg/Makefile.am
+++ b/src/libffmpeg/Makefile.am
@@ -4,8 +4,6 @@
 
 SUBDIRS = libavcodec 
 
-CFLAGS = @GLOBAL_CFLAGS@
-
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
 libdir = $(XINE_PLUGINDIR)
@@ -21,7 +19,7 @@ debug:
 	@list='$(SUBDIRS)'; for subdir in $$list; do \
 	  (cd $$subdir && $(MAKE) $@) || exit;\
 	done;
-	@$(MAKE) CFLAGS="@DEBUG_CFLAGS@"
+	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
 
 install-debug: debug
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
diff --git a/src/libffmpeg/libavcodec/Makefile.am b/src/libffmpeg/libavcodec/Makefile.am
index 67c97b0d8..f05501807 100644
--- a/src/libffmpeg/libavcodec/Makefile.am
+++ b/src/libffmpeg/libavcodec/Makefile.am
@@ -4,9 +4,9 @@
 
 SUBDIRS = armv4l i386 mlib
 
-#CFLAGS = -D_FILE_OFFSET_BITS=64 @GLOBAL_CFLAGS@ -DCONFIG_DECODERS -DHAVE_AV_CONFIG_H
+#CFLAGS = -D_FILE_OFFSET_BITS=64 @CFLAGS@ -DCONFIG_DECODERS -DHAVE_AV_CONFIG_H
 
-CFLAGS = @GLOBAL_CFLAGS@ @LIBFFMPEG_CFLAGS@ -DCONFIG_DECODERS -DHAVE_AV_CONFIG_H
+CFLAGS = @CFLAGS@ $(LIBFFMPEG_CFLAGS) -DCONFIG_DECODERS -DHAVE_AV_CONFIG_H
 ASFLAGS =
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
@@ -34,7 +34,7 @@ noinst_HEADERS = avcodec.h    dsputil.h   mpegvideo.h \
 	$(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
diff --git a/src/libffmpeg/libavcodec/armv4l/Makefile.am b/src/libffmpeg/libavcodec/armv4l/Makefile.am
index 1059cb1ce..7664a57f8 100644
--- a/src/libffmpeg/libavcodec/armv4l/Makefile.am
+++ b/src/libffmpeg/libavcodec/armv4l/Makefile.am
@@ -2,9 +2,9 @@
 ## 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
 
-CFLAGS = -O2 @LIBFFMPEG_CFLAGS@ -DCONFIG_DECODERS -DHAVE_AV_CONFIG_H
+CFLAGS = -O2 $(LIBFFMPEG_CFLAGS) -DCONFIG_DECODERS -DHAVE_AV_CONFIG_H
 ASFLAGS =
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
@@ -28,7 +28,7 @@ noinst_HEADERS =
 	$(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
diff --git a/src/libffmpeg/libavcodec/i386/Makefile.am b/src/libffmpeg/libavcodec/i386/Makefile.am
index 0796198bb..5c83c9d8f 100644
--- a/src/libffmpeg/libavcodec/i386/Makefile.am
+++ b/src/libffmpeg/libavcodec/i386/Makefile.am
@@ -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 @@ noinst_HEADERS = dsputil_mmx_avg.h  mmx.h
 	$(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
diff --git a/src/libffmpeg/libavcodec/mlib/Makefile.am b/src/libffmpeg/libavcodec/mlib/Makefile.am
index 9ee002c7b..1605cb6b4 100644
--- a/src/libffmpeg/libavcodec/mlib/Makefile.am
+++ b/src/libffmpeg/libavcodec/mlib/Makefile.am
@@ -2,9 +2,9 @@
 ## Process this file with automake to produce Makefile.in
 ##
 
-#CFLAGS = -D_FILE_OFFSET_BITS=64 @GLOBAL_CFLAGS@ -DCONFIG_DECODERS -DHAVE_AV_CONFIG_H
+#CFLAGS = -D_FILE_OFFSET_BITS=64 @CFLAGS@ -DCONFIG_DECODERS -DHAVE_AV_CONFIG_H
 
-CFLAGS = @GLOBAL_CFLAGS@ @LIBFFMPEG_CFLAGS@ -DCONFIG_DECODERS -DHAVE_AV_CONFIG_H
+CFLAGS = @CFLAGS@ $(LIBFFMPEG_CFLAGS) -DCONFIG_DECODERS -DHAVE_AV_CONFIG_H
 ASFLAGS =
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
@@ -28,7 +28,7 @@ noinst_HEADERS =
 	$(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
diff --git a/src/liblpcm/Makefile.am b/src/liblpcm/Makefile.am
index d55dcf5b4..5dba3dc3a 100644
--- a/src/liblpcm/Makefile.am
+++ b/src/liblpcm/Makefile.am
@@ -1,4 +1,3 @@
-CFLAGS = @GLOBAL_CFLAGS@ 
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
diff --git a/src/libmad/Makefile.am b/src/libmad/Makefile.am
index f771ef370..8538636d8 100644
--- a/src/libmad/Makefile.am
+++ b/src/libmad/Makefile.am
@@ -1,5 +1,3 @@
-CFLAGS = @GLOBAL_CFLAGS@ 
-
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
 libdir = $(XINE_PLUGINDIR)
diff --git a/src/libmpeg2/Makefile.am b/src/libmpeg2/Makefile.am
index eec705b15..3184f001f 100644
--- a/src/libmpeg2/Makefile.am
+++ b/src/libmpeg2/Makefile.am
@@ -1,5 +1,5 @@
-CFLAGS = @LIBMPEG2_CFLAGS@ @GLOBAL_CFLAGS@
-DEBUG_CFLAGS = @LIBMPEG2_CFLAGS@ @DEBUG_CFLAGS@
+CFLAGS = @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/libmpg123/Makefile.am b/src/libmpg123/Makefile.am
index 1d1aae7ba..dd4713e72 100644
--- a/src/libmpg123/Makefile.am
+++ b/src/libmpg123/Makefile.am
@@ -1,5 +1,3 @@
-CFLAGS = @GLOBAL_CFLAGS@ 
-
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
 libdir = $(XINE_PLUGINDIR)
diff --git a/src/libspucc/Makefile.am b/src/libspucc/Makefile.am
index 6371d6800..c470ff4a4 100644
--- a/src/libspucc/Makefile.am
+++ b/src/libspucc/Makefile.am
@@ -1,5 +1,3 @@
-CFLAGS = @GLOBAL_CFLAGS@ 
-
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
 libdir = $(XINE_PLUGINDIR)
diff --git a/src/libspudec/Makefile.am b/src/libspudec/Makefile.am
index 5d36fa13f..69e58a28e 100644
--- a/src/libspudec/Makefile.am
+++ b/src/libspudec/Makefile.am
@@ -1,5 +1,3 @@
-CFLAGS = @GLOBAL_CFLAGS@ 
-
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
 libdir = $(XINE_PLUGINDIR)
diff --git a/src/libsputext/Makefile.am b/src/libsputext/Makefile.am
index ed8c29e9b..528645b46 100644
--- a/src/libsputext/Makefile.am
+++ b/src/libsputext/Makefile.am
@@ -1,5 +1,3 @@
-CFLAGS = @GLOBAL_CFLAGS@ 
-
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
 libdir = $(XINE_PLUGINDIR)
diff --git a/src/libvfill/Makefile.am b/src/libvfill/Makefile.am
index 4548b4c72..aeebe3150 100644
--- a/src/libvfill/Makefile.am
+++ b/src/libvfill/Makefile.am
@@ -2,9 +2,6 @@
 # the videofill plugin
 #
 
-CFLAGS = @GLOBAL_CFLAGS@
-DEBUG_CFLAGS = @DEBUG_CFLAGS@
-
 libdir = $(XINE_PLUGINDIR)
 
 lib_LTLIBRARIES = xineplug_decode_vfill.la
diff --git a/src/libvorbis/Makefile.am b/src/libvorbis/Makefile.am
index ea5e6e04b..07da7bfce 100644
--- a/src/libvorbis/Makefile.am
+++ b/src/libvorbis/Makefile.am
@@ -2,7 +2,7 @@
 ## Process this file with automake to produce Makefile.in
 ##
 
-CFLAGS = @GLOBAL_CFLAGS@ @VORBIS_CFLAGS@
+CFLAGS = @CFLAGS@ $(VORBIS_CFLAGS)
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
@@ -15,11 +15,11 @@ endif
 lib_LTLIBRARIES = $(vorbis_module)
 
 xineplug_decode_vorbis_la_SOURCES = xine_decoder.c
-xineplug_decode_vorbis_la_LIBADD = @VORBIS_LIBS@
+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)"
 
 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 8e29c5894..8af1aa4fb 100644
--- a/src/libw32dll/DirectShow/Makefile.am
+++ b/src/libw32dll/DirectShow/Makefile.am
@@ -1,10 +1,10 @@
 
-CFLAGS = @GLOBAL_CFLAGS@ @X_CFLAGS@ -fno-omit-frame-pointer \
+CFLAGS = @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 \
+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
diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am
index 71c705804..e87a257c3 100644
--- a/src/libw32dll/Makefile.am
+++ b/src/libw32dll/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS = @GLOBAL_CFLAGS@ -I$(srcdir)/wine
+CFLAGS = @CFLAGS@ -I$(srcdir)/wine
 
 DEBUG_CFLAGS = @DEBUG_CFLAGS@ -I$(srcdir)/wine
 
diff --git a/src/libw32dll/wine/Makefile.am b/src/libw32dll/wine/Makefile.am
index 21e803d41..9cb51a5a2 100644
--- a/src/libw32dll/wine/Makefile.am
+++ b/src/libw32dll/wine/Makefile.am
@@ -4,12 +4,12 @@ noinst_LTLIBRARIES = $(wine_lib)
 
 ##
 ##
-CFLAGS = @GLOBAL_CFLAGS@ @X_CFLAGS@ -fno-omit-frame-pointer \
+CFLAGS = @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 \
+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
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index cb4d76efe..4ae8ed0dd 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -1,5 +1,5 @@
-CFLAGS = @GLOBAL_CFLAGS@ @X_CFLAGS@ @LIBMPEG2_CFLAGS@ -DXINE_COMPILE @SDL_CFLAGS@
-DEBUG_CFLAGS = @DEBUG_CFLAGS@ @X_CFLAGS@ @LIBMPEG2_CFLAGS@ -DXINE_COMPILE @SDL_CFLAGS@
+CFLAGS = @CFLAGS@ $(X_CFLAGS) $(LIBMPEG2_CFLAGS) -DXINE_COMPILE $(SDL_CFLAGS)
+DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(X_CFLAGS) $(LIBMPEG2_CFLAGS) -DXINE_COMPILE $(SDL_CFLAGS)
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index e9628af2b..6b3282cfa 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -2,7 +2,7 @@
 ## Process this file with automake to produce Makefile.in
 ##
 
-CFLAGS = @GLOBAL_CFLAGS@ @THREAD_CFLAGS@
+CFLAGS = @CFLAGS@ $(THREAD_CFLAGS)
 
 
 lib_LTLIBRARIES = libxine.la
diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am
index 5d4e809de..a3f2e5fac 100644
--- a/src/xine-utils/Makefile.am
+++ b/src/xine-utils/Makefile.am
@@ -2,8 +2,6 @@
 ## Process this file with automake to produce Makefile.in
 ##
 
-CFLAGS = @GLOBAL_CFLAGS@ 
-
 lib_LTLIBRARIES = libxineutils.la
 
 libxineutils_la_SOURCES = utils.c memcpy.c monitor.c cpu_accel.c xine_mutex.c