From fceae5849b57feab320e768696564b3b93bcddc7 Mon Sep 17 00:00:00 2001 From: Daniel Caujolle-Bert Date: Sun, 24 Mar 2002 23:31:56 +0000 Subject: 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 --- src/libw32dll/DirectShow/Makefile.am | 4 ++-- src/libw32dll/Makefile.am | 2 +- src/libw32dll/wine/Makefile.am | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/libw32dll') 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 -- cgit v1.2.3