diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-03-24 23:31:56 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-03-24 23:31:56 +0000 |
| commit | fceae5849b57feab320e768696564b3b93bcddc7 (patch) | |
| tree | 7e0ea6e409c2781b7c1a2d6f762283d07af576c8 /src/libw32dll | |
| parent | 75960283e292df4e37078a68fbb9eea9cc20a76c (diff) | |
| download | xine-lib-fceae5849b57feab320e768696564b3b93bcddc7.tar.gz xine-lib-fceae5849b57feab320e768696564b3b93bcddc7.tar.bz2 | |
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
Diffstat (limited to 'src/libw32dll')
| -rw-r--r-- | src/libw32dll/DirectShow/Makefile.am | 4 | ||||
| -rw-r--r-- | src/libw32dll/Makefile.am | 2 | ||||
| -rw-r--r-- | src/libw32dll/wine/Makefile.am | 4 |
3 files changed, 5 insertions, 5 deletions
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 |