From b051c92cdfbe8255de27bba658a5a95d626accb9 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 5 Mar 2013 18:23:25 -0500
Subject: Revert "gi-r-scanner: add support for raw CFLAGS flags option"

Doesn't work with arguments that have shell quotes.

This reverts commit 95b03cf87efbd4fea4b7d55601c9752cefd29bfc.
---
 Makefile.introspection      | 2 +-
 giscanner/scannermain.py    | 6 +-----
 giscanner/sourcescanner.py  | 4 +---
 tests/warn/warningtester.py | 3 +--
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/Makefile.introspection b/Makefile.introspection
index 8424c738..567d5e96 100644
--- a/Makefile.introspection
+++ b/Makefile.introspection
@@ -142,7 +142,7 @@ $(1): $$($(_gir_name)_FILES)
 	  $(_gir_program) \
 	  $(_gir_libraries) \
 	  $($(_gir_name)_SCANNERFLAGS) \
-	  --cflags="$($(_gir_name)_CFLAGS)" \
+	  $($(_gir_name)_CFLAGS) \
 	  $($(_gir_name)_LDFLAGS) \
 	  $$^ \
 	  --output $(1)
diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
index 8b4363bf..5fa370ce 100755
--- a/giscanner/scannermain.py
+++ b/giscanner/scannermain.py
@@ -44,9 +44,6 @@ from . import utils
 
 def get_preprocessor_option_group(parser):
     group = optparse.OptionGroup(parser, "Preprocessor options")
-    group.add_option("--cflags", help="Pre-processor cflags",
-                     action="store", dest="cpp_cflags",
-                     default="")
     group.add_option("-I", help="Pre-processor include file",
                      action="append", dest="cpp_includes",
                      default=[])
@@ -354,8 +351,7 @@ def create_source_scanner(options, args):
     # Run the preprocessor, tokenize and construct simple
     # objects representing the raw C symbols
     ss = SourceScanner()
-    ss.set_cpp_options(options.cpp_cflags,
-                       options.cpp_includes,
+    ss.set_cpp_options(options.cpp_includes,
                        options.cpp_defines,
                        options.cpp_undefines)
     ss.parse_files(filenames)
diff --git a/giscanner/sourcescanner.py b/giscanner/sourcescanner.py
index 795c46a8..9eb4ab4f 100644
--- a/giscanner/sourcescanner.py
+++ b/giscanner/sourcescanner.py
@@ -223,9 +223,7 @@ class SourceScanner(object):
 
     # Public API
 
-    def set_cpp_options(self, cflags, includes, defines, undefines):
-        if cflags:
-            self._cpp_options = cflags.split()
+    def set_cpp_options(self, includes, defines, undefines):
         for prefix, args in [('-I', includes),
                              ('-D', defines),
                              ('-U', undefines)]:
diff --git a/tests/warn/warningtester.py b/tests/warn/warningtester.py
index fba8f0ce..27e0a5e6 100644
--- a/tests/warn/warningtester.py
+++ b/tests/warn/warningtester.py
@@ -40,7 +40,6 @@ class ChunkedIO(object):
 
 class Options:
     def __init__(self):
-        self.cpp_cflags = ""
         self.cpp_includes = []
         self.cpp_defines = []
         self.cpp_undefines = []
@@ -111,7 +110,7 @@ def check(args):
     exit_code = process_packages(options, ['gobject-2.0'])
     if exit_code:
         sys.exit(exit_code)
-    ss.set_cpp_options(options.cpp_cflags, options.cpp_includes, options.cpp_defines, options.cpp_undefines)
+    ss.set_cpp_options(options.cpp_includes, options.cpp_defines, options.cpp_undefines)
     ss.parse_files([filename])
     ss.parse_macros([filename])
     transformer.parse(ss.get_symbols())
-- 
cgit v1.2.1